From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Sep 2014 12:56:00 +0000 (+0100)
Subject: Ignore bogus ipmi_temp warnings on G6 machines
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2dde19d4322c421d29e7b6f3a8a1c55b773194fc

Ignore bogus ipmi_temp warnings on G6 machines
---

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 7175d6866..71484c237 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -37,6 +37,9 @@ unknown_limit 144
 <% if client[:munin][:plugins][plugin][value][:graph] -%>
     <%= plugin %>.<%= value %>.graph <%= client[:munin][:plugins][plugin][value][:graph] %>
 <% end -%>
+<% if client[:munin][:plugins][plugin][value][:label] -%>
+    <%= plugin %>.<%= value %>.label <%= client[:munin][:plugins][plugin][value][:label] %>
+<% end -%>
 <% if client[:munin][:plugins][plugin][value][:warning] -%>
     <%= plugin %>.<%= value %>.warning <%= client[:munin][:plugins][plugin][value][:warning] %>
 <% end -%>
diff --git a/roles/hp-g6.rb b/roles/hp-g6.rb
new file mode 100644
index 000000000..45076b41e
--- /dev/null
+++ b/roles/hp-g6.rb
@@ -0,0 +1,39 @@
+name "hp-g6"
+description "Role applied to all HP G6 machines"
+
+default_attributes(
+  :munin => {
+    :plugins => {
+      :ipmi_temp => {
+        :Temp1 => { :label => "External Environment" },
+        :Temp2 => { :warning => ":", :label => "CPU 1" },
+        :Temp3 => { :warning => ":", :label => "CPU 2" },
+        :Temp4 => { :warning => ":", :label => "Memory 1" },
+        :Temp5 => { :warning => ":", :label => "Memory 2" },
+        :Temp6 => { :warning => ":", :label => "Memory 3" },
+        :Temp7 => { :warning => ":", :label => "Memory 4" },
+        :Temp8 => { :warning => ":", :label => "Memory 5" },
+        :Temp9 => { :warning => ":", :label => "Memory 6" },
+        :Temp10 => { :warning => ":", :label => "Memory 7" },
+        :Temp11 => { :warning => ":", :label => "Memory 8" },
+        :Temp12 => { :warning => ":", :label => "PSU 1" },
+        :Temp13 => { :warning => ":", :label => "PSU 2" },
+        :Temp14 => { :warning => ":", :label => "Memory 9" },
+        :Temp15 => { :warning => ":", :label => "CPU Zone 1" },
+        :Temp16 => { :warning => ":", :label => "CPU Zone 2" },
+        :Temp17 => { :warning => ":", :label => "Memory 10" },
+        :Temp18 => { :warning => ":", :label => "CPU Zone 3" },
+        :Temp19 => { :warning => ":", :label => "Peripheral Bay 1" },
+        :Temp20 => { :warning => ":", :label => "Peripheral Bay 2" },
+        :Temp21 => { :warning => ":", :label => "Peripheral Bay 3" },
+        :Temp22 => { :warning => ":", :label => "Peripheral Bay 4" },
+        :Temp23 => { :warning => ":", :label => "Peripheral Bay 5" },
+        :Temp24 => { :warning => ":", :label => "Peripheral Bay 6" },
+        :Temp25 => { :warning => ":", :label => "Peripheral Bay 7" },
+        :Temp26 => { :warning => ":", :label => "Peripheral Bay 8" },
+        :Temp27 => { :warning => ":", :label => "Drive Backplane" },
+        :Temp28 => { :warning => ":", :label => "System Board" }
+      }
+    }
+  }
+)
diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 4894d2e28..8103dcfc2 100644
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -22,5 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
+  "role[hp-g6]",
   "role[gps-tile]"
 )
diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index 861bb80c4..9b132146c 100644
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -28,5 +28,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
+  "role[hp-g6]",
   "role[wiki]"
 )
diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index f38304668..3b4622e91 100644
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -31,6 +31,7 @@ default_attributes(
 
 run_list(
   "role[ic]",
+  "role[hp-g6]",
   "role[web-frontend]",
   "role[web-gpximport]",
   "role[web-statistics]",
diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index cbf2c3f7f..d741f68be 100644
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -31,5 +31,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
+  "role[hp-g6]",
   "role[web-frontend]"
 )
diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index ccb632ab5..096fcb01d 100644
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -31,5 +31,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
+  "role[hp-g6]",
   "role[web-frontend]"
 )
diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb
index f155ba3f5..8b407db6e 100644
--- a/roles/stormfly-01.rb
+++ b/roles/stormfly-01.rb
@@ -15,5 +15,6 @@ default_attributes(
 )
 
 run_list(
-  "role[osuosl]"
+  "role[osuosl]",
+  "role[hp-g6]"
 )
diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index b107b0ae6..c27b1d06a 100644
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -15,5 +15,6 @@ default_attributes(
 )
 
 run_list(
-  "role[osuosl]"
+  "role[osuosl]",
+  "role[hp-g6]"
 )