alwyn.d.o: decommision
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index c8a5425..23a2487 100644 (file)
@@ -90,6 +90,10 @@ servers:
     address: 129.143.57.177
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-leaseweb:
+    address: 185.17.185.190
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-man-da:
     address: 82.195.75.126
     parents: gw-ubcece
@@ -173,7 +177,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres91-hosts, wheezy
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres91-hosts, wheezy
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -201,49 +205,41 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
-  alwyn:
-    address: 217.140.96.59
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
-  arne:
-    address: 217.140.96.61
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
+  hartmann:
+    address: 217.140.96.68
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   hasse:
     address: 217.140.96.68
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
   # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -278,6 +274,22 @@ servers:
     address: 5.153.231.248
     parents: gw-bytemark
     hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl9:
+    address: 5.153.231.249
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+  bm-bl10:
+    address: 5.153.231.250
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+  bm-bl11:
+    address: 5.153.231.251
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+  bm-bl12:
+    address: 5.153.231.252
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
 
   milanollo:
     address: 5.153.231.2
@@ -333,26 +345,22 @@ servers:
     address: 5.153.231.13
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
-  petrova:
-    address: 5.153.231.25
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, 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.15
+    address: 5.153.231.16
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   rapoport:
-    address: 5.153.231.16
+    address: 5.153.231.15
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -369,7 +377,7 @@ servers:
     address: 5.153.231.21
     parents: ganeti-bytemark
     contact_groups: alioth-admins
-    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts, alioth, heavy-exim
+    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts, alioth, heavy-exim, spamd
     no-servicegroups: true
   dillon:
     address: 5.153.231.22
@@ -383,6 +391,26 @@ servers:
     address: 5.153.231.24
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
+  petrova:
+    address: 5.153.231.25
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+  oyens:
+    address: 5.153.231.26
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts, openstack-controller, apache-https
+  barriere:
+    address: 5.153.231.27
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
+  quantz:
+    address: 5.153.231.28
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
+  portman:
+    address: 5.153.231.29
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -460,10 +488,6 @@ servers:
     address: 194.177.211.204
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
-  cilea:
-    address: 194.177.211.205
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -483,11 +507,37 @@ servers:
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
+  # {{{ gw-leaseweb
+  lw01:
+    address: 185.17.185.177
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw02:
+    address: 185.17.185.178
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw03:
+    address: 185.17.185.179
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw04:
+    address: 185.17.185.180
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180
+  lw05:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
+  lw06:
+    address: 185.17.185.182
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
+  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, wheezy
     contacts: pkern
   # }}}
   # {{{ gw-man-da
@@ -566,10 +616,6 @@ servers:
     address: 82.195.75.112
     parents: ganeti3
     hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
-  vieuxtemps:
-    address: 82.195.75.113
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -702,7 +748,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, wheezy, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, xinetd-hosts, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -813,10 +859,6 @@ servers:
     address: 206.12.19.121
     parents: sw-ubcece-kais
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
-  quantz:
-    address: 206.12.19.122
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: traetta
@@ -844,7 +886,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
@@ -853,10 +895,6 @@ servers:
     address: 206.12.19.134
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
-  barriere:
-    address: 206.12.19.135
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   diabelli:
     address: 206.12.19.136
     parents: traetta
@@ -926,18 +964,14 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  hildegard:
-    address: 144.32.168.74
-    parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
   hummel:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
@@ -981,8 +1015,6 @@ hostgroups:
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
     private: 1
-  deadslow:
-    alias: Systems too slow to run any real checks
   freebsd:
     alias: freebsd
     private: 1
@@ -1032,6 +1064,12 @@ hostgroups:
   dl585:
     alias: HP DL385 hosts
     private: 1
+  dl180:
+    alias: HP DL180
+    private: 1
+  dl120:
+    alias: HP DL120
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -1080,9 +1118,9 @@ hostgroups:
   jetty-hosts:
     alias: hosts running jetty
     private: 1
-  varnish-hosts:
-    alias: hosts running varnish
-    private: 1
+  #varnish-hosts:
+  #  alias: hosts running varnish
+  #  private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1195,6 +1233,12 @@ hostgroups:
   alioth:
     alias: machines that just are just awkward
     private: 1
+  openstack-compute:
+    alias: nodes that run OpenStack compute
+    private: 1
+  openstack-controller:
+    alias: nodes that run OpenStack controller
+    private: 1
 
   security_mirror:
     alias: hosts that are security mirrors
@@ -1371,11 +1415,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
     hosts: franck
-  -
-    name: disk usage on /srv/pgbackup
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
-    hosts: franck
   -
     name: disk usage on /srv/pgbackup
     servicegroups: diskspace
@@ -1642,7 +1681,6 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: deadslow
     servicegroups: time
   #
   -
@@ -1747,19 +1785,18 @@ services:
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix, deadslow
+    excludehostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix, deadslow
+    excludehostgroups: heavy-exim, heavy-postfix
  ###
   -
     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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
     excludehosts: picconi
-    excludehostgroups: deadslow
   -
     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 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1788,7 +1825,7 @@ services:
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: spamd, deadslow
+    excludehostgroups: spamd
     excludehosts: bendel, busoni, buxtehude
 
  ###
@@ -1801,7 +1838,6 @@ services:
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ###
   -
@@ -1817,7 +1853,7 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, heavy-exim, deadslow
+    excludehostgroups: heavy-postfix, heavy-exim
  ###
   -
     name: process - amavis - master
@@ -1833,28 +1869,28 @@ services:
     name: unwanted process - amavis
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
     hostgroups: computers
-    excludehostgroups: amavis-hosts, deadslow
+    excludehostgroups: amavis-hosts
  ###
   -
     name: process - weightd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (master)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
   -
     name: process - weightd - cache
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (cache)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
     depends: process - weightd - master
   -
     name: process - weightd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
     depends: process - weightd - master
  ###
   -
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, deadslow
+    excludehostgroups: heavy-postfix, alioth
 
 
  ###
@@ -1984,7 +2020,6 @@ services:
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ####
  ###
@@ -2000,23 +2035,20 @@ services:
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
-    excludehostgroups: deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server, deadslow
+    excludehostgroups: nfs-client, nfs-server
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: abel, alwyn
-    excludehostgroups: deadslow
+    excludehosts: abel
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehostgroups: deadslow
 
  ####
   -
@@ -2075,7 +2107,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl180
     excludehosts: schein, rietz
   -
     name: HW - hpacucli status
@@ -2102,6 +2134,13 @@ services:
     normal_check_interval: 120
     hostgroups: dl585
  ###
+  -
+    name: HW - edac status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
+    normal_check_interval: 120
+    hosts: lw05, lw06
+    #hostgroups: computers
+    #excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
@@ -2218,7 +2257,7 @@ services:
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehostgroups: xinetd-hosts, deadslow
+    excludehostgroups: xinetd-hosts
  ###
   -
     name: network service - finger
@@ -2274,7 +2313,7 @@ services:
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
     hostgroups: computers
-    excludehostgroups: apache2-hosts, deadslow
+    excludehostgroups: apache2-hosts
 
   -
     name: network service - http
@@ -2326,26 +2365,26 @@ services:
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
-    excludehostgroups: apache-https, deadslow
+    excludehostgroups: apache-https
     # ravel does ssh on port 443
     excludehosts: ravel
     normal_check_interval: 60
 
 ###
-  -
-    name: process - varnish - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
-    hostgroups: varnish-hosts
-  -
-    name: process - varnish - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
-    hostgroups: varnish-hosts
-    depends: process - varnish - master
-  -
-    name: network service - http
-    check: check_http
-    hostgroups: varnish-hosts
-    depends: process - varnish - master
+  #-
+  #  name: process - varnish - master
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+  #  hostgroups: varnish-hosts
+  #-
+  #  name: process - varnish - worker
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+  #  hostgroups: varnish-hosts
+  #  depends: process - varnish - master
+  #-
+  #  name: network service - http
+  #  check: check_http
+  #  hostgroups: varnish-hosts
+  #  depends: process - varnish - master
 
 ###
 
@@ -2363,7 +2402,7 @@ services:
     name: unwanted process - named
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named"
     hostgroups: computers
-    excludehostgroups: bind9-hosts, deadslow
+    excludehostgroups: bind9-hosts
 
  ####
   -
@@ -2412,7 +2451,7 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres91-hosts, deadslow
+    excludehostgroups: postgres91-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
@@ -2515,10 +2554,6 @@ services:
     name: process - mountd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
     hostgroups: nfs-server
-  -
-    name: nfs server glinka reachable
-    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.76 -w 50,10% -c 200,30%"
-    hosts: quantz
   #
   -
     name: process - automount
@@ -2528,7 +2563,7 @@ services:
     name: unwanted process - automount
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
     hostgroups: computers
-    excludehostgroups: autofs, deadslow
+    excludehostgroups: autofs
 
  ############ MISC OTHER Stuff ############
  #####
@@ -2573,10 +2608,6 @@ services:
     name: DNS SOA sync - debian.com
     check: "dsa_check_soas_add!denis.debian.org!debian.com"
     hosts: global
-  -
-    name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!denis.debian.org!mirror.debian.net"
-    hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
     check: "dsa_check_soas_add!denis.debian.org!144-28.118.59.86.in-addr.arpa"
@@ -2622,7 +2653,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=8867 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
  ############
@@ -2632,5 +2663,49 @@ services:
     hostgroups: porterbox
     normal_check_interval:  60
     retry_check_interval: 15
-
+ ############
+#  -
+#    name: process - openstack - keystone
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C keystone-all -a '/usr/bin/python /usr/bin/keystone-all'"
+#    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 64 -p 11211 -u nobody -l 127.0.0.1'"
+    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
 # vim: set ts=2 sw=2 et ai si fdm=marker: