[munin.conf] hostname en ".crans.org" pour tous

Python/etc/munin/munin-test.conf

@@ -20,10 +20,6 @@ rundir  /var/run/munin
 contact.roots.command mail -s "Munin - ${var:host} : ${var:graph_title}" nobody@crans.org
 contact.impression.command mail -s "Munin - ${var:graph_title}" impression@crans.org
 
-# Nagios
-contact.nagios.command /usr/sbin/send_nsca -H localhost -c /etc/send_nsca.cfg -to 120
-contacts nagios
-
 # Les graphes sont réalisés via le CGI
 graph_strategy cgi
 cgiurl /cgi-bin
@@ -72,31 +68,43 @@ for ap in ldap_conn.search(u'objectClass=borneWifi'):
 #@[switchs.crans.org;supervision.switchs.crans.org]
 #@update no
 
+
+print """
+# Les adherents
+[association.crans.org;adherents]
+    address localhost
+
+# Les adresses ips
+[association.crans.org;adresses-ip]
+    address localhost
+
+# Les stats wiki
+[association.crans.org;web.wiki]
+    address niomniom.adm.crans.org
+
+# Les stats web (sur zamok)
+# TODO autres sites webs (!)
+[association.crans.org;web.zamok]
+    address zamok.adm.crans.org
+
+# statistiques
+[association.crans.org;jabber]
+    address xmpp.adm.crans.org
+
+# Imprimante
+[association.crans.org;canon]
+    address zamok.adm.crans.org
+    contacts impression
+"""
+
+# TODO agrégation de graphes
+# load_all (load.load sur tous les serveurs)
+# uptime_all (uptime.uptime) --> draw = LINE2
+# pending_all (apt.pending)
+# hold_all (apt.hold_all)
+# postfix_all (postfix_mailqueue.deferred)
+# postfix_all_maildrop(postfix_mailqueue.maildrop)
 # 
-#@# Les adherents
-#@[association.crans.org;adherents]
-#@    address localhost
-#@
-#@# Les adresses ips
-#@[association.crans.org;adresses-ip]
-#@    address localhost
-#@
-#@# Les stats wiki
-#@[association.crans.org;web.wiki]
-#@    address niomniom.adm.crans.org
-#@
-#@# Les stats web (sur zamok)
-#@[association.crans.org;web.zamok]
-#@    address zamok.adm.crans.org
-#@
-#@# statistiques
-#@[association.crans.org;jabber]
-#@    address xmpp.adm.crans.org
-#@
-#@# Imprimante
-#@[association.crans.org;canon]
-#@    address zamok.adm.crans.org
-#@    contacts impression
 
 
 print # Listes des serveurs
@@ -112,7 +120,7 @@ for client in all_servers:
     apt.graph yes
     postfix_mailqueue.deferred.warning 1000
 """ % { 'hostname': client.hostname,
-        'profile': client.profile,
+        'profile': client.profile + '.crans.org',
       }
 
 print "[crans.org;]"