X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=ec86a04e958d090429b31e2dbf51550cd75f3c04;hb=3346282efbfda07d7c391729be63bad1ecade7a5;hp=4a49cdcba4c0636b259547087f2a12ec92363018;hpb=ca4253d831788130ac430413497b60e8f2904b03;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4a49cdc..ec86a04 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -334,7 +334,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, nfs-server, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -388,11 +388,11 @@ servers:
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
@@ -400,7 +400,7 @@ servers:
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
@@ -636,7 +636,7 @@ servers:
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
@@ -645,18 +645,14 @@ servers:
     address: 194.177.211.203
     parents: ganeti-grnet
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  gigault:
-    address: 194.177.211.204
-    parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, postgres96-hosts, apache2-hosts, apache-https, systemd-timesyncd
   boott:
     address: 194.177.211.206
     parents: ganeti-grnet
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   porta:
     address: 194.177.211.207
     parents: ganeti-grnet
@@ -761,7 +757,7 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
@@ -773,7 +769,7 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -782,10 +778,6 @@ servers:
     address: 82.195.75.107
     parents: ganeti3
     hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, kvmdomains, stretch, apache-https
-  stockhausen:
-    address: 82.195.75.108
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
     parents: gw-manda
@@ -1050,7 +1042,7 @@ servers:
   geo2:
     address: 209.87.16.31
     parents: ubc-gateway
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   lotti:
     address: 209.87.16.32
     parents: ubc-gateway
@@ -1078,7 +1070,7 @@ servers:
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
   buxtehude:
     address: 209.87.16.39
     parents: ubc-gateway
@@ -1538,11 +1530,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
-  -
-    name: disk usage on /var/lib/postgresql/9.4
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.4"
-    hosts: vittoria
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
@@ -2156,7 +2143,7 @@ services:
   -
     name: HW - hpssacli status
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    nrpe: "if [ -e /var/cache/dsa/nagios/dsa-check-hpssacli ] ; then /usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/dsa-check-hpssacli ; else /usr/lib/nagios/plugins/dsa-check-hpssacli; fi"
     check_interval: 120
     hostgroups: hpnewraid
   ###