X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b5930ad0ce5af65fd77accfa2192d817bddceeb6;hb=a3e4d5ee0c9da0ac7bae1ea2b294918195cd7bee;hp=bf8744f61c1e8155d7da73a691285275c00f157d;hpb=332986427ad6dd11bda96505001a9ec8af40650d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index bf8744f..b5930ad 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -364,7 +364,7 @@ servers:
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
@@ -400,7 +400,7 @@ servers:
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
+    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
@@ -585,7 +585,7 @@ servers:
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs, physical_x86_intel
+    hostgroups: computers, buster, dl380, nfs-client, hassrvfs, physical_x86_intel
   # }}}
   # {{{ gw-gatech
   sechter:
@@ -840,7 +840,7 @@ servers:
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
-    hostgroups: computers, stretch, service, manyprocesses
+    hostgroups: computers, buster, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
     parents: pijper
@@ -988,7 +988,7 @@ servers:
   buxtehude:
     address: 209.87.16.39
     parents: ganeti2-ubc
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, apache2-hosts, heavy-exim, postgres11-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
   piu-slave-ubc-01:
     address: 209.87.16.42
     parents: ganeti2-ubc
@@ -1115,10 +1115,18 @@ servers:
     address: 130.89.148.14
     parents: klecker
     hostgroups: secondary-IPs
+  new-klecker:
+    address: 130.89.148.77
+    parents: gw-utwente
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs
   smit:
     address: 130.89.148.78
     parents: gw-utwente
-    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, apache2-hosts, apache-https, hassrvfs
+  mikrotik-utwente:
+    address: 130.89.148.79
+    parents: gw-utwente
+    hostgroups: notacomputer
   # }}}
   # {{{ gw-ynic
   henze:
@@ -1259,6 +1267,9 @@ hostgroups:
   xinetd-hosts:
     alias: hosts providing services via xinetd
     private: 1
+  postgres11-hosts:
+    alias: hosts running postgres11
+    private: 1
   postgres96-hosts:
     alias: hosts running postgres96
     private: 1
@@ -2487,11 +2498,15 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres96-hosts
+    excludehostgroups: postgres96-hosts, postgres11-hosts
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
     hostgroups: computers
+  -
+    name: process - postgresql11 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/11/bin/postgres'"
+    hostgroups: postgres11-hosts
   -
     name: process - postgresql96 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.6/bin/postgres'"