gabrielli: decomission

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7d6572b..0277dbd 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -386,6 +386,10 @@ servers:
     address: 5.153.231.11
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+  backuphost:
+    address: 5.153.231.12
+    parents: ganeti-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, jessie
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -459,7 +463,7 @@ servers:
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
@@ -622,6 +626,10 @@ servers:
     address: 194.177.211.204
     parents: ganeti-grnet
     hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+  vittoria:
+    address: 194.177.211.205
+    parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   schein:
@@ -805,10 +813,6 @@ servers:
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
   # malo TODO
-  mayer:
-    address: 140.211.166.78
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, jessie
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -865,10 +869,6 @@ servers:
     address: 86.59.118.151
     parents: gw-sil
     hostgroups: computers, porterbox, jessie, hassrvfs
-  eysler:
-    address: 86.59.118.152
-    parents: gw-sil
-    hostgroups: computers, buildd, jessie
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
@@ -955,10 +955,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
-  gabrielli:
-    address: 206.12.19.17
-    parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, jessie
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
@@ -1619,7 +1615,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: storace
+    excludehosts: backuphost, storace, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1627,7 +1623,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: storace
+    hosts: backuphost, storace, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -2348,6 +2344,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+    excludehosts: klecker
+  -
+    name: process - apache2 - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:80 -c 1:150 -u www-data -a /usr/sbin/apache2"
+    hosts: klecker
+    depends: process - apache2 - master
   -
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
@@ -2440,7 +2442,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: storace
+    hosts: storace, backuphost
   # }}}
   # {{{ power
 #  -