X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/27fd49876db529db0913497ff549aaeb3e39b58f..3ef2b67bd606468053449f1a63937562c7dc178f:/cookbooks/munin/templates/default/munin.conf.erb

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 5bf451d48..dff786b7c 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -90,6 +90,11 @@ unknown_limit 144
 <% end -%>
 <% end -%>
 
+# Configure monitoring for switch1.openstreetmap.org
+[openstreetmap.org;switch1.openstreetmap.org]
+    address 10.0.48.10
+    use_node_name no
+
 # Configure monitoring for pdu1.ams.openstreetmap.org
 [openstreetmap.org;pdu1.ams.openstreetmap.org]
     address 10.0.48.10
@@ -107,16 +112,42 @@ unknown_limit 144
     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.current.label Current
-    apcpdu_current.current.min 0
-    apcpdu_power.graph_title Load
+    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.pdu1.label PDU A
+    apcpdu_current.pdu1.draw AREASTACK
+    apcpdu_current.pdu1.min 0
+    apcpdu_current.pdu2.label PDU B
+    apcpdu_current.pdu2.draw AREASTACK
+    apcpdu_current.pdu2.min 0
+    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.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.power.label Power
-    apcpdu_power.power.min 0    
+    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.pdu1.label PDU A
+    apcpdu_power.pdu1.draw AREASTACK
+    apcpdu_power.pdu1.min 0
+    apcpdu_power.pdu2.label PDU B
+    apcpdu_power.pdu2.draw AREASTACK
+    apcpdu_power.pdu2.min 0
+    apcpdu_temperature.graph_title Temperature
+    apcpdu_temperature.graph_args --lower-limit 0
+    apcpdu_temperature.graph_vlabel Degrees Celsius
+    apcpdu_temperature.graph_category sensors
+    apcpdu_temperature.graph_order temperature=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_temperature.temperature
+    apcpdu_temperature.temperature.label Temperature
+    apcpdu_temperature.temperature.draw LINE2
+    apcpdu_temperature.temperature.min 0
+    apcpdu_humidity.graph_title Humidity
+    apcpdu_humidity.graph_args --lower-limit 0
+    apcpdu_humidity.graph_vlabel %
+    apcpdu_humidity.graph_category sensors
+    apcpdu_humidity.graph_order humidity=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_humidity.humidity
+    apcpdu_humidity.humidity.label Humidity
+    apcpdu_humidity.humidity.draw LINE2
+    apcpdu_humidity.humidity.min 0
 <% unless @frontends.empty? && @backends.empty? -%>
 
 # Configure compound graphs for www.openstreetmap.org
@@ -196,7 +227,7 @@ unknown_limit 144
     api_calls_error.http503.label 503 Service Unavailable
     api_calls_error.http503.warning :0.5
     api_calls_error.http509.sum <%= Chef::Munin.expand "%%.openstreetmap.org:api_calls_status.http509", @frontends %>
-    api_calls_error.http509.label 509 Bandwidth Limit Exceeded 
+    api_calls_error.http509.label 509 Bandwidth Limit Exceeded
     api_calls_error.http509.warning :5
     api_calls_num.graph_title Requests processed
     api_calls_num.graph_vlabel Number of requests per ${graph_period}