X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=3a039af032329f9dc0cdcf4a7ec260eb893ae4d7;hb=cfed440f0a01fafc964caa9927d4acc67032e357;hp=d6b71777cf4564c964dfa4d9ebbbf78f5c271fff;hpb=a3a621a387886e12a23fcf3d1c0837b7a5a5db14;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d6b7177..3a039af 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -268,7 +268,7 @@ servers:
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq
   ia64-arm-01:
     address: 217.140.96.61
     parents: gw-arm
@@ -464,7 +464,7 @@ servers:
     hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client
   fede:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -580,6 +580,10 @@ servers:
     address: 194.177.211.202
     parents: gw-grnet
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+  x86-grnet-01:
+    address: 194.177.211.203
+    parents: ganeti-grnet
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   schein:
@@ -1031,11 +1035,15 @@ servers:
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
     address: 143.106.167.135
     parents: prokofiev
     hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+  plummer:
+    address: 143.106.167.146
+    parents: prokofiev
+    hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -1892,6 +1900,12 @@ services:
     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: wheezy, jessie
     excludehostgroups: freebsd, alioth
+  -
+    name: process - stunnel4 - puppet-ekeyd is crazy
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
+    hostgroups: computers
+    excludehostgroups: freebsd, alioth
+    excludehosts: czerny, grnet-node01, storace
   # }}}
   # {{{ anti-services
   -
@@ -1931,6 +1945,14 @@ 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: "host SSL cert - debian server"
+    nrpe: "if [ -e /etc/ssl/debian/certs/thishost-server.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost-server.crt; else echo 'No thishost-server.crt on this host.'; fi"
+    hostgroups: computers
+  -
+    name: "host SSL cert - debian client"
+    nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
+    hostgroups: computers
   # }}}
   # {{{ HW health/raid
   -