X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=eab956b7e8f980e3d49a76c3f949bc4ddbb86c8b;hb=7a5951043c70c1769b8204976b0a82ccb531be5e;hp=ec8aafe210cf216b95823fe9b35952428f925c64;hpb=0c6b77f34f5789bd36bab3eff87a39fbd9c3e809;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index ec8aafe..eab956b 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -152,6 +152,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
 
+  global:
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
+
   samosa:
     address: 192.25.206.57
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim
@@ -170,7 +175,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: samosa
-    hostgroups: computers, service, dl380, apache2-hosts, postgres81-hosts, ulogd-hosts, nfs-server
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server
   peri:
     address: 192.25.206.15
     parents: samosa
@@ -473,6 +478,9 @@ hostgroups:
     alias: Internet routers and friends
     extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
+  notacomputer:
+    alias: Systems that are not really systems.  Yeah :)
+    private: 1
   deadslow:
     alias: Systems too slow to run any real checks
   dialup:
@@ -562,6 +570,9 @@ hostgroups:
   postgres81-hosts:
     alias: hosts running postgres81
     private: 1
+  postgres83-hosts:
+    alias: hosts running postgres83
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -624,7 +635,7 @@ services:
   -
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
-    hostgroups: all
+    hostgroups: pingable
     excludehostgroups: routing-infrastructure, dialup
     normal_check_interval: 5
     max_check_attempts: 4
@@ -1558,6 +1569,31 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
     hostgroups: postgres81-hosts
     depends: process - postresql81 - master
+ ####
+  -
+    name: process - postresql83 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
+    hostgroups: postgres83-hosts
+  -
+    name: process - postresql83 - writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - wal writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: wal writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - autovacuum launcher
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: autovacuum launcher process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - stats collector
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: stats collector process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
  ####
   -
     name: process - mysql - master
@@ -1656,3 +1692,18 @@ services:
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+
+ ############ MISC OTHER Stuff ############
+ #####
+  -
+    name: mirror sync
+    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - eu
+    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - us
+    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    hosts: global