From 8eff1012683a165183b67903f8bc1828522a870a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Jul 2018 18:54:13 +0100
Subject: [PATCH] Configure PDU monitoring in Amsterdam

---
 roles/ironbelly.rb | 15 +++++++++++++++
 roles/ridley.rb    | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 8a9c3f741..1694191e1 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -26,6 +26,21 @@ default_attributes(
       :data => "/store/elasticsearch"
     }
   },
+  :munin => {
+    :graphs => {
+      :apcpdu_ams => {
+        :title => "Current for Amsterdam",
+        :vlabel => "Amps",
+        :category => "Ups",
+        :values => {
+          :load => {
+            :sum => ["apcpdu_pdu1.load", "apcpdu_pdu2.load"],
+            :label => "Load"
+          }
+        }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/ridley.rb b/roles/ridley.rb
index 3d742bf5f..62228f5bc 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -6,21 +6,6 @@ default_attributes(
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
-  :munin => {
-    :graphs => {
-      :apcpdu_ucl => {
-        :title => "Current for UCL",
-        :vlabel => "Amps",
-        :category => "Ups",
-        :values => {
-          :load => {
-            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
-            :label => "Load"
-          }
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-- 
2.43.2