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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  fix munin check for armhf
  mhy can haz armhf

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d29d6ad..a6325dd 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -2433,6 +2433,12 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contact_groups: buildd
+ ####
+  -
+    name: network service - gobby
+    check: check_tcp!6523
+    hosts: gombert
+    contact_groups: gobby
 
  ###
   #-

diff --git a/config/static/conf.d/contacts.cfg b/config/static/conf.d/contacts.cfg
index 60a7083..d0ccdfd 100644 (file)
--- a/config/static/conf.d/contacts.cfg
+++ b/config/static/conf.d/contacts.cfg
@@ -235,6 +235,12 @@ define contactgroup{
         members                 luk, pkern, HE
         }
 
+define contactgroup{
+        contactgroup_name       gobby
+        alias                   Debian gobby Admins
+        members                 pkern
+}
+
 define contactgroup{
         contactgroup_name       alioth-admins
         alias                   Debian Alioth admins