postgresql-manda-01 runs postgresql

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 886a19d..0b8c442 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -171,7 +171,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, buster, autofs, sw-raid, physical_x86_intel
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, buster, autofs, sw-raid, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   mirror-accumu:
@@ -361,30 +361,14 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  rainier:
-    address: 5.153.231.16
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  rapoport:
-    address: 5.153.231.15
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, 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
-  donizetti:
-    address: 5.153.231.20
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   dillon:
     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
@@ -768,7 +752,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
@@ -776,17 +760,25 @@ 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
+  rainier:
+    address: 82.195.75.94
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+  rapoport:
+    address: 82.195.75.95
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
     address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed
+    hostgroups: computers, pybuildd, hassrvfs, buster, incomingmailrelayed587
   # }}}
   # {{{ gw-osuosl
   byrd:
@@ -1022,6 +1014,14 @@ 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
+  donizetti:
+    address: 209.87.16.65
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -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
@@ -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