Fix at least some of the pg nagios mess
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index c7025c2..e6b5c6b 100644 (file)
@@ -477,19 +477,10 @@ servers:
     address: 82.195.75.97
     parents: gw-man-da
     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  liszt:
-    address: 82.195.75.101
-    parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
-    contacts: bzed
   lully:
     address: 82.195.75.99
     parents: czerny
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs
-  heininen:
-    address: 82.195.75.98
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl, hasvarlogfs
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -687,6 +678,18 @@ servers:
     address: 206.12.19.213
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  boito:
+    address: 206.12.19.216
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  bertali:
+    address: 206.12.19.212
+    parents: sw-ubcece-kais
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+  ganeti2:
+    address: 206.12.19.23
+    parents: sw-ubcece-kais
+    hostgroups: notacomputer
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
@@ -739,6 +742,10 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  falla:
+    address: 206.12.19.117
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   fano:
     address: 206.12.19.110
     parents: luchesi
@@ -747,6 +754,10 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  fischer:
+    address: 206.12.19.112
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -799,14 +810,14 @@ servers:
     address: 206.12.19.126
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
-#  dukas:
-#    address: 206.12.19.128
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
-#  tye:
-#    address: 206.12.19.129
-#    parents: traetta
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: salieri
@@ -847,6 +858,10 @@ servers:
     address: 206.12.19.119
     parents: luchesi
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+  ullmann:
+    address: 206.12.19.141
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -1063,6 +1078,9 @@ hostgroups:
   postgres90-hosts:
     alias: hosts running postgres90
     private: 1
+  postgres91-hosts:
+    alias: hosts running postgres91
+    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1223,12 +1241,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: kassia, spohr, liszt
+    excludehosts: kassia, spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: kassia, spohr, liszt
+    hosts: kassia, spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1299,7 +1317,7 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1473,11 +1491,6 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: liszt
-  -
-    name: processes - total
-    nrpe: "/usr/lib/nagios/plugins/check_procs 800 1000"
-    hosts: liszt
  ####
   -
     name: swap usage - percent
@@ -1673,11 +1686,11 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: liszt, bendel
+    hosts: bendel
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt, wagner, bendel
+    hosts: wagner, bendel
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1695,7 +1708,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, bendel, busoni, wagner
+    excludehosts: bendel, busoni, wagner
 
  ###
   #-
@@ -1724,15 +1737,6 @@ services:
     hostgroups: computers
     excludehostgroups: heavy-postfix, heavy-exim
  ###
-  -
-    name: process - amavis - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
-    hosts: liszt
-  -
-    name: process - amavis - all
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
-    hosts: liszt
-    depends: process - amavis - master
   -
     name: process - amavis - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
@@ -1748,7 +1752,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
     excludehostgroups: amavis-hosts
-    excludehosts: liszt
  ###
   -
     name: process - weightd - master
@@ -1820,17 +1823,6 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
-  -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:350 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hosts: liszt
-    depends: process - postfix - master
-
  ###
   -
     name: network service - smtp
@@ -2019,12 +2011,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehosts: villa, lobos, liszt, senfl, schein
+    excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
     normal_check_interval: 120
-    hosts: villa, lobos, liszt
+    hosts: villa, lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
@@ -2295,7 +2287,11 @@ services:
     name: unwanted process - postresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres90-hosts, postgres84-hosts
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts
+  -
+    name: process - postresql91 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
+    hostgroups: postgres91-hosts
   -
     name: process - postresql90 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
@@ -2340,7 +2336,7 @@ services:
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
     hostgroups: squeeze, wheezy
-    excludehosts: fano, fasch, field, finzi
+    excludehostgroups: freebsd
  ####
   -
     name: process - UPS - nut usbhid-ups - ups1
@@ -2549,7 +2545,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7434 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini