X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3c472051476c7fec4c31c9eb7c1c3a6bb5f27659;hb=5410d83bb5d20703ee786d2737a02542f7e64aa1;hp=4ee2178906bd9005aa161e06e298912141d25ff9;hpb=a0fff9b0763a200963a09157393b980b0746aa75;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4ee2178..3c47205 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -102,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
@@ -115,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
@@ -129,10 +121,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubc
@@ -183,7 +171,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-conova:
-    address: 217.196.146.254
+    address: 217.196.149.238
     parents: gw-ubc
     hostgroups: routing-infrastructure
 
@@ -208,14 +196,10 @@ servers:
     address: 192.25.206.57
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   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
@@ -266,15 +250,11 @@ servers:
   bendel:
     address: 82.195.75.101
     parents: gw-man-da
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  nielsen:
-    address: 82.195.75.99
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -307,10 +287,6 @@ servers:
     address: 82.195.75.97
     parents: gw-man-da
     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  byrd:
-    address: 82.195.75.92
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
@@ -365,10 +341,6 @@ 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
-    parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
@@ -438,18 +410,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
-  albeniz:
-    address: 193.62.202.27
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
-    contacts: tjrc1, dave
-  goetz:
-    address: 193.62.202.26
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
-    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -525,11 +485,6 @@ servers:
     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
@@ -538,7 +493,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
@@ -625,7 +580,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts, apache-https
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -634,10 +589,6 @@ servers:
     address: 206.12.19.21
     parents: tchaikovsky
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  schuetz:
-    address: 206.12.19.119
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  locke:
 #    address: 206.12.19.120
 #    parents: tchaikovsky
@@ -685,7 +636,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
@@ -705,8 +656,7 @@ servers:
   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
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -717,11 +667,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
@@ -742,11 +687,6 @@ servers:
     parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
 
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
   schein:
     address: 149.20.20.6
     parents: gw-isc
@@ -921,7 +861,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
     contacts: faw
 
   zemlinsky:
@@ -935,11 +875,11 @@ servers:
     hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
 
   sompek:
-    address: 217.196.146.208
+    address: 217.196.149.225
     parents: gw-conova
     hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
   stadler:
-    address: 217.196.146.209
+    address: 217.196.149.226
     parents: gw-conova
     hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
 
@@ -960,8 +900,6 @@ hostgroups:
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
     private: 1
-  deadslow:
-    alias: Systems too slow to run any real checks
   freebsd:
     alias: freebsd
     private: 1
@@ -1088,9 +1026,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
@@ -1163,6 +1098,9 @@ hostgroups:
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
 
 #############################
 # servicegroups
@@ -1182,6 +1120,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1194,7 +1134,14 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure
+    excludehostgroups: routing-infrastructure, high-RTT
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,20%!900.0,40%"
+    hostgroups: high-RTT
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1264,7 +1211,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
@@ -1543,12 +1490,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
@@ -1595,6 +1536,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
@@ -1602,12 +1544,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
 
  ###
   -
@@ -1954,7 +1898,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd, abel, alwyn, vasks
+    excludehosts: grieg, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1965,6 +1909,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 ############
  ####
@@ -2144,7 +2092,7 @@ services:
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg, byrd, vasks
+    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2357,17 +2305,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
@@ -2385,23 +2322,6 @@ services:
     hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
-  -
-    name: process - krb - kdc
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
-    hosts: schuetz, byrd
-  -
-    name: process - krb - iprop - slave
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
-    hosts: schuetz
-  -
-    name: process - krb - iprop - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
-    hosts: byrd
-  -
-    name: process - krb - kpasswdd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
-    hosts: byrd
- ###
   -
     name: process - UPS - nut usbhid-ups - ups1
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"