diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | nagios-nrpe-commands.cfg | 1 | ||||
| -rw-r--r-- | nagios-templates.cfg | 5 | ||||
| -rwxr-xr-x | sitesummary-nodes | 6 |
4 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index b5838fe..9b6f267 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -sitesummary (0.1.3) UNRELEASED; urgency=low +sitesummary (0.1.3~olp+2) lenny; urgency=low * Change temp file name created by nagios-plugins check_cups_queue to include host name being checked, to make it easier to figure out why some of the temp files are left behind. * Reintroduce DHCP server check, only checking if the process runs - this time. + this time. Check for dhcpd3 on Lenny and dhcpd on Squeeze++. - -- Petter Reinholdtsen <pere@debian.org> Sat, 11 Feb 2012 08:42:08 +0100 + -- Petter Reinholdtsen <pere@debian.org> Mon, 13 Feb 2012 11:04:46 +0100 sitesummary (0.1.2) unstable; urgency=low diff --git a/nagios-nrpe-commands.cfg b/nagios-nrpe-commands.cfg index 8f23e73..cef17cd 100644 --- a/nagios-nrpe-commands.cfg +++ b/nagios-nrpe-commands.cfg @@ -14,6 +14,7 @@ command[check_ntp]=/usr/lib/nagios/plugins/check_ntp -H localhost command[check_procs]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ command[check_procs_cron]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -C cron command[check_procs_dhcpd]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -C dhcpd +command[check_procs_dhcpd3]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -C dhcpd3 command[check_procs_zombie]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s Z command[check_shutdown]=/usr/lib/sitesummary/nagios-plugins/check_shutdown command[check_smtp]=/usr/lib/nagios/plugins/check_smtp -H localhost diff --git a/nagios-templates.cfg b/nagios-templates.cfg index dda937c..749f62b 100644 --- a/nagios-templates.cfg +++ b/nagios-templates.cfg @@ -209,6 +209,11 @@ define command{ } define command{ + command_name check_procs_dhcpd3 + command_line /usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -C dhcpd3 +} + +define command{ command_name check_procs_dhcpd command_line /usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -C dhcpd } diff --git a/sitesummary-nodes b/sitesummary-nodes index d5016c9..8f55bbe 100755 --- a/sitesummary-nodes +++ b/sitesummary-nodes @@ -400,10 +400,12 @@ sub generate_nagios_config { # print_nagios_service_check($remote, $hostname, "dhcp", # "check_dhcp") # if is_pkg_installed($hostid, "dhcp3-server"); + print_nagios_service_check($remote, $hostname, "process - dhcpd3", + "check_procs_dhcpd", "1:15!1:25") + if (is_pkg_installed($hostid, "dhcp3-server")); print_nagios_service_check($remote, $hostname, "process - dhcpd", "check_procs_dhcpd", "1:15!1:25") - if (is_pkg_installed($hostid, "dhcp3-server") - || is_pkg_installed($hostid, "isc-dhcp-server")); + if (is_pkg_installed($hostid, "isc-dhcp-server")); # Check DNS server print_nagios_service_check($remote, $hostname, "dns", |