X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=63413457e8dcebba03631dc3e694d0586df2de7e;hb=b38721db43f791c755694e2f45e6bec5ca5912e8;hp=3f894354b741750a6654a08d9340e8e3d47c85c4;hpb=4c6e20fd217ab80986e0cffd1ad71f91b9c50e7a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3f89435..6341345 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -369,10 +369,6 @@ servers:
     address: 5.153.231.22
     parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd
-  petrova:
-    address: 5.153.231.25
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -389,10 +385,6 @@ servers:
     address: 5.153.231.38
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
-  mekeel:
-    address: 5.153.231.40
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -765,6 +757,10 @@ servers:
     address: 82.195.75.95
     parents: ganeti-manda
     hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+  petrova:
+    address: 82.195.75.96
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -904,7 +900,7 @@ servers:
   nono:
     address: 209.87.16.26
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
   reger:
     address: 209.87.16.27
     parents: ganeti2-ubc
@@ -1026,6 +1022,10 @@ servers:
     address: 209.87.16.68
     parents: paradis
     hostgroups: secondary-IPs
+  mekeel:
+    address: 209.87.16.69
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, autofs, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1110,7 +1110,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
+    hostgroups: computers, service, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
   klecker-ftp:
     address: 130.89.148.12
     parents: new-klecker
@@ -1126,7 +1126,7 @@ servers:
   smit:
     address: 130.89.148.78
     parents: gw-utwente
-    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, apache2-hosts, apache-https, hassrvfs
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, apache2-hosts, apache-https, hassrvfs, rsyncd-hosts
   mikrotik-utwente:
     address: 130.89.148.79
     parents: gw-utwente
@@ -2379,11 +2379,11 @@ 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
+    excludehosts: new-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
+    hosts: new-klecker
     depends: process - apache2 - master
   -
     name: unwanted process - apache2
@@ -2395,12 +2395,17 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker, casulana
+    excludehosts: casulana
     depends: process - apache2 - master
   -
     name: network service - http
     check: check_http
-    depends: klecker:process - apache2 - master
+    depends: new-klecker:process - apache2 - master
+    hosts: klecker-archive
+  -
+    name: network service - http
+    check: check_http
+    depends: new-klecker:process - apache2 - master
     hosts: klecker-ftp
 
   # keyserver on kaufmann