buxtehude: check for postgresq 96 instead of 94

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index efc5860..4a49cdc 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -354,12 +354,12 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
@@ -542,7 +542,7 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, jessie, service, apache2-hosts
+    hostgroups: computers, stretch, service, apache2-hosts
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -632,7 +632,7 @@ servers:
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
@@ -660,7 +660,7 @@ servers:
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-systemd-hosts, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, rsyncd-systemd-hosts, systemd-timesyncd
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
@@ -765,7 +765,7 @@ servers:
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, stretch, hasvarlogfs
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -854,7 +854,7 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-systemd-hosts, apache-https
 
   pieta:
     address: 140.211.166.195
@@ -1038,7 +1038,7 @@ servers:
   diabelli:
     address: 209.87.16.28
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
   menotti:
     address: 209.87.16.29
     parents: ubc-gateway
@@ -1054,11 +1054,11 @@ servers:
   lotti:
     address: 209.87.16.32
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   sonntag:
     address: 209.87.16.34
     parents: ubc-gateway
@@ -1082,11 +1082,11 @@ servers:
   buxtehude:
     address: 209.87.16.39
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
   piu-slave-ubc-01:
     address: 209.87.16.42
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
@@ -1119,7 +1119,7 @@ servers:
   prokofiev:
     address: 177.220.10.140
     parents: gw-unicamp
-    hostgroups: computers, jessie, service
+    hostgroups: computers, stretch, service
   powerpc-unicamp-01:
     address: 177.220.10.141
     parents: prokofiev
@@ -2153,12 +2153,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
     hosts: busoni
-  -
-    name: HW - hpacucli enclosure status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
-    check_interval: 120
-    hosts: franck
   -
     name: HW - hpssacli status
     servicegroups: raid
@@ -2577,30 +2571,6 @@ services:
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: storace, backuphost
   # }}}
-  # {{{ power
-#  -
-#    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'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsd
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsd  -a '/sbin/upsd'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsmon master
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C upsmon  -a '/sbin/upsmon'"
-#    hosts: franck
-#  -
-#    name: process - UPS - nut upsmon worker
-#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsmon  -a '/sbin/upsmon'"
-#    hosts: franck
-#    depends: process - UPS - nut upsmon master
-#  -
-#    name: UPS - on line power
-#    nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
-#    hosts: franck
-#    depends: process - UPS - nut upsd
-  # }}}
   # {{{ buildd
   -
     name: process - buildd