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 7175d6866d6bc32f0e99a74ff34029340bc7197e..71484c237f5208e4a45b0670dcf851877ebe8787 100644 (file)
--- 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 (file)
index 0000000..45076b4
--- /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 4894d2e28836e903635a7533fa4092aef8a6c130..8103dcfc2d10803b3db1a1ae495a34fe00981cb0 100644 (file)
--- 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 861bb80c406ab84505f6627f539904b132fb4d56..9b132146c9ae31e7238b37d12108b125920b9c8d 100644 (file)
--- 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 f383046687656ce021eec544203b5eafa483cb3c..3b4622e916302745f865b2b7574b2f1393892f91 100644 (file)
--- 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 cbf2c3f7fc3a11b2fa88901d5178380dd2343648..d741f68be7bb5f3cf8a26c25015c391ed37c52f3 100644 (file)
--- 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 ccb632ab58933c3055c0f71dfc15c83f44b7bd68..096fcb01d95d5c28651bf17eef32563b8d116302 100644 (file)
--- 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 f155ba3f53223fec478cd0f4b1a61c6460012c13..8b407db6ec98f7f1dc186773ac157ab44a3ef9a2 100644 (file)
--- 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 b107b0ae6345709ac895aff26fab5110c4ba23ff..c27b1d06a9efb271f005c1a008102336908af4b3 100644 (file)
--- 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]"
 )