X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=63ad100591227faef4d79dc2e17c9063851a1aa5;hb=0929c982ab97bdb6f32327f5007aa6d67995d520;hp=b400f2e3a7a583f433a21daece2777924d6250a5;hpb=9076f9562a9cd7aeb7a20fbf66681b38585cdda9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b400f2e..63ad100 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -462,6 +462,10 @@ servers:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie
+  sor:
+    address: 5.153.231.38
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -1024,11 +1028,15 @@ servers:
   prokofiev:
     address: 143.106.167.147
     parents: gw-unicamp
-    hostgroups: computers, jessie, acpid-hosts, service
+    hostgroups: computers, jessie, service
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  ppc64el-unicamp-01:
+    address: 143.106.167.135
+    parents: prokofiev
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -1096,7 +1104,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, wheezy
+    hostgroups: computers, service, wheezy, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1705,12 +1713,16 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: freebsd
+    excludehostgroups: freebsd, jessie
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: freebsd
+  -
+    name: process - syslog-ng
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -F'"
+    hostgroups: jessie
 
   -
     name: remote logging on lotti
@@ -1945,7 +1957,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --scan'"
     hostgroups: sw-raid
-    hostgroups: jessie
+    excludehostgroups: wheezy
   -
     name: RAID - sw raid
     servicegroups: raid