X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3729b3d599bfa3d1c881723be28f9378f10fe47a;hb=64fabf73d05b15558901b5122aef86575bf954fe;hp=4fe424de8a5e15080512579b43c0dd327ccc1e0b;hpb=8aacbf35628622f1e9bf3bd7b3bf22fb674800e5;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4fe424d..3729b3d 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -428,18 +428,18 @@ servers:
     hostgroups: computers, sw-raid, hassrvfs, wheezy
   # }}}
   # {{{ gw-ftcollins
-  alkman:
-    address: 192.25.206.63
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, acpid-hosts, wheezy
-  merulo:
-    address: 192.25.206.58
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasusrfs, wheezy
-  mundy:
-    address: 192.25.206.62
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
+  #alkman:
+  #  address: 192.25.206.63
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, buildd, acpid-hosts, wheezy
+  #merulo:
+  #  address: 192.25.206.58
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, porterbox, hasusrfs, wheezy
+  #mundy:
+  #  address: 192.25.206.62
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
@@ -665,6 +665,10 @@ servers:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, wheezy
+  eberlin:
+    address: 86.59.118.155
+    parents: gw-sil
+    hostgroups: computers, buildd, wheezy
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -2384,7 +2388,7 @@ services:
     hostgroups: computers
   -
     name: process - postgresql91 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
     hostgroups: postgres91-hosts
   -
     name: postgresql backups
@@ -2497,6 +2501,13 @@ services:
 
  ############ MISC OTHER Stuff ############
  #####
+  -
+    name: puppetmaster cert
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
+    hosts: handel
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
   -
     name: mirror sync - bugs
     check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
@@ -2583,5 +2594,12 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
+ ############
+  -
+    name: current chroots
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
+    hostgroups: porterbox
+    normal_check_interval:  60
+    retry_check_interval: 15
 
 # vim: set ts=2 sw=2 et ai si fdm=marker: