diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-01-18 12:02:46 +0000 | 
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2010-01-18 12:02:46 +0000 | 
| commit | ebd1ff2342f4ca7642820880ffbd081ec142b419 (patch) | |
| tree | 9dc685357c9ce27e153288cd07df6deb38242202 | |
| parent | 8df0d7e03e2e6ab00024191c3b9665b13b8a015c (diff) | |
| download | sitesummary-ebd1ff2342f4ca7642820880ffbd081ec142b419.tar.gz sitesummary-ebd1ff2342f4ca7642820880ffbd081ec142b419.tar.bz2 sitesummary-ebd1ff2342f4ca7642820880ffbd081ec142b419.tar.xz  | |
Check ftp from Nagios if proftpd is installed.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | nagios-nrpe-commands.cfg | 1 | ||||
| -rw-r--r-- | nagios-templates.cfg | 5 | ||||
| -rwxr-xr-x | sitesummary-nodes | 5 | 
4 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f687270..d8f9c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sitesummary (0.0.55) UNRELEASED; urgency=low    * Update documetation on how to enable NRPE configuration on the      clients.    * Make sure a Nagios ping check is generated for each hosts default route. +  * Check ftp from Nagios if proftpd is installed.   -- Petter Reinholdtsen <pere@debian.org>  Sat, 16 Jan 2010 21:06:29 +0100 diff --git a/nagios-nrpe-commands.cfg b/nagios-nrpe-commands.cfg index 124be5c..fdd7bb0 100644 --- a/nagios-nrpe-commands.cfg +++ b/nagios-nrpe-commands.cfg @@ -4,6 +4,7 @@  command[check_apt]=/usr/lib/nagios/plugins/check_apt  command[check_dhcp]=/usr/lib/nagios/plugins/check_dhcp  command[check_disk]=/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ +command[check_ftp]=/usr/lib/nagios/plugins/check_ftp -H localhost  command[check_linux_raid]=/usr/lib/nagios/plugins/check_linux_raid  command[check_nfs]=/usr/lib/nagios/plugins/check_rpc -H localhost -C nfs -c2,3  command[check_ntp]=/usr/lib/nagios/plugins/check_ntp -H localhost diff --git a/nagios-templates.cfg b/nagios-templates.cfg index 8d6e457..9b62f47 100644 --- a/nagios-templates.cfg +++ b/nagios-templates.cfg @@ -113,6 +113,11 @@ define command{  }  define command{ +    command_name	check_ftp +    command_line	/usr/lib/nagios/plugins/check_ftp -H localhost +} + +define command{      command_name	check_ntp      command_line	/usr/lib/nagios/plugins/check_ntp -H $HOSTADDRESS$  } diff --git a/sitesummary-nodes b/sitesummary-nodes index e9506a8..f2e3a13 100755 --- a/sitesummary-nodes +++ b/sitesummary-nodes @@ -338,5 +338,10 @@ sub generate_nagios_config {                                     "check_dhcp")              if is_pkg_installed($hostid, "dhcp3-server"); +        # Check FTP server +        print_nagios_service_check($remote, $hostname, "ftp", +                                   "check_ftp") +            if is_pkg_installed($hostid, "proftpd"); +      }  }  | 
