projects / mirror / dsa-nagios.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sor now does https
[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8207268..84129c4 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -338,7 +338,7 @@ servers:
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
@@ -418,7 +418,7 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
@@ -438,7 +438,7 @@ servers:
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
@@ -478,7 +478,7 @@ servers:
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
@@ -490,7 +490,7 @@ servers:
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
@@ -520,11 +520,11 @@ servers:
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs, security_mirror
+    hostgroups: secondary-IPs, security_mirror, rsyncd-hosts
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
@@ -553,15 +553,15 @@ servers:
     parents: mirror-conova
   mirror-conova-security:
     address: 217.196.149.233
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
     parents: mirror-conova
   mirror-conova-archive:
     address: 217.196.149.234
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
     parents: mirror-conova
   mirror-conova-syncproxy4-eu:
     address: 217.196.149.237
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
     parents: mirror-conova
 
   arm-conova-01:
@@ -690,11 +690,11 @@ servers:
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-isc3:
     address: 149.20.4.15
     parents: mirror-isc
@@ -702,7 +702,7 @@ servers:
   mirror-isc-syncproxy:
     address: 149.20.4.16
     parents: mirror-isc
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   # }}}
   # {{{ gw-leaseweb
   lw01:
@@ -755,15 +755,15 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, drbd-hosts
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, stretch, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
@@ -809,7 +809,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, stretch, apache-https, rsyncd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -1038,7 +1038,7 @@ servers:
   elgar:
     address: 209.87.16.24
     parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   gombert:
     address: 209.87.16.25
     parents: ubc-gateway
@@ -1125,15 +1125,15 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts, security_mirror
   mirror-umn3:
     address: 128.101.240.216
     parents: mirror-umn
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, rsyncd-hosts
   mirror-umn4:
     address: 128.101.240.217
     parents: mirror-umn
@@ -2372,42 +2372,22 @@ services:
   # }}}
   # {{{ postfix
   ###
-  -
-    name: process - postfix - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/master'"
-    hostgroups: postfix-hosts
-    excludehostgroups: stretch
   -
     name: process - postfix - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C master -a '/usr/lib/postfix/sbin/master'"
     hostgroups: postfix-hosts
-    excludehostgroups: jessie
 
-  -
-    name: process - postfix - qmgr
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t fifo -u'"
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
-    excludehostgroups: stretch
   -
     name: process - postfix - qmgr
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C qmgr -a 'qmgr -l -t unix -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    excludehostgroups: jessie
 
-  -
-    name: process - postfix - pickup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t fifo -u -c'"
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
-    excludehostgroups: stretch
   -
     name: process - postfix - pickup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postfix -C pickup -a 'pickup -l -t unix -u -c'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    excludehostgroups: jessie
 
   -
     name: process - postfix - anvil
@@ -2549,19 +2529,10 @@ services:
     name: network service - ftp
     check: check_ftp
     hostgroups: uploadqueue, security_mirror
-    excludehosts: klecker, mirror-isc, mirror-umn
   -
     name: network service - ftp
     check: check_ftp
     hosts: klecker-ftp
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-umn2
-  -
-    name: network service - ftp
-    check: check_ftp
-    hosts: mirror-isc2
   # }}}
   # {{{ postgres
   -
@@ -3056,22 +3027,6 @@ services:
     name: network service - rsync
     check: check_tcp!873
     hostgroups: rsyncd-hosts
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: milanollo2
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-isc2, mirror-isc-syncproxy
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-umn2, mirror-umn3
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: mirror-anu2, mirror-anu3
   ###
   -
     name: process - icinga
Unnamed repository; edit this file 'description' to name the repository.