Fix composite PDU graphs

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 5bf451d48521e28997e2676e2b527da943a8a07b..dd7d1f0fb84e388ce52fa7180bcb1ebed55ff7c2 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -107,15 +107,19 @@ unknown_limit 144
     apcpdu_current.graph_args --lower-limit 0
     apcpdu_current.graph_vlabel Amps
     apcpdu_current.graph_category power
     apcpdu_current.graph_args --lower-limit 0
     apcpdu_current.graph_vlabel Amps
     apcpdu_current.graph_category power

-    apcpdu_current.current.sum pdu1.ams.openstreetmap.org:snmp_pdu1.ams.openstreetmap.org_apcpdu_current.current pdu2.ams.openstreetmap.org:snmp_pdu2.ams.openstreetmap.org_apcpdu_current.current
+    apcpdu_current.graph_order pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_current.current pdu2=pdu2.ams.openstreetmap.org:snmp_pdu2_ams_openstreetmap_org_apcpdu_current.current
+    apcpdu_current.graph_total total

     apcpdu_current.current.label Current
     apcpdu_current.current.label Current

+    apcpdu_current.current.draw AREASTACK

     apcpdu_current.current.min 0
     apcpdu_current.current.min 0

-    apcpdu_power.graph_title Load
+    apcpdu_power.graph_title Power

     apcpdu_power.graph_args --base 1000 --lower-limit 0
     apcpdu_power.graph_vlabel Watts
     apcpdu_power.graph_category power
     apcpdu_power.graph_args --base 1000 --lower-limit 0
     apcpdu_power.graph_vlabel Watts
     apcpdu_power.graph_category power

-    apcpdu_power.power.sum pdu1.ams.openstreetmap.org:snmp_pdu1.ams.openstreetmap.org_apcpdu_power.power pdu2.ams.openstreetmap.org:snmp_pdu2.ams.openstreetmap.org_apcpdu_power.power
+    apcpdu_power.graph_order pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_power.power pdu2=pdu2.ams.openstreetmap.org:snmp_pdu2_ams_openstreetmap_org_apcpdu_power.power
+    apcpdu_power.graph_total total

     apcpdu_power.power.label Power
     apcpdu_power.power.label Power

+    apcpdu_power.power.draw AREASTACK

     apcpdu_power.power.min 0    
 <% unless @frontends.empty? && @backends.empty? -%>
 
     apcpdu_power.power.min 0    
 <% unless @frontends.empty? && @backends.empty? -%>