X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=config%2Fnagios-master.cfg;h=e0a3fbb23116a57dd432f4098f8cafd8bcfe5400;hb=d4b04d6bb4e86596fb23fd1a412038a38e41aa92;hp=ec32e6da372fa42bf12ac5b510a4f0fffa931c39;hpb=9e0fbe73f719ebd303679787452a45af8ea08239;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ec32e6d..e0a3fbb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -78,6 +78,10 @@ servers:
     address: 192.25.206.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-gatech:
+    address: 128.61.240.1
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-grnet:
     address: 194.177.211.193
     parents: gw-ubcece
@@ -214,6 +218,14 @@ servers:
     address: 217.140.96.57
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-01:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-02:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -336,7 +348,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -402,11 +414,15 @@ servers:
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
   portman:
     address: 5.153.231.29
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+  paradis:
+    address: 5.153.231.30
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -452,20 +468,16 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-dgi
-  argento:
-    address: 93.94.130.160
+  storace:
+    address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, sw-raid, hassrvfs, wheezy
+    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
-  #merulo:
-  #  address: 192.25.206.58
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, porterbox, hasusrfs, wheezy
   #mundy:
   #  address: 192.25.206.62
   #  parents: gw-ftcollins
@@ -475,6 +487,12 @@ servers:
     parents: gw-ftcollins
     hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
   # }}}
+  # {{{ gw-gatech
+  sechter:
+    address: 128.61.240.73
+    parents: gw-gatech
+    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
@@ -515,15 +533,16 @@ servers:
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-server, postgres91-hosts
-  lw05:
-    address: 185.17.185.181
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
+  lw07:
+    address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
-  lw06:
-    address: 185.17.185.182
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts, apache2-hosts
+  lw08:
+    address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs
+  #, apache2-hosts
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -554,6 +573,14 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
+  mipsel-manda-01:
+    address: 82.195.75.72
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -620,6 +647,14 @@ servers:
     address: 82.195.75.92
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy
+  mipsel-manda-01:
+    address: 82.195.75.72
+    parents: gw-man-da
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-man-da
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
   # }}}
   # {{{ gw-marist
   zani:
@@ -649,6 +684,10 @@ servers:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
 #    hostgroups: computers, buildd, hasbootfs
+  merulo:
+    address: 140.211.166.46
+    parents: gw-osuosl
+    hostgroups: computers, porterbox, hasusrfs, wheezy
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
@@ -740,7 +779,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, uploadqueue, hasorgfs, xinetd-hosts, wheezy, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, hasorgfs, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -1233,6 +1272,8 @@ servicegroups:
   security:
     alias: security
     servicegroup_members: apt, kernel, samhain
+  MQ:
+    alias: rabbitMQ stuff
 # }}}
 # {{{ ############################# services #############################
 services:
@@ -1335,7 +1376,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw04
+    hosts: sibelius, busoni, buxtehude, lw07
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1416,6 +1457,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 98 92 /storage/snapshot-farm-4"
     hosts: lw04
+  -
+    name: disk usage on /srv/morgue.debian.org/
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
+    hosts: lw03
   # }}}
   # {{{ ### system
   # {{{ setup
@@ -1717,6 +1763,7 @@ services:
   ###
   -
     name: MQ connection on rainier
+    servicegroups: MQ
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rainier
     hostgroups: computers
@@ -1725,6 +1772,7 @@ services:
     excludehostgroups: alioth, broken_mq
   -
     name: MQ connection on rapoport
+    servicegroups: MQ
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rapoport
     hostgroups: computers
@@ -1875,11 +1923,10 @@ services:
     normal_check_interval: 120
     hostgroups: dl585
   ###
-  -
-    name: HW - edac status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-    normal_check_interval: 120
-    hosts: lw05, lw06
+#  -
+#    name: HW - edac status
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
+#    normal_check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, senfl, schein
   -
@@ -1887,17 +1934,27 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
-    excludehosts: villa, lobos, senfl, schein
+    excludehosts: villa, lobos, senfl, schein, storace
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
     normal_check_interval: 120
-    hosts: villa, lobos
+    hosts: villa
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
+    normal_check_interval: 120
+    hosts: lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
     normal_check_interval: 120
     hosts: senfl, schein
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
+    normal_check_interval: 120
+    hosts: storace
   ###
   -
     name: RAID - 3ware
@@ -2256,28 +2313,28 @@ services:
     hosts: backuphost
   # }}}
   # {{{ power
-  -
-    name: process - UPS - nut usbhid-ups - ups1
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
-    hosts: franck
-  -
-    name: process - UPS - nut upsd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsd  -a '/sbin/upsd'"
-    hosts: franck
-  -
-    name: process - UPS - nut upsmon master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C upsmon  -a '/sbin/upsmon'"
-    hosts: franck
-  -
-    name: process - UPS - nut upsmon worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsmon  -a '/sbin/upsmon'"
-    hosts: franck
-    depends: process - UPS - nut upsmon master
-  -
-    name: UPS - on line power
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
-    hosts: franck
-    depends: process - UPS - nut upsd
+#  -
+#    name: process - UPS - nut usbhid-ups - ups1
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
+#    hosts: franck
+#  -
+#    name: process - UPS - nut upsd
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsd  -a '/sbin/upsd'"
+#    hosts: franck
+#  -
+#    name: process - UPS - nut upsmon master
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C upsmon  -a '/sbin/upsmon'"
+#    hosts: franck
+#  -
+#    name: process - UPS - nut upsmon worker
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsmon  -a '/sbin/upsmon'"
+#    hosts: franck
+#    depends: process - UPS - nut upsmon master
+#  -
+#    name: UPS - on line power
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
+#    hosts: franck
+#    depends: process - UPS - nut upsd
   # }}}
   # {{{ buildd
   -
@@ -2393,7 +2450,7 @@ services:
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org
-    check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
+    check: "dsa_check_soas_add!denis.debian.org!alioth.debian.org"
     hosts: global
   -
     name: DNS - delegation and signature expiry
@@ -2432,7 +2489,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=8867 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=9966 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
   # }}}