no more rem

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 704ba83..a6aa89c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -364,10 +364,6 @@ servers:
     address: 5.153.231.11
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
-  backuphost:
-    address: 5.153.231.12
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -660,10 +656,6 @@ servers:
     address: 82.195.75.99
     parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
-  rem:
-    address: 82.195.75.68
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -704,6 +696,10 @@ servers:
     address: 82.195.75.92
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy
+  wolkenstein:
+    address: 82.195.75.65
+    parents: ganeti3
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -865,10 +861,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
-  wolkenstein:
-    address: 206.12.19.116
-    parents: ganeti2
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -1566,7 +1558,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost, storace
+    excludehosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1574,7 +1566,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: backuphost, storace
+    hosts: storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -2624,12 +2616,12 @@ services:
     contact_groups: gobby
   ####
   -
-    name: network service - sip-tls cert (443)
+    name: network service - sip-tls cert - 443
     check: dsa_check_cert!443
     normal_check_interval: 60
     hosts: vogler
   -
-    name: network service - sip-tls cert (5061)
+    name: network service - sip-tls cert - 5061
     check: dsa_check_cert!5061
     normal_check_interval: 60
     hosts: vogler