X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4ca3344dbb1f26d5a6fad25dad6745f95fd515fc;hb=4dd94be5ec29b8e4eab807fd6de7552a764cfbf7;hp=c008afc1ba17b8f7fa159eceea04ed807a56bc1d;hpb=4b762fea7ad8aeb37346339e9fb55fa144e41aaa;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c008afc..4ca3344 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,10 +199,6 @@ servers:
     address: 195.20.242.124
     parents: schumann
     hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres91-hosts, wheezy
-  geo3:
-    address: 195.20.242.125
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -216,7 +212,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, wheezy, autofs
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, wheezy, autofs, sw-raid
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
@@ -226,11 +222,15 @@ servers:
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, wheezy, nfs-client
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, wheezy, nfs-client
+  minkus:
+    address: 141.170.6.151
+    parents: gw-aql
+    hostgroups: computers, porterbox, jessie, nfs-client
   mipsel-aql-01:
     address: 141.170.6.152
     parents: gw-aql
@@ -429,7 +429,7 @@ servers:
   oyens:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts, openstack-controller, apache-https, broken_mq
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts, openstack-controller, apache-https, broken_mq
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -462,6 +462,13 @@ servers:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie
+  fede:
+    address: 5.153.231.37
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+  sor:
+    address: 5.153.231.38
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -568,7 +575,15 @@ servers:
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+  geo3:
+    address: 194.177.211.201
+    parents: gw-grnet
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+  cgi-grnet-01:
+    address: 194.177.211.202
+    parents: gw-grnet
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-isc
   schein:
@@ -628,7 +643,7 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, wheezy
+    hostgroups: computers, buildd, hasbootfs, wheezy, sw-raid
   # bartok TODO
   czerny:
     address: 82.195.75.109
@@ -691,7 +706,7 @@ servers:
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, acpid-hosts, jetty-hosts
+    hostgroups: computers, service, kvmdomains, jessie, acpid-hosts, jetty-hosts
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -760,11 +775,11 @@ servers:
   parry:
     address: 140.211.15.153
     parents: gw-osuosl
-    hostgroups: computers, wheezy, buildd, hassrvfs
+    hostgroups: computers, wheezy, buildd, hassrvfs, sw-raid
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs, porterbox
+    hostgroups: computers, wheezy, hassrvfs, porterbox, sw-raid
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -802,7 +817,7 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
   # }}}
   # {{{ gw-sil
   eder:
@@ -816,7 +831,7 @@ servers:
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, wheezy, sw-raid
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -1024,11 +1039,15 @@ servers:
   prokofiev:
     address: 143.106.167.147
     parents: gw-unicamp
-    hostgroups: computers, jessie, acpid-hosts, service
+    hostgroups: computers, jessie, service
   powerpc-unicamp-01:
     address: 143.106.167.149
     parents: prokofiev
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  ppc64el-unicamp-01:
+    address: 143.106.167.135
+    parents: prokofiev
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -1096,7 +1115,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, wheezy, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror
+    hostgroups: computers, service, wheezy, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1104,6 +1123,9 @@ hostgroups:
   computers:
     alias: computers
     private: 1
+    extinfo-icon_image: base/debian.png
+    extinfo-icon_image_alt: Debian GNU/Linux
+    extinfo-notes_url: https://db.debian.org/machines.cgi?host=%s
   layer2-infrastructure:
     alias: Layer 2 Devices
     extinfo-icon_image: base/switch40.png
@@ -1118,6 +1140,7 @@ hostgroups:
   freebsd:
     alias: freebsd
     private: 1
+    extinfo-icon_image_alt: Debian GNU/kFreeBSD
   armhf:
     alias: armhf
     private: 1
@@ -1127,24 +1150,12 @@ hostgroups:
 
   porterbox:
     alias: developer accessible porter machines
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
   service:
     alias: machines running services
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
   buildd:
     alias: buildd systems
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
   general:
     alias: general purpose developer accessible machines
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
 
   dl380:
     alias: HP DL380 hosts
@@ -1549,6 +1560,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
+    excludehosts: prokofiev
+  -
+    name: processes - total
+    nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
+    hosts: prokofiev
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1654,6 +1670,15 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
+  -
+    name: upgraded libraries
+    servicegroups: security
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
+    hostgroups: computers
+    excludehostgroups: freebsd
+    normal_check_interval:  60
+    retry_check_interval: 15
+    notification_interval: 10080
   -
     name: installed firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
@@ -1705,12 +1730,16 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: freebsd
+    excludehostgroups: freebsd, jessie
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: freebsd
+  -
+    name: process - syslog-ng
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -F'"
+    hostgroups: jessie
 
   -
     name: remote logging on lotti
@@ -1951,6 +1980,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
+  -
+    name: RAID - unexpected sw raid
+    servicegroups: raid
+    nrpe: "if [ -e /proc/mdstat ]; then echo 'Found /proc/mdstat'; exit 1; else echo 'No /proc/mdstat on this host.'; fi"
+    hostgroups: computers
+    excludehostgroups: sw-raid
   ###
   -
     name: HW - hpacucli status
@@ -2474,7 +2509,7 @@ services:
   # {{{ DNS
   -
     name: process - named
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u bind -C named -a '/usr/sbin/named -u bind'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u bind -C named -a '/usr/sbin/named '"
     hostgroups: bind9-hosts
   -
     name: network service - dns
@@ -2599,6 +2634,14 @@ services:
     hostgroups: openstack-controller
   # }}}
   # {{{ misc
+#  -
+#    Disable this check until logind and binfmt_misc issues are fixed
+#    something unknown is triggering mount of binfmt_misc
+#    https://bugs.debian.org/772700
+#    name: system - all services running
+#    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
+#    hostgroups: jessie
+  ###
   -
     name: process - rngd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd  -a '/usr/sbin/rngd -r /dev/hwrng'"