X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=9cc9699aead685d8d49369217d4f44107e28c9e2;hb=611d84386bb952fe4bf5b13d60d9bebbf634b3bf;hp=8de66a55e03c28e84c7923cd985ddfe6df66224a;hpb=7e3fbbd6d3391dbce35081b6f1490f0eba1d67a5;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8de66a5..9cc9699 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -106,7 +106,7 @@ servers:
     parents: ubc-gateway
     hostgroups: layer3-infrastructure
   gw-sanger:
-    address: 193.62.202.20
+    address: 193.62.202.25
     parents: ubc-gateway
     hostgroups: layer3-infrastructure
     contacts: tjrc1, dave
@@ -342,12 +342,12 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, 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, stretch, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   bmdb1:
     address: 5.153.231.10
@@ -405,14 +405,6 @@ servers:
     address: 5.153.231.25
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
-  olin:
-    address: 5.153.231.26
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  barriere:
-    address: 5.153.231.27
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, hassrvfs, porterbox, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -444,7 +436,7 @@ servers:
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
@@ -460,7 +452,7 @@ servers:
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -580,6 +572,14 @@ servers:
     address: 128.31.0.69
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, uploadqueue, queued, systemd-timesyncd
+  barriere:
+    address: 128.31.0.66
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, porterbox, systemd-timesyncd
+  olin:
+    address: 128.31.0.65
+    parents: ganeti-csail
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -609,7 +609,7 @@ servers:
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
   geo3:
     address: 194.177.211.201
     parents: gw-grnet
@@ -835,7 +835,7 @@ servers:
   loghost-osuosl-01:
     address: 140.211.166.202
     parents: pijper
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
 
   pieta:
     address: 140.211.166.195
@@ -916,7 +916,7 @@ servers:
   rachmaninoff:
     address: 209.87.16.20
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
     parents: ganeti2-ubc
@@ -960,7 +960,7 @@ servers:
   lotti:
     address: 209.87.16.32
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
     parents: ganeti2-ubc
@@ -992,7 +992,7 @@ servers:
   piu-slave-ubc-01:
     address: 209.87.16.42
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
@@ -1124,15 +1124,15 @@ servers:
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   antheil:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, buster, buildd
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -2993,6 +2993,18 @@ services:
     hostgroups: computers
     check_interval:  60
     retry_interval: 15
+
+  -
+    name: puppet - catalog run
+    remotecheck: "/usr/lib/nagios/plugins/check_puppetdb_nodes -a 4 --node $HOSTNAME$.debian.org -w 720 -c 1440"
+    hostgroups: computers
+    runfrom: handel
+
+  -
+    name: puppet - all catalog runs
+    nrpe: "/usr/lib/nagios/plugins/check_puppetdb_nodes -a 4 -w 720 -c 1440"
+    hosts: handel
+
   ####
   -
     name: ping peer on mgmt network