X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a4a3b8d1edba56753ce1a13ad862c0b9b9906943;hb=da208e6772c7a406e2019a222c84eece48d1dc31;hp=247881f817dbb06e5e53bdfb7b37d85e2887a95b;hpb=f67f7fbf861b379472d4ba746922470dbe28fe82;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 247881f..a4a3b8d 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
@@ -381,26 +377,14 @@ servers:
     address: 5.153.231.29
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
-  paradis:
-    address: 5.153.231.30
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
-  gideon:
-    address: 5.153.231.34
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
-  jerea:
-    address: 5.153.231.39
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
@@ -752,7 +736,7 @@ servers:
   suchon:
     address: 82.195.75.68
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, stretch, uploadqueue, queued, systemd-timesyncd
   adayevskaya:
     address: 82.195.75.75
     parents: ganeti-manda
@@ -760,11 +744,15 @@ servers:
   postgresql-manda-01:
     address: 82.195.75.76
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd, postgres11-hosts
   dinis:
     address: 82.195.75.77
     parents: ganeti-manda
     hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
+  gideon:
+    address: 82.195.75.78
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   rainier:
     address: 82.195.75.94
     parents: ganeti-manda
@@ -773,6 +761,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:
@@ -1022,6 +1014,18 @@ servers:
     address: 209.87.16.65
     parents: ganeti2-ubc
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
+  jerea:
+    address: 209.87.16.66
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+  paradis:
+    address: 209.87.16.67
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
+  paradis2:
+    address: 209.87.16.68
+    parents: paradis
+    hostgroups: secondary-IPs
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1106,14 +1110,14 @@ 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
     hostgroups: secondary-IPs
   klecker-archive:
     address: 130.89.148.13
-    parents: klecker
+    parents: new-klecker
     hostgroups: secondary-IPs
   new-klecker:
     address: 130.89.148.77
@@ -1122,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
@@ -2375,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
@@ -2391,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