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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5d995af..63ad100 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -118,6 +118,10 @@ servers:
     address: 193.201.200.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-sakura:
+    address: 133.242.99.65
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sanger:
     address: 193.62.202.20
     parents: gw-ubcece
@@ -458,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:
@@ -1020,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:
@@ -1088,6 +1100,11 @@ servers:
     parents: gw-zivit
     hostgroups: computers, porterbox, hassrvfs, wheezy
   # }}}
+  # {{{ gw-sakura
+  setoguchi:
+    address: 133.242.99.74
+    parents: gw-sakura
+    hostgroups: computers, service, wheezy, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1553,6 +1570,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
     excludehosts: zelenka, zandonai
+    excludehostgroups: jessie
+  -
+    name: process - getty
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C agetty -a /sbin/agetty"
+    hostgroups: computers
+    hostgroups: jessie
   -
     name: processes - zombies
     nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z"
@@ -1653,7 +1676,12 @@ services:
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
-    excludehostgroups: freebsd, sparc
+    excludehostgroups: freebsd, sparc, jessie
+  -
+    name: process - ulogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ulog -C ulogd -a '/usr/sbin/ulogd --daemon --uid ulog'"
+    hostgroups: jessie
+    excludehostgroups: freebsd
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
@@ -1685,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
@@ -1797,7 +1829,7 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
-    excludehostgroups: squeeze, alioth
+    excludehostgroups: squeeze, alioth, jessie
   ###
   -
     name: MQ connection on rainier
@@ -1838,7 +1870,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: freebsd
+    excludehostgroups: freebsd, jessie
+  -
+    name: process - udevd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C systemd-udevd -a '/lib/systemd/systemd-udevd'"
+    hostgroups: jessie
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
@@ -1915,6 +1951,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
+    excludehostgroups: jessie
+  -
+    name: process - mdadm monitor
+    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
+    excludehostgroups: wheezy
   -
     name: RAID - sw raid
     servicegroups: raid