X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4e066f7bc23782060511ed5b22719c486c80f978;hb=17f0593ebb23dbe123bb29274a7c49b1738e6d66;hp=b6d4e8366502d1ad54e7a4c22ec7c3ffad80c4b3;hpb=26547b8c9f7d466c03be4d2e495c4a452aa8fc9c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b6d4e83..4e066f7 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -451,6 +451,10 @@ servers:
     address: 82.195.75.109
     parents: gw-man-da
     hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  clementi:
+    address: 82.195.75.103
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
   bendel:
     address: 82.195.75.100
     parents: czerny
@@ -661,7 +665,7 @@ servers:
   pasquini:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   luchesi:
     address: 206.12.19.214
     parents: sw-ubcece-kais
@@ -669,15 +673,15 @@ servers:
   tristano:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   boito:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   bertali:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, squeeze
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -1024,6 +1028,8 @@ hostgroups:
     alias: Hosts that are KVM domains
     private: 1
 
+  drbd-hosts:
+    alias: hosts running drbd
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -1326,11 +1332,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
-  -
-    name: disk usage on /var/lib/postgresql/9.0/dak
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
-    hosts: franck
   -
     name: disk usage on /var/lib/postgresql/9.1/dak
     servicegroups: diskspace
@@ -1560,7 +1561,7 @@ services:
     hostgroups: freebsd
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: armhf
   -
     name: network service - munin-node
@@ -1704,11 +1705,11 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: busoni, buxtehude
+    hosts: buxtehude
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: busoni, buxtehude
+    hosts: buxtehude
   #
   -
     name: unwanted process - spamd
@@ -2066,6 +2067,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
     hostgroups: megactl
+ ###
+  -
+    name: RAID - DRDB
+    normal_check_interval: 120
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
+    hostgroups: drbd-hosts
  ###
   -
     name: process - slapd
@@ -2307,23 +2314,6 @@ services:
     name: process - postresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
-  #-
-  #  name: process - postresql83 - master udd
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
-  #  hosts: piatti
-  #-
-  #  name: process - postresql83 - dak master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-  #  hosts: chopin
-  #-
-  #  name: process - postresql84 - dak master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-  #  hosts: franck, chopin
-  #-
-  #  name: process - postresql84 - dak-dev master
-  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-  #  hosts: franck
- # backups
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"