X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bda2a06e99990ab80ad7a6f65ad131dc31c40ece;hb=86a0a9e98acdf44a1a49f24248bd1710d29e8745;hp=26e8e917b34cdac0a569342652a11070f0f03bbe;hpb=8be06416012b2311a2f66218f11dbeceff507843;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 26e8e91..bda2a06 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -780,7 +780,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, jessie
+    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
@@ -963,10 +963,6 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ganeti2:
-    address: 206.12.19.23
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -1634,13 +1630,11 @@ services:
   -
     name: free memory - mb
     nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb"
-    #hostgroups: computers
-    hosts: draghi
+    hostgroups: computers
   -
     name: free memory - percent
     nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m pct"
-    #hostgroups: computers
-    hosts: draghi
+    hostgroups: computers
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
@@ -3113,8 +3107,7 @@ services:
   -
     name: puppet - agent check
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/puppet-agent"
-    #hostgroups: computers
-    hosts: handel, draghi
+    hostgroups: computers
     check_interval:  60
     retry_interval: 15
   # }}}