Add x86-csail-02

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ebc505f..0ebfe5d 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -560,6 +560,10 @@ servers:
     address: 128.31.0.50
     parents: ganeti-csail
     hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  x86-csail-02:
+    address: 128.31.0.68
+    parents: ganeti-csail
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
@@ -567,7 +571,7 @@ servers:
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
   # }}}
   # {{{ gw-dgi
   storace:
@@ -686,14 +690,6 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
-  mipsel-manda-01:
-    address: 82.195.75.72
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
-  mipsel-manda-02:
-    address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -759,11 +755,11 @@ servers:
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   # }}}
   # {{{ gw-marist
   zani:
@@ -864,7 +860,7 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
@@ -944,12 +940,12 @@ servers:
   fano:
     address: 206.12.19.110
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   gabrielli:
     address: 206.12.19.17
@@ -2611,7 +2607,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10867 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}