X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ec3d668dcfb3a1002caf40550ba2deea9d53bd79;hb=5a2b1e11c9c314cecb563f2121ff9991d24a1b4a;hp=886a19d438fe346f6b5e1f8bfdaad65cc6cad1f5;hpb=eece83df9a12e701d8b9557344ca9985c60c47e1;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 886a19d..ec3d668 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -786,7 +786,7 @@ servers:
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed
+    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed587
   # }}}
   # {{{ gw-osuosl
   byrd:
@@ -1109,7 +1109,7 @@ servers:
     hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
   klecker-ftp:
     address: 130.89.148.12
-    parents: klecker
+    parents: new-klecker
     hostgroups: secondary-IPs
   klecker-archive:
     address: 130.89.148.13
@@ -1344,7 +1344,7 @@ hostgroups:
     alias: hosts with a /var/log filesystem
     private: 1
 
-  incomingmailrelayed:
+  incomingmailrelayed587:
     alias: incoming mail needs to go through a mail relay
     # i.e. no port 25
     private: 1
@@ -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
   ###
@@ -2344,7 +2344,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
+    excludehostgroups: postfix-hosts, incomingmailrelayed587, incomingmailrelayed2025
     depends: process - exim
 
   -
@@ -2355,7 +2355,7 @@ services:
   -
     name: network service - submission
     check: dsa_check_smtp_port!587
-    hostgroups: incomingmailrelayed
+    hostgroups: incomingmailrelayed587
     depends: process - exim
   -
     name: network service - smtp 2025