From: Stephen Gran Date: Sun, 21 Feb 2010 02:53:55 +0000 (+0000) Subject: skip munin on fano, as it keeps dying and holding up the show X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aa54b06448c4a5a94a1edf3699f29c91127bb7a7;p=dsa-puppet.git skip munin on fano, as it keeps dying and holding up the show Signed-off-by: Stephen Gran --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 7a3f262d..7b276525 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -274,6 +274,8 @@ host_settings: ancina.debian.org: 2025 kassia.debian.org: 587 piatti.debian.org: 2025 + no_munin: + - fano.debian.org # reservedaddrs: # ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5" --- diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb index fc09288e..37fc7d66 100644 --- a/modules/munin-node/templates/munin.conf.erb +++ b/modules/munin-node/templates/munin.conf.erb @@ -12,10 +12,12 @@ graph_strategy cgi <%= out = '' localinfo.keys.sort.each do |node| - out += '[' + node + '] + if localinfo[node]['no_munin'] != "true" + out += '[' + node + '] address ' + node + ' ' - end + end + end out %>