X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=267b551a62e4f7ebd45088bffe00ad8757d8b469;hb=5555f33cfbb9e68d521cae26894e1e4884453963;hp=b659622755a71e091d0a01ef597f2dfe8f9bd766;hpb=20cb85ff932a8a804231a6a69ec0fef5662c1590;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b659622..267b551 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -335,11 +335,6 @@ servers:
     address: 5.153.231.4
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
-  pejacevic:
-    address: 5.153.231.6
-    parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
-    contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
@@ -361,10 +356,6 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  delfin:
-    address: 5.153.231.17
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
@@ -376,7 +367,7 @@ servers:
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, autofs, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -617,7 +608,7 @@ servers:
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
   lw07-2:
     address: 185.17.185.185
     parents: lw07
@@ -1026,6 +1017,15 @@ servers:
     address: 209.87.16.69
     parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, autofs, systemd-timesyncd
+  pejacevic:
+    address: 209.87.16.70
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
+    contacts: holger
+  delfin:
+    address: 209.87.16.71
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1467,7 +1467,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, buxtehude, lw07, fasolo
+    hosts: sibelius, buxtehude, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1686,23 +1686,6 @@ services:
     hostgroups: computers
   # }}}
   # {{{ backup
-  -
-    name: backup
-    servicegroups: backup
-    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
-    hostgroups: computers
-    excludehosts: backuphost, storace
-    check_interval: 60
-    max_check_attempts: 2
-    retry_interval: 5
-  -
-    name: backup server config
-    servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: storace
-    check_interval: 60
-    max_check_attempts: 2
-    retry_interval: 5
   -
     name: backup - bacula - last backup
     servicegroups: backup