I think this is better

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 82ab0c5..1726233 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -461,23 +461,23 @@ servers:
     hostgroups: computers, service, dl360, acpid-hosts, squeeze
   diamond:
     address: 82.195.75.108
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
   draghi:
     address: 82.195.75.106
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
   geo1:
     address: 82.195.75.105
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   handel:
     address: 82.195.75.104
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
   ganeti3:
     address: 82.195.75.111
@@ -487,11 +487,14 @@ servers:
     address: 82.195.75.112
     parents: ganeti3
     hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client
-
-#  lamb:
-#    address: 82.195.75.101
-#    parents: unger
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  vieuxtemps:
+    address: 82.195.75.113
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
+  mailly:
+    address: 82.195.75.114
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-marist
   zappa:
@@ -617,6 +620,12 @@ servers:
     hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
     no-servicegroups: true
+  anonscm:
+    address: 217.196.43.132
+    parents: wagner
+    contact_groups: alioth-admins
+    hostgroups: secondary-IPs
+    no-servicegroups: true
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -1035,6 +1044,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  varnish-hosts:
+    alias: hosts running varnish
+    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -2264,6 +2276,32 @@ services:
     excludehosts: ravel
     normal_check_interval: 60
 
+###
+  -
+    name: process - varnish - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+  -
+    name: process - varnish - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+  -
+    name: network service - http
+    check: check_http
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+
+###
+
+# Alioth web URLs
+
+  -
+    name: network service - loggerhead
+    remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/"
+    hosts: anonscm
+    depends: wagner:process - apache2 - master
+
  ####
   -
     name: process - named