X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=8441c16f69ad5572ade70c7848869a9374f035c3;hb=36a78036e5e84fa0053f9fe2bc89b47174847e36;hp=5f1294814de52fd25e96d9677b364c87e3e3407d;hpb=814c82159a21a5ec39197d2420b69d025fa3fbeb;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5f12948..8441c16 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -161,7 +161,7 @@ servers:
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
     #address: 146.97.42.26
-    address: 146.97.41.66
+    address: 195.195.130.142
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-zivit:
@@ -390,11 +390,11 @@ servers:
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy
+    hostgroups: computers, kvmdomains, jessie
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy
+    hostgroups: computers, kvmdomains, jessie
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
@@ -410,7 +410,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -1103,7 +1103,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, hassrvfs, jessie
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
@@ -1386,13 +1386,13 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
     excludehosts: sibelius
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x /srv/farm-snapshot/farm-misc 95 98"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
 
   -
@@ -1476,9 +1476,9 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
   -
-    name: disk usage on /var/lib/postgresql/9.1
+    name: disk usage on /var/lib/postgresql/9.4
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.4"
     hosts: franck
   -
     name: disk usage on /srv/ftp-master.debian.org
@@ -2596,7 +2596,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=9966 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}
@@ -2651,13 +2651,11 @@ services:
     hostgroups: openstack-controller
   # }}}
   # {{{ misc
-#  -
-#    Disable this check until logind and binfmt_misc issues are fixed
-#    something unknown is triggering mount of binfmt_misc
-#    https://bugs.debian.org/772700
-#    name: system - all services running
-#    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-#    hostgroups: jessie
+  -
+    name: system - all services running
+    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
+    hostgroups: jessie
+    excludehostgroups: freebsd
   ###
   -
     name: process - rngd