From 0b8ccd8c7ced7df55eb96999289153de6e175554 Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 30 Apr 2010 12:14:46 +0000 Subject: [PATCH] 2010-04-29 Sancho Lerena * pandora_agent_installer: Added darwin (snow leopard), and BSD to installer OS detection. * AIX/pandora_agent.conf: Fixed version & date. * HP-UX/pandora_agent.conf: Replaced some default modules by better ones. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2650 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/ChangeLog | 10 ++++++++ pandora_agents/unix/HP-UX/pandora_agent.conf | 27 +++----------------- pandora_agents/unix/pandora_agent_installer | 2 +- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 24c662b538..705a863ee2 100755 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,7 +1,7 @@ # Base config file for Pandora FMS agents # Version 3.0, AIX version # Licensed under GPL license v2, -# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas +# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com # General Parameters diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index adce9b6e19..f95b755f40 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,13 @@ +2010-04-29 Sancho Lerena + + * pandora_agent_installer: Added darwin (snow leopard), and BSD to + installer OS detection. + + * AIX/pandora_agent.conf: Fixed version & date. + + * HP-UX/pandora_agent.conf: Replaced some default modules by + better ones. + 2010-02-22 Pablo de la Concepción * Linux/pandora_agent.conf: Added parameters position_description diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index ea4944c69f..277bc3aa58 100755 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -106,31 +106,12 @@ transfer_mode tentacle module_begin module_name disk_root_free module_type generic_data -module_exec df -k / | tail -1 | tr -d "%" | awk '{ print 100-$1 }' +module_exec bdf / | grep -v "Filesystem" | awk '{print $4}' module_max 100 module_min 0 module_description Free disk Percentage of root partition module_end -module_begin -module_name disk_var_free -module_type generic_data -module_exec df -k /var | tail -1 | tr -d "%" | awk '{ print 100-$1 }' -module_max 100 -module_min 0 -module_description Free disk Percentage of /var partition -module_end - -module_begin -module_name disk_usr_free -module_type generic_data -module_exec df -k /usr | tail -1 | tr -d "%" | awk '{ print 100-$1 }' -module_max 100 -module_min 0 -module_description Free disk Percentage of /usr partition -module_end - - module_begin module_name proctotal module_type generic_data @@ -140,7 +121,7 @@ module_end module_begin module_name sshDaemon module_type generic_proc -module_exec ps -ex | grep sshd | grep -v "grep" | wc -l | awk '{ print $1 }' +module_exec ps -Af | grep "sshd" | grep -v "grep" | wc -l | awk '{ print $1 }' module_end # Async data example @@ -154,14 +135,14 @@ module_end module_begin module_name Swap_Free module_type generic_data -module_exec swapinfo | grep memory | tr -d "%" | awk '{ print 100-$5 }' +module_exec swapinfo -t | grep memory | tr -d "%" | awk '{ print 100-$5 }' module_description Unused swap memory module_end module_begin module_name RAM_Free module_type generic_data -module_exec dmesg | awk '/Physical:/ && /Kbytes/ {print $8}' +module_exec swapinfo -t | grep memory | awk '{print $4}' module_description Unused RAM memory module_end diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 01c4080a2b..41489f1f0c 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -46,7 +46,7 @@ then fi UNIX_KIND=`uname -s` -if [ -z "`echo Linux HP-UX SunOS AIX Solaris | grep \"$UNIX_KIND\"`" ] +if [ -z "`echo Linux HP-UX SunOS AIX Solaris Darwin BSD bsd | grep \"$UNIX_KIND\"`" ] then echo "This system: '$UNIX_KIND' is not supported by this script" echo "Please make the install yourself as it's described in documentation"