Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dc320fd..4ca3344 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -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
@@ -468,7 +468,7 @@ servers:
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, autofs, nfs-client
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -580,7 +580,7 @@ servers:
     address: 194.177.211.201
     parents: gw-grnet
     hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
-  search-grnet-01:
+  cgi-grnet-01:
     address: 194.177.211.202
     parents: gw-grnet
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
@@ -706,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
@@ -817,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:
@@ -1670,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"
@@ -2625,10 +2634,13 @@ services:
     hostgroups: openstack-controller
   # }}}
   # {{{ misc
-  -
-    name: system - all services running
-    nrpe: "/usr/bin/sudo /bin/systemctl is-system-running"
-    hostgroups: jessie
+#  -
+#    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