X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=70ac720158cd86477be55a2fabe4608910f3e993;hb=a72e60c2247bd36d1f1fa417b18ef872ba1e0d91;hp=d84bdecc6eaa57abe49d9a2272be3c40fe77819e;hpb=de44fa0f653ce592f808edb61d5170643e8df9af;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d84bdec..70ac720 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -94,10 +94,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-nmmn:
-    address: 217.114.76.81
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-utwente:
     address: 130.89.149.1
     parents: gw-ubc
@@ -106,10 +102,6 @@ servers:
   #  address: 157.193.39.254
   #  parents: gw-ubc
   #  hostgroups: routing-infrastructure
-  gw-agnesi:
-    address: 65.173.90.22
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-ubc:
     address: 206.12.19.254
     parents: tchaikovsky
@@ -119,10 +111,6 @@ servers:
     address: 161.53.160.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-telegraaf:
-    address: 82.94.249.153
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-telegraaf2:
     address: 217.196.40.15
     parents: gw-ubc
@@ -186,6 +174,10 @@ servers:
     address: 148.100.96.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-conova:
+    address: 217.196.149.238
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -215,7 +207,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -263,6 +255,10 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
+  bendel:
+    address: 82.195.75.101
+    parents: gw-man-da
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
@@ -318,7 +314,7 @@ servers:
   new-master:
     address: 82.195.75.110
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   master:
     address: 70.103.162.29
@@ -343,7 +339,7 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, squeeze
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -361,10 +357,18 @@ servers:
     address: 140.211.15.34
     parents: gw-osuosl
     hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
-  zee:
-    address: 140.211.166.16
+  parry:
+    address: 140.211.15.153
+    parents: gw-osuosl
+    hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs
+  partch:
+    address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
+    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+  piston:
+    address: 140.211.15.154
+    parents: gw-osuosl
+    hostgroups: computers, hassrvfs, squeeze
 
   villa:
     address: 212.211.132.32
@@ -448,7 +452,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, lenny
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
     contacts: joerg
 
   schumann:
@@ -477,15 +481,10 @@ servers:
     parents: gw-blackcat
     hostgroups: computers, buildd, sw-raid, squeeze
 
-  pescetti:
-    address: 217.114.76.85
-    parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs, squeeze
-
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
+    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -511,14 +510,9 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
     contacts: luk
 
-  agnesi:
-    address: 67.233.102.241
-    parents: gw-agnesi
-    hostgroups: deadslow, porterbox, lenny
-
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
@@ -527,7 +521,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -602,15 +596,15 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
     parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
@@ -674,7 +668,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
   jenkins:
     address: 206.12.19.133
     parents: salieri
@@ -682,7 +676,19 @@ servers:
   blavet:
     address: 206.12.19.134
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+  barriere:
+    address: 206.12.19.135
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  diabelli:
+    address: 206.12.19.136
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+  bizet:
+    address: 206.12.19.137
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -693,11 +699,6 @@ servers:
     parents: gw-carnet
     hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
-  tartini:
-    address: 82.94.249.158
-    parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service, lenny
-
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
@@ -910,6 +911,15 @@ servers:
     parents: gw-marist
     hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
 
+  sompek:
+    address: 217.196.149.225
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+  stadler:
+    address: 217.196.149.226
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+
 #############################
 # host groups
 #
@@ -1055,9 +1065,6 @@ hostgroups:
   postgres90-hosts:
     alias: hosts running postgres90
     private: 1
-  mysql-hosts:
-    alias: hosts running mysql
-    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1092,9 +1099,6 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
-  smart:
-    alias: hosts with smartd
-    private: 1
   hasbootfs:
     alias: hosts with a /boot filesystem
     private: 1
@@ -1152,6 +1156,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1186,6 +1192,13 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
     hostgroups: computers
+    excludehosts: sibelius
+  -
+    name: disk usage - all
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 95 98"
+    hosts: sibelius
+
   -
     name: disk usage on /
     servicegroups: diskspace
@@ -1227,7 +1240,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, tartini, powell, piatti
+    hosts: saens, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1273,47 +1286,47 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-01
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-01"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-01"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-23
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-23"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-23"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-45
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-45"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-45"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-67
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-67"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-89
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-ab
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-ab"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-cd
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-cd"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-f
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-e
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1506,12 +1519,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd - 2260"
-    check: dsa_check_ssh_port!2260
-    hosts: agnesi
-    normal_check_interval:  180
-
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
@@ -1535,17 +1542,17 @@ services:
  ###
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
     excludehostgroups: freebsd, armhf
     excludehosts: vasks, wagner
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
     hostgroups: armhf
   -
     name: network service - munin-node
@@ -1558,6 +1565,7 @@ services:
     name: process - ntpd
     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
+    servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
@@ -1565,12 +1573,14 @@ services:
     depends: process - ntpd
     excludehosts: ancina
     excludehostgroups: ntpsuckers
+    servicegroups: time
   #
   -
     name: network service - time
     check: dsa_check_time
     hosts: ancina
     depends: process - xinetd
+    servicegroups: time
 
  ###
   -
@@ -1588,13 +1598,13 @@ services:
     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: computers
-    excludehostgroups: freebsd, armhf
+    excludehostgroups: freebsd
     excludehosts: vasks, wagner
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: freebsd, armhf
+    hostgroups: freebsd
 
   -
     name: remote logging
@@ -1851,6 +1861,7 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
+    excludehosts: wagner, vasks
     normal_check_interval: 60
   -
     name: setup - ud-ldap freshness
@@ -1927,6 +1938,10 @@ services:
     name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
+  -
+    name: "pg SSL cert"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/pg-ubcece.debian.org-chained.pem"
+    hosts: danzi
 
  ############ Processes/Services that only run on some computers ############
  ####
@@ -2178,14 +2193,8 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: kassia, klecker
+    excludehosts: klecker
     depends: process - apache2 - master
-  -
-    name: network service - http
-    check: check_http
-    depends: kassia:process - apache2 - master
-    #hosts: kassia-sec, kassia-ftp, kassia-volatile
-    hosts: kassia-ftp, kassia-volatile
   -
     name: network service - http
     check: check_http
@@ -2242,28 +2251,21 @@ services:
     name: process - vsftp - listener
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
   -
     name: process - vsftp - instance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
     depends: process - vsftp - listener
   -
     name: network service - ftp
     check: check_ftp
-    #hosts: kassia-sec, kassia-ftp
-    hosts: kassia-ftp
-    depends: kassia:process - xinetd
-  -
-    name: network service - ftp
-    check: check_ftp
-    #hosts: kassia-sec, kassia-ftp
     hosts: klecker-ftp
     depends: klecker:process - xinetd
 
@@ -2332,17 +2334,6 @@ services:
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - mysql - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C mysqld_safe -a '/bin/sh /usr/bin/mysqld_safe'"
-    hostgroups: mysql-hosts
-  -
-    name: process - mysql - workers
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u mysql -C mysqld -a /usr/sbin/mysqld"
-    hostgroups: mysql-hosts
-    depends: process - mysql - master
-
  ####
   -
     name: process - stunnel4 - postgres-udd
@@ -2438,6 +2429,12 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contact_groups: buildd
+ ####
+  -
+    name: network service - gobby
+    check: check_tcp!6523
+    hosts: gombert
+    contact_groups: gobby
 
  ###
   #-
@@ -2450,10 +2447,6 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
 #    hosts: paer
  ###
-  -
-    name: process - smartd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C smartd -a '/usr/sbin/smartd --pidfile /var/run/smartd.pid --interval=1800'"
-    hostgroups: smart
 
  ############ NFS Stuff ############
  ####
@@ -2590,6 +2583,6 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini