Get rid of sshd version check - we no longer have non-standard sshds around, and...

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9bfb13a..ace6ecd 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,6 +173,10 @@ servers:
     address: 150.203.164.38
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-sil:
+    address: 86.59.118.145
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -569,11 +573,11 @@ servers:
   fano:
     address: 206.12.19.110
     parents: luchesi
-    hostgroups: computers, freebsd
+    hostgroups: computers, freebsd, squeeze
   finzi:
     address: 206.12.19.111
     parents: luchesi
-    hostgroups: computers, freebsd
+    hostgroups: computers, freebsd, squeeze
 
   lebrun:
     address: 193.198.184.10
@@ -649,7 +653,7 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd
+    hostgroups: computers, freebsd, squeeze
   holter:
     address: 194.177.211.202
     parents: gw-grnet
@@ -685,7 +689,13 @@ servers:
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd
+    hostgroups: computers, freebsd, squeeze
+
+  beethoven:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, hasbootfs
+
 
 #############################
 # host groups
@@ -758,6 +768,9 @@ hostgroups:
   lenny:
     alias: Hosts running lenny, not etch
     private: 1
+  squeeze:
+    alias: Hosts running squeeze
+    private: 1
 
   no-samhain:
     alias: hosts not running samhain properly
@@ -1143,27 +1156,6 @@ services:
     hosts: agnesi
     normal_check_interval:  180
 
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
-    depends: network service - sshd
-    hostgroups: computers, deadslow
-    excludehostgroups: lenny
-    normal_check_interval:  60
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
-    depends: network service - sshd
-    hostgroups: lenny
-    excludehosts: agnesi
-    normal_check_interval:  60
-  -
-    name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_5.1p1 Debian-5"
-    depends: network service - sshd - 2260
-    hosts: agnesi
-    normal_check_interval:  60
- #
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
@@ -1196,9 +1188,7 @@ services:
  ###
   -
     name: process - ntpd
-    # sarge: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
-    # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
     excludehosts: zelenka
   -