projects / mirror / dsa-nagios.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dummy commit
[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4282cf5..3db0f26 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -93,10 +93,6 @@ servers:
     address: 185.17.185.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-linaro:
-    address: 64.28.108.36
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-manda:
     address: 82.195.78.118
     parents: gw-ubcece
@@ -184,8 +180,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, jessie, autofs, sw-raid
-    ## No need to update to Stretch, casulana replaces it. It should eventually die.
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
@@ -342,7 +337,7 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
@@ -370,7 +365,7 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   ganeti-bytemark:
-    address: 82.195.75.111
+    address: 5.153.231.1
     parents: gw-bytemark
     hostgroups: notacomputer
   coccia:
@@ -384,7 +379,7 @@ servers:
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -408,7 +403,7 @@ servers:
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -422,7 +417,7 @@ servers:
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
@@ -438,7 +433,7 @@ servers:
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
@@ -454,11 +449,11 @@ servers:
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -478,7 +473,7 @@ servers:
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
@@ -494,7 +489,7 @@ servers:
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
@@ -546,7 +541,7 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, stretch, service, apache2-hosts, apache-https
+    hostgroups: computers, stretch, service, apache2-hosts
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -561,7 +556,7 @@ servers:
     parents: mirror-conova
   mirror-conova-syncproxy4-eu:
     address: 217.196.149.237
-    hostgroups: secondary-IPs, rsyncd-hosts
+    hostgroups: secondary-IPs, rsyncd-hosts, https-service
     parents: mirror-conova
 
   arm-conova-01:
@@ -591,14 +586,6 @@ servers:
     parents: gw-bytemark
     hostgroups: notacomputer
 
-  falla:
-    address: 128.31.0.65
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie, jessie-freebsd
-  fischer:
-    address: 128.31.0.35
-    parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -618,7 +605,7 @@ servers:
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
@@ -660,7 +647,7 @@ servers:
   cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, xinetd-hosts, systemd-timesyncd
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
@@ -730,20 +717,6 @@ servers:
     parents: gw-leaseweb
     hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-linaro
-  arm-linaro-01:
-    address: 64.28.108.83
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  arm-linaro-03:
-    address: 64.28.108.85
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, stretch, broken_mq
-  asachi:
-    address: 64.28.108.84
-    parents: gw-linaro
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, stretch, broken_mq
-  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
@@ -755,11 +728,11 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
   clementi:
     address: 82.195.75.103
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -821,7 +794,7 @@ servers:
   vogler:
     address: 82.195.75.92
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, stretch
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
@@ -845,7 +818,7 @@ servers:
   seger:
     address: 82.195.75.93
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, apache-https, postgres94-hosts, jessie
+    hostgroups: computers, service, apache2-hosts, hassrvfs, rsyncd-hosts, kvmdomains, apache-https, postgres96-hosts, stretch
   suchon:
     address: 82.195.75.68
     parents: ganeti3
@@ -858,11 +831,6 @@ servers:
     hostgroups: computers, buildd, hassrvfs, stretch, incomingmailrelayed
   # }}}
   # {{{ gw-osuosl
-  busoni:
-    address: 140.211.166.202
-    parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
-
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
@@ -884,10 +852,6 @@ servers:
     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
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -897,7 +861,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -939,66 +903,6 @@ servers:
     parents: gw-skroutz1, gw-skroutz2
     hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
   # }}}
-  # {{{ gw-ubcece
-  sw-ubcece:
-    hostgroups: layer2-infrastructure
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-mcld:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  sw-ubcece-kais:
-    hostgroups: layer2-infrastructure
-    parents: sw-ubcece
-    contacts: lfilipoz
-    pingable: false
-    check_command: dsa_check_always_ok
-  spontini:
-    address: 206.12.19.14
-    parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
-    contacts: lfilipoz
-  ubc-bl7:
-    address: 206.12.19.217
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl6:
-    address: 206.12.19.216
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl2:
-    address: 206.12.19.212
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl3:
-    address: 206.12.19.213
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl4:
-    address: 206.12.19.214
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ubc-bl8:
-    address: 206.12.19.218
-    parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  # MSA 2000 (2012i)
-  giustini:
-    address: 192.168.2.6
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
-    # unless we implement runfrom for host alive checks
-    pingable: false
-    check_command: dsa_check_always_ok
-#  locke:
-#    address: 206.12.19.120
-#    parents: sw-ubcece-kais
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
     address: 209.87.16.1
@@ -1090,7 +994,7 @@ servers:
   tye:
     address: 209.87.16.37
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
     parents: ubc-gateway
@@ -1115,7 +1019,7 @@ servers:
   debussy:
     address: 209.87.16.46
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1214,10 +1118,6 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: https://db.debian.org/machines.cgi?host=%s
-  layer2-infrastructure:
-    alias: Layer 2 Devices
-    extinfo-icon_image: base/switch40.png
-    extinfo-icon_image_alt: switch
   layer3-infrastructure:
     alias: Layer 3 Devices
     extinfo-icon_image: base/switch40.png
@@ -1277,8 +1177,6 @@ hostgroups:
     alias: Hosts running wheezy
   jessie:
     alias: Hosts running jessie
-  jessie-freebsd:
-    alias: kFreebsd hosts running jessie
   stretch:
     alias: Hosts running stretch
 
@@ -1347,6 +1245,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  https-service:
+    alias: https service for secondary addresses
+    private: 1
   broken_https_default_vhost:
     alias: https default vhost does not say 200 OK
     private: 1
@@ -1505,7 +1406,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07, fasolo
+    hosts: sibelius, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1527,24 +1428,44 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-1
+    name: disk usage on /srv/farm-snapshot/farm-2017-0
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-1"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-0"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-2
+    name: disk usage on /srv/farm-snapshot/farm-2017-1
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-1"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-3
+    name: disk usage on /srv/farm-snapshot/farm-2017-2
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-3"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-2"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-4
+    name: disk usage on /srv/farm-snapshot/farm-2017-3
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-3"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-4
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-4"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-5
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-5"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-6
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-6"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2017-7
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2017-7"
     hosts: sibelius
   -
     name: disk usage on /srv/ftp-master.debian.org
@@ -1651,10 +1572,6 @@ services:
     hostgroups: computers
     excludehosts: zelenka, zandonai
     excludehostgroups: jessie, stretch
-  -
-    name: process - getty
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/getty"
-    hostgroups: jessie-freebsd
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
@@ -1934,9 +1851,7 @@ services:
   -
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
-    #hosts: casulana
     hostgroups: computers
-    #excludehostgroups: single-cpu, freebsd
     excludehostgroups: freebsd
     excludehosts: harris, smetana
   ###
@@ -2042,7 +1957,7 @@ services:
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
     excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace, ubc-bl2
+    excludehosts: czerny, grnet-node01, storace
   ###
   -
     name: process - rngd
@@ -2149,12 +2064,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
     check_interval: 120
     hostgroups: bm-bl
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    check_interval: 120
-    hosts: busoni
   ###
 #  -
 #    name: HW - edac status
@@ -2205,12 +2114,6 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    excludehosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
-  -
-    name: RAID - DRBD
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
-    hosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2220,7 +2123,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -2230,11 +2133,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, quantz, buxtehude
+    excludehosts: master, quantz, buxtehude
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, quantz, buxtehude
+    hosts: master, quantz, buxtehude
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -2280,17 +2183,17 @@ services:
     excludehostgroups: jessie, stretch
   -
     name: process - spamd - master
-    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 5 --helper-home-dir'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 5 --helper-home-dir'"
     hostgroups: spamd
     excludehosts: picconi
     excludehostgroups: wheezy
   -
     name: process - spamd - master
-    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 20 --min-spare=5 --helper-home-dir'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 20 --min-spare=5 --helper-home-dir'"
     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 -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 10 --helper-home-dir'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid --create-prefs --max-children 10 --helper-home-dir'"
     hosts: bendel
   -
     name: process - spamd - child
@@ -2304,7 +2207,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: bendel, busoni
+    excludehosts: bendel
 
   -
     name: unwanted process - greylistd
@@ -2499,6 +2402,12 @@ services:
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     check_interval: 120
+  -
+    name: network service - https
+    check: check_https
+    hostgroups: https-service
+    excludehostgroups: broken_https_default_vhost
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
@@ -2514,7 +2423,7 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hostgroups: apache-https
+    hostgroups: apache-https, https-service
     depends: network service - https
     check_interval: 60
   -
@@ -2528,11 +2437,7 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: uploadqueue, security_mirror
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: klecker-ftp
+    hostgroups: uploadqueue
   # }}}
   # {{{ postgres
   -
@@ -2920,25 +2825,6 @@ services:
     runfrom: denis
   # }}}
   # {{{ storage
-  -
-    name: ping alive check
-    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: ubc-bl8
-    hosts: giustini
-    check_interval: 5
-    max_check_attempts: 4
-    retry_interval: 1
-  -
-    name: Overall Unit Status
-    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
-    runfrom: ubc-bl8
-    hosts: giustini
-  -
-    name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
-    runfrom: ubc-bl8
-    hosts: giustini
-  ###
   -
     name: process - multipathd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"
@@ -3073,3 +2959,5 @@ services:
 # }}}
 
 # vim: set ts=2 sw=2 et ai si fdm=marker:
+
+
Unnamed repository; edit this file 'description' to name the repository.