X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=e0ec06044bbd4cbd587cf034392017c4a5cddb3e;hb=8a3ff7c22a958e94ea17f3878aa52fd1a3142e82;hp=a8b0cf1d40b75caa80b8c3e1e53036fe53cd1d4e;hpb=f97e9c3da88b304f964ee824a50c6b2998dbd56b;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a8b0cf1..e0ec060 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -170,7 +170,7 @@ servers:
   gluck:
     address: 192.25.206.10
     parents: samosa
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny
   merkel:
     address: 192.25.206.16
     parents: samosa
@@ -178,11 +178,11 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: samosa
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
@@ -205,7 +205,7 @@ servers:
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385, bind9-hosts
+    hostgroups: computers, service, dl385, bind9-hosts, lenny
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
@@ -215,7 +215,7 @@ servers:
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -253,7 +253,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts
+    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny
 
   ries:
     address: 128.148.34.103
@@ -284,7 +284,7 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
@@ -307,7 +307,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
 
   argento:
     address: 93.94.130.160
@@ -322,7 +322,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu
+    hostgroups: computers, no-udev, porterbox, single-cpu, no-samhain
 
   raptor:
     address: 195.243.109.162
@@ -344,7 +344,7 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, lenny
     contacts: tjrc1
 
   verdi:
@@ -366,7 +366,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny
     contacts: joerg
 
   schumann:
@@ -376,7 +376,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny
 
   caballero:
     address: 193.201.200.200
@@ -438,7 +438,7 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
     contacts: lfilipoz
   ravel:
     address: 137.82.84.66
@@ -452,7 +452,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
 
   tartini:
     address: 82.94.249.158
@@ -468,12 +468,12 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
 
   zelenka:
     address: 80.245.147.40
@@ -487,7 +487,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
 #############################
 # host groups
@@ -556,9 +556,9 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
-  syslog-ng-hosts:
-    alias: hosts running syslog-ng instead of sysklogd
-    private: 1
+  #syslog-ng-hosts:
+  #  alias: hosts running syslog-ng instead of sysklogd
+  #  private: 1
   rsyslog-hosts:
     alias: hosts running rsyslogd instead of sysklogd
     private: 1
@@ -684,7 +684,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc 90 95"
     hostgroups: computers
   -
     name: disk usage on /
@@ -983,10 +983,10 @@ services:
     hostgroups: computers
 
  ###
-  -
-    name: process - syslog-ng
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: syslog-ng-hosts
+ # -
+ #   name: process - syslog-ng
+ #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
+ #   hostgroups: syslog-ng-hosts
  ###
   -
     name: process - rsyslogd
@@ -997,12 +997,12 @@ services:
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
 
  ### MAIL STUFF
  ###
@@ -1327,7 +1327,7 @@ services:
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehosts: lobos, villa
+    excludehosts: lobos
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1662,7 +1662,7 @@ services:
   -
     name: process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"
-    hosts: lobos, villa
+    hosts: lobos
 
  ####
   -
@@ -1698,7 +1698,7 @@ services:
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hosts: villa, lobos, steffani, kassia, master
+    hosts: lobos, steffani, kassia, master
  ###
   -
     name: process - smartd