X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=34cfc0075a6a7507bb7a99c7c98d9838346685d7;hb=de79dac32e3a156c19e53229502833da5db0669f;hp=a4c557b52d941be4238c5e1a2c397e7ca059583f;hpb=7924159a5804a4a54bd697c2abe0ffddee8b984c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a4c557b..34cfc00 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -77,7 +77,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-karlsruhe:
-    address: 129.143.166.229
+    address: 129.143.57.177
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-man-da:
@@ -352,11 +352,15 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: gw-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
   ticharich:
     address: 5.153.231.23
     parents: gw-bytemark
     hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
+  diamond:
+    address: 5.153.231.24
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -512,10 +516,6 @@ servers:
     address: 82.195.75.102
     parents: gw-man-da
     hostgroups: computers, service, dl360, acpid-hosts, wheezy
-  diamond:
-    address: 82.195.75.108
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -548,6 +548,10 @@ servers:
     address: 82.195.75.114
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
+  denis:
+    address: 82.195.75.91
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   # }}}
   # {{{ gw-marist
   zappa:
@@ -716,7 +720,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, service, squeeze, autofs
   respighi:
     address: 206.12.19.11
     parents: sw-ubcece-kais
@@ -1481,7 +1485,11 @@ services:
     normal_check_interval: 60
     retry_check_interval: 5
     excludehostgroups: brokensamhain
-
+ ####
+  -
+    name: process - acc.umu.se backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -a 'dsmc'"
+    hosts: sibelius
  ####
   -
     name: users
@@ -1742,7 +1750,7 @@ services:
     hostgroups: heavy-exim
   -
     name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
     hostgroups: heavy-postfix
   #
   -
@@ -1753,11 +1761,11 @@ services:
  ###
   -
     name: process - amavis - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -a 'amavisd-new (master)'"
     hostgroups: amavis-hosts
   -
     name: process - amavis - all
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd-new '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -a 'amavisd-new '"
     hostgroups: amavis-hosts
     depends: process - amavis - master
   #