X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b57d5f01742dcbc51e9d8cff1eb210004c73eef1;hb=8729aa54065d2b275b906e50d0771a8c64d326d0;hp=740563772bc3ff9dd2d5716368bd19e239c592f6;hpb=45c665f9380dd98fc40504fa0dca0d928e1f6c21;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7405637..b57d5f0 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,7 +173,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -259,11 +259,14 @@ servers:
     address: 82.195.75.104
     parents: unger
     hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
-
   geo1:
     address: 82.195.75.105
     parents: unger
     hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+  draghi:
+    address: 82.195.75.106
+    parents: unger
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
 
   master:
     address: 70.103.162.29
@@ -785,7 +788,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -805,7 +808,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1479,7 +1482,7 @@ services:
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
-    hosts: samosa
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1515,19 +1518,19 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka, ancina
+    hosts: allegri, gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka, ancina
+    excludehosts: allegri, gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
     check: check_tcp!79
-    hosts: samosa
+    hosts: draghi
     depends: process - xinetd
  ###
   -
@@ -1602,13 +1605,13 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries, klecker
+    hosts: ries, klecker, draghi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker, spohr2
+    hosts: ries, klecker, spohr2, draghi
     depends: network service - https
     normal_check_interval: 60
 
@@ -1821,23 +1824,23 @@ services:
     hosts: global
   -
     name: DNS SOA sync - debian.org
-    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.org"
     hosts: global
   -
     name: DNS SOA sync - debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.net"
     hosts: global
   -
     name: DNS SOA sync - debian.com
-    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.com"
     hosts: global
   -
     name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net"
     hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
-    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org