skip munin on fano, as it keeps dying and holding up the show

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7a3f262de60afbed7855f9e9b4bd79eb8ad18576..7b276525b5c2a54c2a73f309a7f8ede26cce635d 100644 (file)
--- 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 fc09288e23070ff95a0e3b660679d346838afb6f..37fc7d668b2b33097abd7485c91e3f1be8c2b830 100644 (file)
--- 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
 %>