remove check that has no hosts left

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 227e539..3724cf4 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,10 +98,6 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-xandros:
-    address: 67.210.160.81
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -214,7 +210,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs
+    hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu
   merulo:
     address: 192.25.206.58
     parents: spohr
@@ -328,6 +324,10 @@ servers:
     address: 128.31.0.49
     parents: gw-mit-csail
     hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  senfl:
+    address: 128.31.0.51
+    parents: gw-mit-csail
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
@@ -386,7 +386,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, lenny, hasvarfs
+    hostgroups: computers, buildd, lenny, hasvarfs, hashomefs
     contacts: sfrost
 
   puccini:
@@ -422,15 +422,6 @@ servers:
     parents: gw-blackcat
     hostgroups: computers, no-udev, buildd, sw-raid, lenny
 
-  elara:
-    address: 67.210.160.90
-    parents: gw-xandros
-    hostgroups: deadslow
-  europa:
-    address: 67.210.160.89
-    parents: gw-xandros
-    hostgroups: deadslow
-
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
@@ -498,6 +489,14 @@ servers:
     address: 137.82.84.76
     parents: dijkstra
     hostgroups: computers, lenny, hasbootfs, single-cpu
+  bellini:
+    address: 137.82.84.79
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs
+  stabile:
+    address: 137.82.84.72
+    parents: gw-ubc
+    hostgroups: computers, lenny, hassrvfs, sw-raid
 
   lebrun:
     address: 193.198.184.10
@@ -522,12 +521,12 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, hashomefs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
 
   zelenka:
     address: 80.245.147.40
@@ -537,7 +536,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
@@ -704,6 +703,9 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
+  hashomefs:
+    alias: hosts with a /home filesystem
+    private: 1
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
@@ -827,7 +829,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: voltaire, rem, ball, paer, escher
+    hostgroups: hashomefs
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -853,6 +855,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
     hosts: samosa
+  -
+    name: disk usage on /srv/morgue.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -981,12 +988,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd"
-    check: dsa_check_ssh
-    hostgroups: deadslow
-    excludehosts: agnesi
-    normal_check_interval:  180
   -
     name: "network service - sshd - 2260"
     check: dsa_check_ssh_port!2260