Zandonai on Jessie

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 67fc9b9..4d9ada0 100644 (file)
--- 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, no-bacula
+    hostgroups: computers, kvmdomains, jessie
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, no-bacula
+    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
@@ -476,6 +476,14 @@ servers:
     address: 5.153.231.39
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+  mekeel:
+    address: 5.153.231.40
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+  pittar:
+    address: 5.153.231.41
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -622,7 +630,7 @@ servers:
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
@@ -708,7 +716,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
+    hostgroups: computers, service, kvmdomains, apache2-hosts, jessie, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
@@ -724,7 +732,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -975,7 +983,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
   jenkins:
     address: 206.12.19.133
     parents: ganeti2
@@ -991,7 +999,7 @@ servers:
   popov:
     address: 206.12.19.119
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -1007,11 +1015,11 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   muffat:
     address: 206.12.19.146
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
   # }}}
@@ -1095,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
@@ -1378,7 +1386,7 @@ 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 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
     excludehosts: sibelius
   -
@@ -1468,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
@@ -2588,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
   # }}}
@@ -2643,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