X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f22bac5fb874ea493bd15361bdec7ca20e6980ef;hb=d7c2e3d207d7931ac3d72861c2df6fdf19589512;hp=fcb74fb65f97964a93b9eecca018ace4f30a6caf;hpb=6eddd2a35a171cc78e1e469572cd3731d3916031;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fcb74fb..f22bac5 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -381,10 +381,6 @@ servers:
     address: 5.153.231.22
     parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd
-  ticharich:
-    address: 5.153.231.23
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
@@ -1022,6 +1018,10 @@ servers:
     address: 209.87.16.63
     parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
+  ticharich:
+    address: 209.87.16.64
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1857,7 +1857,7 @@ services:
     hostgroups: computers
   -
     name: network service - munin-node
-    check: check_tcp!4949
+    nrpe: "/usr/lib/nagios/plugins/check_tcp -H localhost -p 4949"
     hostgroups: computers
     depends: process - munin-node
   ###
@@ -2797,8 +2797,18 @@ services:
     hostgroups: bind9-hosts
   -
     name: network service - dns
-    check: check_dns
-    hostgroups: bind9-hosts
+    check: check_dig!www.debian.org!
+    hosts: geo1, geo2, geo3
+    depends: process - named
+  -
+    name: network service - dns
+    check: check_dig!_openpgpkey.debian.org!-A -t SOA
+    hosts: kaufmann
+    depends: process - named
+  -
+    name: network service - dns
+    check: check_dig!debian.org!-A -t SOA
+    hosts: denis
     depends: process - named
   -
     name: unwanted process - named