disk usage check for pg on samosa
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index a7a1364..bf6e596 100644 (file)
@@ -173,22 +173,22 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs
   gluck:
     address: 192.25.206.10
     parents: spohr
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, hasvarfs, hasusrfs
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
   spohr2:
     address: 192.25.206.38
     parents: rietz
@@ -196,55 +196,55 @@ servers:
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: spohr
-    hostgroups: computers, buildd, lenny, puppet
+    hostgroups: computers, buildd, lenny
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs, puppet
+    hostgroups: computers, porterbox, lenny, hasbootfs
   merulo:
     address: 192.25.206.58
     parents: spohr
-    hostgroups: computers, porterbox, lenny, puppet, hasusrfs
+    hostgroups: computers, porterbox, lenny, hasusrfs
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet, hasvarfs
+    hostgroups: computers, service, dl385, bind9-hosts, lenny, hasvarfs
     contacts: joerg, bzed
   #morales:
   #  address: 82.195.75.97
   #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet, hasvarfs, hasusrfs
+  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
   #  contacts: bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, lenny
     contacts: bzed
 #  auber:
 #    address: 82.195.75.101
@@ -254,43 +254,46 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny, puppet
+    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs, puppet
-
+    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+  draghi:
+    address: 82.195.75.106
+    parents: unger
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny, puppet
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
+    hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny, puppet, smart
+    hostgroups: computers, buildd, lenny, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -303,72 +306,72 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
 
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, rsyslog-hosts, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+    hostgroups: computers, service, rsyslog-hosts, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, puppet, rsyslog-hosts, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, rsyslog-hosts, acpid-hosts
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, lenny, puppet, hasusrfs
+    hostgroups: computers, porterbox, sw-raid, lenny, hasusrfs
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, lenny
     contacts: tjrc1
 
   verdi:
@@ -379,41 +382,41 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, puppet, lenny, hasvarfs
+    hostgroups: computers, buildd, lenny, hasvarfs
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, puppet, hassrvfs
+    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet, hassrvfs, hasvarfs, hasusrfs
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, rsyslog-hosts, hassrvfs
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, lenny, puppet
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny
 
   elara:
     address: 67.210.160.90
@@ -427,12 +430,12 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, lenny, puppet
+    hostgroups: computers, porterbox, single-cpu, smart, lenny
 
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet, incomingmailrelayed
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, incomingmailrelayed
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -449,12 +452,12 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-ghent
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs, incomingmailrelayed2025
     contacts: luk
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, buildd, single-cpu, lenny, hassrvfs, hasbootfs, incomingmailrelayed2025
     contacts: luk
 
   agnesi:
@@ -465,83 +468,83 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
     contacts: lfilipoz
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
-    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet
+    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny
   brahms:
     address: 137.82.84.74
     parents: dijkstra
-    hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs
   geo2:
     address: 137.82.84.71
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet
+    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, puppet, hasvarfs, hasusrfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, hasvarfs, hasusrfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, incomingmailrelayed2025
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny, puppet, hassrvfs
+    hostgroups: computers, porterbox, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet, hasvarfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360, bind9-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
+    hostgroups: computers, buildd, rsyslog-hosts, lenny
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed
+    hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
 #############################
 # host groups
@@ -585,11 +588,6 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
-  puppet:
-    alias: Hosts running puppet
-    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
@@ -790,7 +788,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -810,7 +808,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -841,6 +839,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
     hosts: caballero
+  -
+    name: disk usage on /var/lib/postgresql
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
+    hosts: samosa
 
  ############ All Computers ############
  ####
@@ -880,12 +883,14 @@ services:
   -
     name: process - puppet
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C ruby -a 'ruby /usr/sbin/puppetd -w 5 --factsync'"
-    hostgroups: puppet
+    hostgroups: lenny
+    excludehosts: agnesi
 
   -
     name: puppet
     nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
-    hostgroups: puppet
+    hostgroups: lenny
+    excludehosts: agnesi
 
  ####
   -
@@ -1327,7 +1332,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, allegri, piatti
+    excludehosts: verdi
     depends: process - postfix - master
   -
     name: network service - submission
@@ -1342,12 +1347,7 @@ services:
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, murphy, allegri, piatti
-    depends: process - postfix - master
-  -
-    name: network service - smtp - port 8080
-    check: dsa_check_smtp_port!8080
-    hosts: murphy
+    hosts: verdi
     depends: process - postfix - master
   -
     name: network service local - smtps cert
@@ -1487,7 +1487,7 @@ services:
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
-    hosts: samosa
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1523,19 +1523,19 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka, ancina
+    hosts: allegri, gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka, ancina
+    excludehosts: allegri, gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
     check: check_tcp!79
-    hosts: samosa
+    hosts: draghi
     depends: process - xinetd
  ###
   -
@@ -1610,13 +1610,13 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries, klecker
+    hosts: ries, klecker, draghi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker, spohr2
+    hosts: ries, klecker, spohr2, draghi
     depends: network service - https
     normal_check_interval: 60
 
@@ -1829,23 +1829,23 @@ services:
     hosts: global
   -
     name: DNS SOA sync - debian.org
-    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.org"
     hosts: global
   -
     name: DNS SOA sync - debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.net"
     hosts: global
   -
     name: DNS SOA sync - debian.com
-    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.com"
     hosts: global
   -
     name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net"
     hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
-    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org