X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3cbcad851c9872335d82b54cb12c622d96bdf094;hb=8deb3b867e05cc6e2fc4e6570fbcd5f94d1edc81;hp=9cc9699aead685d8d49369217d4f44107e28c9e2;hpb=611d84386bb952fe4bf5b13d60d9bebbf634b3bf;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9cc9699..3cbcad8 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -380,7 +380,7 @@ servers:
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -816,7 +816,7 @@ servers:
   beach:
     address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, buster, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
 
   mipsel-osuosl-01:
     address: 140.211.166.210
@@ -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
@@ -1259,6 +1259,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 +2490,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'"