X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=952718b94209747a9d4f74292ae8abb7aa9fbe73;hb=e6ad0fff6961be4fe31981a7a0e7753c51daf6e2;hp=046bee535193191290af14c17d0e092aa3982902;hpb=1979e518a9c6ff49773e654c94fa3c83a4992b20;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 046bee5..952718b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,11 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    parents: gw-ubcece
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
   gw-1und1-sec:
     parents: gw-ubcece
     hostgroups: notacomputer
@@ -166,12 +161,6 @@ servers:
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
-  # {{{ gw-1und1
-  powell:
-    address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, jessie
-  # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
@@ -565,31 +554,31 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -652,6 +641,10 @@ servers:
     address: 194.177.211.207
     parents: ganeti-grnet
     hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
+  melartin:
+    address: 194.177.211.208
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   schein:
@@ -972,19 +965,19 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
@@ -1228,6 +1221,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bl460g8:
+    alias: HP BL460 Gen8 blades
+    private: 1
   bm-bl:
     alias: HP blades at bytemark
     private: 1
@@ -1556,6 +1552,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
     hosts: lw03
+  -
+    name: disk usage on /srv/QNAP-big/
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big"
+    hosts: storace
+  -
+    name: disk usage on /srv/QNAP-tiny
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny"
+    hosts: storace
   # }}}
   # {{{ ### system
   # {{{ setup
@@ -2075,7 +2081,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl380, dl360, bl460, dl180
+    hostgroups: dl380, dl360, bl460, bl460g8, dl180
     excludehosts: schein, busoni
     excludehostgroups: hpnewraid
   -
@@ -2141,12 +2147,6 @@ services:
     check_interval: 120
     hosts: mirror-anu
   ###
-  -
-    name: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: powell
-  ###
   -
     name: RAID - aacraid
     servicegroups: raid