X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/51c7169f70c83e5e857a2ee5560deda2c571c215..3bf78aaba3d1931d0505fa465555d3f1aa019e03:/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 e8260717e..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
@@ -109,23 +114,29 @@ unknown_limit 144
     apcpdu_current.graph_category power
     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.draw AREASTACK
-    apcpdu_current.current.min 0
+    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.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.draw AREASTACK
-    apcpdu_power.power.min 0
+    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 pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_temperature.temperature
+    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
@@ -133,7 +144,7 @@ unknown_limit 144
     apcpdu_humidity.graph_args --lower-limit 0
     apcpdu_humidity.graph_vlabel %
     apcpdu_humidity.graph_category sensors
-    apcpdu_humidity.graph_order pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_humidity.humidity
+    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