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

diff --combined config/nagios-master.cfg
index 9e70c6e,d6a7e77..74e835d
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -482,7 -482,7 +482,7 @@@ servers
    spontini:
      address: 206.12.19.14
      parents: gw-ubc
 -    hostgroups: computers, buildd, hasbootfs, hassrvfs
 +    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc
      contacts: lfilipoz
    ravel:
      address: 206.12.19.5
@@@ -546,7 -546,7 +546,7 @@@
    vivaldi:
      address: 206.12.19.12
      parents: tchaikovsky
-     hostgroups: computers, hasbootfs, aacraid, hassrvfs
+     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts
    # MSA 2000 (2012i)
    giustini:
      address: 192.168.2.6
@@@ -1085,6 -1085,11 +1085,11 @@@ services
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
      hosts: sibelius
+   -
+     name: disk usage on /srv/fossology.debian.net
+     servicegroups: diskspace
+     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
+     hosts: vivaldi
  
   ############ All Computers ############
   ####
@@@ -1815,7 -1820,7 +1820,7 @@@
    -
      name: network service - https
      check: check_https
-     hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
+     hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
      depends: "process - apache2 - master"
      normal_check_interval: 120
    -
@@@ -1829,7 -1834,8 +1834,8 @@@
      # merkel2         nm.debian.org
      # liszt           lists.debian.org
      # grieg           buildd.debian.org
-     hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
+     # vivaldi         fossology.debian.org
+     hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
      depends: network service - https
      normal_check_interval: 60