X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0ea302f2488a6751beae6ed54408ca294a9039f6;hb=5629148c36a1bb411653c4b252d51c57ab62f9df;hp=a2da1a76fc4c49c9d8c82a19d1f08dd53a94897c;hpb=8e137e8dae149d6824d27e57e80ee9de8b108a2e;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a2da1a7..0ea302f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -243,7 +243,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -411,6 +411,10 @@ servers:
     address: 5.153.231.28
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
+  portman:
+    address: 5.153.231.29
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -488,10 +492,6 @@ servers:
     address: 194.177.211.204
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
-  cilea:
-    address: 194.177.211.205
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -541,7 +541,7 @@ servers:
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, hassrvfs, wheezy
+    hostgroups: computers, buildd, wheezy
     contacts: pkern
   # }}}
   # {{{ gw-man-da
@@ -620,10 +620,6 @@ servers:
     address: 82.195.75.112
     parents: ganeti3
     hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
-  vieuxtemps:
-    address: 82.195.75.113
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -1128,9 +1124,9 @@ hostgroups:
   jetty-hosts:
     alias: hosts running jetty
     private: 1
-  varnish-hosts:
-    alias: hosts running varnish
-    private: 1
+  #varnish-hosts:
+  #  alias: hosts running varnish
+  #  private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1425,11 +1421,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
     hosts: franck
-  -
-    name: disk usage on /srv/pgbackup
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
-    hosts: franck
   -
     name: disk usage on /srv/pgbackup
     servicegroups: diskspace
@@ -2393,20 +2384,20 @@ services:
     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
+  #-
+  #  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
 
 ###
 
@@ -2690,10 +2681,10 @@ services:
     normal_check_interval:  60
     retry_check_interval: 15
  ############
-  -
-    name: process - openstack - keystone
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C keystone-all -a '/usr/bin/python /usr/bin/keystone-all'"
-    hostgroups: openstack-controller
+#  -
+#    name: process - openstack - keystone
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C keystone-all -a '/usr/bin/python /usr/bin/keystone-all'"
+#    hostgroups: openstack-controller
   -
     name: process - openstack - memcached
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 64 -p 11211 -u nobody -l 127.0.0.1'"