add manda-node04
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 9ca32f8..703c187 100644 (file)
@@ -725,6 +725,10 @@ servers:
     address: 82.195.75.103
     parents: gw-manda
     hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts, manyprocesses
+  manda-node04:
+    address: 82.195.75.70
+    parents: gw-manda
+    hostgroups: computers, service, stretch
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -843,7 +847,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
+    hostgroups: computers, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -1176,9 +1180,6 @@ hostgroups:
   xinetd-hosts:
     alias: hosts providing services via xinetd
     private: 1
-  postgres94-hosts:
-    alias: hosts running postgres94
-    private: 1
   postgres96-hosts:
     alias: hosts running postgres96
     private: 1
@@ -2065,12 +2066,12 @@ services:
   -
     name: process - fail2ban
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -C fail2ban-server"
-    hostgroups: heavy-exim
+    hostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - fail2ban
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C fail2ban-server"
     hostgroups: computers
-    excludehostgroups: heavy-exim
+    excludehostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ clamav
   -
@@ -2391,15 +2392,11 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres94-hosts, postgres96-hosts
+    excludehostgroups: postgres96-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
     hostgroups: computers
-  -
-    name: process - postgresql94 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.4/bin/postgres'"
-    hostgroups: postgres94-hosts
   -
     name: process - postgresql96 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.6/bin/postgres'"