X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0a1ebaf66186ceec26a867c7626b81b522b01f5a;hb=af4cfd096360fbb30352672013c77b72f4d1a27c;hp=efa58d03f6c80110931710ac50392a07344b8e8d;hpb=6423f1612f4aa2b4f1859f72219ead1bcac2c17d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index efa58d0..0a1ebaf 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -74,10 +74,6 @@ servers:
     address: 62.104.23.249
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-ftcollins:
-    address: 192.25.206.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-gatech:
     address: 128.61.240.1
     parents: gw-ubcece
@@ -402,7 +398,7 @@ servers:
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
@@ -427,10 +423,14 @@ servers:
     address: 5.153.231.30
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
-  all-bm-01:
+  x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, wheezy
+  fischer:
+    address: 5.153.231.33
+    parents: ganeti-bytemark
+    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -474,6 +474,10 @@ servers:
     address: 128.31.0.36
     parents: gw-csail
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  csail-node01:
+    address: 128.31.0.16
+    parents: gw-csail
+    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
   # }}}
   # {{{ gw-dgi
   storace:
@@ -481,20 +485,6 @@ servers:
     parents: gw-dgi
     hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
   # }}}
-  # {{{ gw-ftcollins
-  #alkman:
-  #  address: 192.25.206.63
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, buildd, acpid-hosts, 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
-    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
-  # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
@@ -502,22 +492,10 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-grnet
-  barber:
-    address: 194.177.211.203
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
-  biber:
-    address: 194.177.211.204
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
-  vitry:
-    address: 194.177.211.206
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, no-bacula, wheezy
   # }}}
   # {{{ gw-isc
   schein:
@@ -846,10 +824,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
-  fischer:
-    address: 206.12.19.112
-    parents: ganeti2
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -1106,9 +1080,6 @@ hostgroups:
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
-  mptraid:
-    alias: Hosts with LSI Logic Fusion-MPT
-    private: 1
 
   squeeze:
     alias: Hosts running squeeze
@@ -1208,9 +1179,6 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hashomefs:
-    alias: hosts with a /home filesystem
-    private: 1
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
@@ -1332,12 +1300,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
-    excludehosts: spohr
-  -
-    name: disk usage on /
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1368,11 +1330,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
     hostgroups: hasusrfs
-  -
-    name: disk usage on /home
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hostgroups: hashomefs
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
@@ -1950,12 +1907,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
     hostgroups: megaraid
   ###
-  -
-    name: RAID - MPT
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
-    hostgroups: mptraid
-  ###
   -
     name: RAID - DRBD
     servicegroups: raid
@@ -2480,7 +2431,7 @@ services:
   # {{{ openstack
   -
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 128 -p 11211 -u nobody -l 0.0.0.0'"
     hostgroups: openstack-controller
   -
     name: process - openstack - glance-registry