X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=56e5145ddb85f6bb419980c13da3114e9cfaae32;hb=a06c2424a36c359710c328b2d27760725e36b66b;hp=2f7ebc40d8130be2330a39aab18607c5c2b65cec;hpb=e97717b92393d44ea0d049798b2522489c0d52b7;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 2f7ebc4..56e5145 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,16 +178,16 @@ 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
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -196,7 +196,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, lenny, hasbootfs
   merulo:
     address: 192.25.206.58
     parents: samosa
@@ -205,17 +205,17 @@ 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
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs
     contacts: bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, hasbootfs
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -237,6 +237,14 @@ servers:
 #    parents: gw-man-da
 #    hostgroups: computers, no-udev, buildd, sw-raid
 #    contacts: bzed
+  unger:
+    address: 82.195.75.102
+    parents: gw-man-da
+    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny
+  handel:
+    address: 82.195.75.104
+    parents: unger
+    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
 
   master:
     address: 70.103.162.29
@@ -255,19 +263,19 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd
+    hostgroups: computers, no-udev, buildd, hasbootfs
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd
+    hostgroups: computers, no-udev, buildd, hasbootfs
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, tftpd-hosts
+    hostgroups: computers, buildd, lenny
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload
+    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -276,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
@@ -285,7 +293,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
@@ -302,7 +310,7 @@ servers:
     hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
-    address: 195.49.152.174
+    address: 93.94.130.160
     parents: gw-dg-i.net
     hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
@@ -325,13 +333,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -364,7 +372,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -430,12 +438,12 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs
     contacts: lfilipoz
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs
 
   lebrun:
     address: 193.198.184.10
@@ -444,28 +452,28 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, hasbootfs
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs
 
   zelenka:
     address: 80.245.147.40
@@ -475,11 +483,11 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu
+    hostgroups: computers, single-cpu, hasbootfs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
 #############################
 # host groups
@@ -548,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
@@ -578,9 +586,9 @@ hostgroups:
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
-  tftpd-hosts:
-    alias: hosts running a tftpd (tftpd-hpa as a daemon)
-    private: 1
+  #tftpd-hosts:
+  #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
+  #  private: 1
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
@@ -621,6 +629,9 @@ hostgroups:
   smart:
     alias: hosts with smartd
     private: 1
+  hasbootfs:
+    alias: hosts with a /boot
+    private: 1
 
 
 #############################
@@ -673,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 /
@@ -690,7 +701,7 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball, goedel, escher
+    hostgroups: hasbootfs
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -972,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
@@ -986,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
  ###
@@ -1316,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 ############
@@ -1651,7 +1662,13 @@ 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
+
+ ####
+  -
+    name: process - libvirtd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C libvirtd -a '/usr/sbin/libvirtd -d'"
+    hosts: unger
 
  ###
   -
@@ -1668,10 +1685,10 @@ services:
     hosts: raptor
 
  ###
-  -
-    name: process - tftpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
-    hostgroups: tftpd-hosts
+  #-
+  #  name: process - tftpd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
+  #  hostgroups: tftpd-hosts
  ###
 #  -
 #    name: process - dhcpd
@@ -1681,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