X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=ae2b7769fb2c610d4114133cdedda37ef1034c97;hb=8f1abbea638f862c05f8da453a22b3b98bd37d81;hp=029d369e2aa0895a1842041d73c8135f7f80f0f1;hpb=74fecb1792ca1ac816d7c2b7e7b82c2664349007;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 029d369..ae2b776 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:
@@ -810,7 +814,7 @@ servers:
   nono:
     address: 206.12.19.123
     parents: traetta
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -850,7 +854,7 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, broken_https_default_vhost
   bizet:
     address: 206.12.19.137
     parents: ganeti2
@@ -1113,6 +1117,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  broken_https_default_vhost:
+    alias: https default vhost does not say 200 OK
+    private: 1
 
   no-bacula:
     alias: hosts which are not being backed up with bacula
@@ -1170,10 +1177,6 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
-  ntpsuckers:
-    alias: "hosts who's ntp offset is often unknown"
-    private: 1
-
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
@@ -1620,7 +1623,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: ntpsuckers, deadslow
+    excludehostgroups: deadslow
     servicegroups: time
   #
   -
@@ -2273,6 +2276,7 @@ services:
     check: check_https
     hostgroups: apache-https
     excludehosts: handel,menotti
+    excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2281,6 +2285,12 @@ services:
     hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
+  -
+    name: network service - https
+    check: dsa_check_https_any_status
+    hostgroups: broken_https_default_vhost
+    depends: "process - apache2 - master"
+    normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
@@ -2384,7 +2394,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
@@ -2590,5 +2600,12 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
+ ############
+  -
+    name: current chroots
+    nrpe: "/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: