Add x86-csail-02
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 7de5dad..0ebfe5d 100644 (file)
@@ -160,8 +160,7 @@ servers:
     hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
-    #address: 146.97.42.26
-    address: 146.97.41.66
+    address: 146.97.71.46
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-zivit:
@@ -193,15 +192,15 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy
+    hostgroups: computers, acpid-hosts, service, jessie
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres91-hosts, wheezy
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, jessie, apache-https
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -226,6 +225,14 @@ servers:
     address: 141.170.6.150
     parents: gw-aql
     hostgroups: computers, buildd, jessie, nfs-client
+  mips-aql-04:
+    address: 141.170.6.154
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, nfs-client
+  mips-aql-05:
+    address: 141.170.6.155
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, nfs-client
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -352,7 +359,7 @@ servers:
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
@@ -370,7 +377,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres91-hosts, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -383,22 +390,18 @@ servers:
     address: 5.153.231.13
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts
-  couper:
-    address: 5.153.231.14
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   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
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, nfs-client, autofs
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -410,7 +413,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
@@ -432,7 +435,7 @@ servers:
   oyens:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, openstack-controller, apache-https, broken_mq
+    hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq, apache2-hosts # apache-https
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -440,7 +443,7 @@ servers:
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
   portman:
     address: 5.153.231.29
     parents: ganeti-bytemark
@@ -476,6 +479,18 @@ 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, nfs-client, autofs #, apache2-hosts
+  pinel:
+    address: 5.153.231.42
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -536,7 +551,7 @@ servers:
   fischer:
     address: 128.31.0.35
     parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -545,10 +560,18 @@ servers:
     address: 128.31.0.50
     parents: ganeti-csail
     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  x86-csail-02:
+    address: 128.31.0.68
+    parents: ganeti-csail
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+  soriano:
+    address: 128.31.0.67
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
   # }}}
   # {{{ gw-dgi
   storace:
@@ -622,7 +645,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
@@ -640,20 +663,16 @@ servers:
   asachi:
     address: 64.28.108.84
     parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, jessie, broken_mq
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
     contacts: pkern
   # }}}
   # {{{ gw-man-da
-  ball:
-    address: 82.195.75.70
-    parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, wheezy, sw-raid
   # bartok TODO
   czerny:
     address: 82.195.75.109
@@ -666,19 +685,11 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, wheezy, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
-  mipsel-manda-01:
-    address: 82.195.75.72
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
-  mipsel-manda-02:
-    address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -708,7 +719,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
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
@@ -724,7 +735,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
@@ -740,15 +751,15 @@ servers:
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, jessie
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   # }}}
   # {{{ gw-marist
   zani:
@@ -768,7 +779,23 @@ servers:
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+  pieta:
+    address: 140.211.166.195
+    parents: gw-osuosl
+    hostgroups: computers, jessie, service
+  ppc64el-osuosl-01:
+    address: 140.211.166.196
+    parents: pieta
+    hostgroups: computers, hassrvfs, buildd, jessie
+  powerpc-osuosl-01:
+    address: 140.211.166.197
+    parents: pieta
+    hostgroups: computers, hassrvfs, buildd, jessie
+  pizzetti:
+    address: 140.211.166.198
+    parents: pieta
+    hostgroups: computers, jessie, hassrvfs, porterbox
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -782,10 +809,6 @@ servers:
     address: 140.211.166.46
     parents: gw-osuosl
     hostgroups: computers, porterbox, hasusrfs, wheezy
-  parry:
-    address: 140.211.15.153
-    parents: gw-osuosl
-    hostgroups: computers, jessie, buildd, hassrvfs, sw-raid
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -811,7 +834,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres91-hosts, service, apache2-hosts, sw-raid, wheezy, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, acpid-hosts, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -837,11 +860,11 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy, sw-raid
+    hostgroups: computers, buildd, jessie, sw-raid
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -897,7 +920,7 @@ servers:
   tchaikovsky:
     address: 206.12.19.118
     parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, jessie
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -917,12 +940,12 @@ servers:
   fano:
     address: 206.12.19.110
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   gabrielli:
     address: 206.12.19.17
@@ -939,7 +962,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, wheezy
+    hostgroups: computers, dl585, acpid-hosts, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -947,19 +970,19 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   nono:
     address: 206.12.19.123
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
   reger:
     address: 206.12.19.124
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
   danzi:
     address: 206.12.19.125
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: ganeti2
@@ -975,23 +998,19 @@ 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
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   diabelli:
     address: 206.12.19.136
     parents: ganeti2
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, broken_https_default_vhost
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
   bizet:
     address: 206.12.19.137
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula
-  popov:
-    address: 206.12.19.119
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
   beach:
     address: 206.12.19.140
     parents: ganeti2
@@ -999,7 +1018,7 @@ servers:
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -1007,11 +1026,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
   # }}}
@@ -1029,11 +1048,11 @@ servers:
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
     address: 143.106.167.135
     parents: prokofiev
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, jessie
   plummer:
     address: 143.106.167.146
     parents: prokofiev
@@ -1095,7 +1114,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,13 +1397,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
 
   -
@@ -1468,9 +1487,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
@@ -1540,11 +1559,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev
+    excludehosts: prokofiev, pieta
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev
+    hosts: prokofiev, pieta
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -2151,7 +2170,7 @@ services:
     hosts: picconi
   -
     name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 10 --helper-home-dir'"
     hosts: bendel
   -
     name: process - spamd - child
@@ -2185,7 +2204,7 @@ services:
     excludehostgroups: wheezy
   -
     name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
     hostgroups: heavy-postfix
   #
   -
@@ -2327,7 +2346,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker
+    excludehosts: klecker, oyens
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2347,14 +2366,14 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-    excludehosts: handel,menotti
+    excludehosts: menotti
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
-    hosts: handel,menotti
+    hosts: menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2588,7 +2607,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=10867 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}
@@ -2601,55 +2620,53 @@ services:
     retry_check_interval: 15
   # }}}
   # {{{ openstack
-  -
-    name: process - openstack - memcached
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - glance-registry
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u glance -C glance-registry -a '/usr/bin/python /usr/bin/glance-registry'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-api
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'"
-    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - memcached
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - glance-registry
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u glance -C glance-registry -a '/usr/bin/python /usr/bin/glance-registry'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-api
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'"
+#    hostgroups: openstack-controller
   -
     name: process - openstack - nova-compute
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'"
     hostgroups: openstack-compute
-  -
-    name: process - openstack - nova-cert
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-conductor
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-conductor -a '/usr/bin/python /usr/bin/nova-conductor --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-conductor.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-consoleauth
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-consoleauth.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-scheduler
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-scheduler --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-scheduler.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-spicehtml5proxy
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-spicehtml5proxy --log-file /var/log/nova/nova-consoleproxy.log'"
-    hostgroups: openstack-controller
-  -
-    name: process - openstack - neutron-server
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u neutron -C neutron-server -a '/usr/bin/python2.7 /usr/bin/neutron-server --config-file=/etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-server.log'"
-    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-cert
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-conductor
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-conductor -a '/usr/bin/python /usr/bin/nova-conductor --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-conductor.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-consoleauth
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-consoleauth.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-scheduler
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-scheduler --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-scheduler.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - nova-spicehtml5proxy
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -a '/usr/bin/python /usr/bin/nova-spicehtml5proxy --log-file /var/log/nova/nova-consoleproxy.log'"
+#    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - neutron-server
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u neutron -C neutron-server -a '/usr/bin/python2.7 /usr/bin/neutron-server --config-file=/etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-server.log'"
+#    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
@@ -2692,7 +2709,7 @@ services:
   ###
   -
     name: process - icinga
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:60 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
   ###
   -
@@ -2719,7 +2736,7 @@ services:
   ####
   -
     name: puppetmaster cert
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
+    nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
     hosts: handel
     normal_check_interval: 60
     max_check_attempts: 2