Ignore nonsense temperature warnings on HP DL180 G6 machines

diff --git a/roles/eustace.rb b/roles/eustace.rb
index ccba625c971bdfd66ea2ac02bdfd0748c5e71820..0002388c35f7ee08a4ba980958250ab047b66401 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -22,6 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[piwik]"
 )
   "role[piwik]"
 )

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 07a26b8434b922a65c69829ae3ec47c9e1a7fef0..d6636294ce77660f3936854fc19477b32f8739be 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -22,6 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[taginfo]"
 )
   "role[taginfo]"
 )

diff --git a/roles/grisu.rb b/roles/grisu.rb
index a0fa44aa6de2776d3793681c3cdde8463e48b4d6..749be40e21faf8d122bc096313da1e11155cd91a 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -29,5 +29,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ic]"
+  "role[ic]",
+  "role[hp-dl180-g6]"

 )
 )

diff --git a/roles/hp-dl180-g6.rb b/roles/hp-dl180-g6.rb
new file mode 100644 (file)
index 0000000..5eef324
--- /dev/null
+++ b/roles/hp-dl180-g6.rb
@@ -0,0 +1,35 @@
+name "hp-dl180-g6"
+description "Role applied to all HP DL180 G6 machines"
+
+default_attributes(
+  :munin => {
+    :plugins => {
+      :ipmi_temp => {
+        :Temp1 => { :label => "Air Inlet" },
+        :Temp2CPU1 => { :warning => ":", :label => "CPU 1" },
+        :Temp3CPU2 => { :warning => ":", :label => "CPU 2" },
+        :Temp4 => { :warning => ":", :label => "Memory 1" },
+        :Temp5 => { :warning => ":", :label => "Memory 2" },
+        :Temp8MemB0 => { :warning => ":", :label => "Memory 3" },
+        :Temp9MemB0 => { :warning => ":", :label => "Memory 4" },
+        :Temp10MemB0 => { :warning => ":", :label => "Memory 5" },
+        :Temp12MemB1 => { :warning => ":", :label => "Memory 6" },
+        :Temp13MemB1 => { :warning => ":", :label => "Memory 7" },
+        :Temp14MemB1 => { :warning => ":", :label => "Memory 8" },
+        :Temp15 => { :warning => ":", :label => "Main System Board 3" },
+        :Temp16 => { :warning => ":", :label => "Main System Board 4" },
+        :Temp17 => { :warning => ":", :label => "Main System Board 5" },
+        :Temp18 => { :warning => ":", :label => "Main System Board 6" },
+        :Temp19 => { :warning => ":", :label => "Main System Board 7" },
+        :Temp20 => { :warning => ":", :label => "Main System Board 8" },
+        :Temp21 => { :warning => ":", :label => "Main System Board 9" },
+        :Temp26 => { :warning => ":", :label => "Drive Backplane 1" },
+        :Temp27 => { :warning => ":", :label => "Drive Backplane 2" },
+        :Temp28 => { :warning => ":", :label => "Drive Backplane 3" },
+        :Temp29 => { :warning => ":", :label => "Drive Backplane 4" },
+        :Temp30 => { :warning => ":", :label => "Drive Backplane 5" },
+        :Temp31 => { :warning => ":", :label => "Drive Backplane 6" }
+      }
+    }
+  }
+)

diff --git a/roles/hp-g6.rb b/roles/hp-dl360-g6.rb
similarity index 96%
rename from roles/hp-g6.rb
rename to roles/hp-dl360-g6.rb
index 45076b41ef766f33048949d894653e931942a847..3f0cfd6004f04b72e7574bf9fd236c9eec0c92f6 100644 (file)
--- a/roles/hp-g6.rb
+++ b/roles/hp-dl360-g6.rb
@@ -1,5 +1,5 @@
-name "hp-g6"
-description "Role applied to all HP G6 machines"
+name "hp-dl360-g6"
+description "Role applied to all HP DL360 G6 machines"

 
 default_attributes(
   :munin => {
 
 default_attributes(
   :munin => {

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 8103dcfc2d10803b3db1a1ae495a34fe00981cb0..036255f4f8a90e6fa0b537b5928ce9ad715f6bf7 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -22,6 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[gps-tile]"
 )
   "role[gps-tile]"
 )

diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index 0895ff5b16f3528c6a0157f409296587876a3bbc..9a4d6528342b03b2498cec2e214ed1d1c800cf60 100644 (file)
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -30,6 +30,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[wiki]"
 )
   "role[wiki]"
 )

diff --git a/roles/ridley.rb b/roles/ridley.rb
index efcdd4c7dae67bd72b183e9358a6babadb07ad12..47e12e7d0012c80b736fe3a8be71b626abfab603 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -82,7 +82,7 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 3b4622e916302745f865b2b7574b2f1393892f91..41d17b8c2597b5ba1e5bfc3ca8e6bcaeb51e2e59 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -31,7 +31,7 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[web-frontend]",
   "role[web-gpximport]",
   "role[web-statistics]",
   "role[web-frontend]",
   "role[web-gpximport]",
   "role[web-statistics]",

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index d741f68be7bb5f3cf8a26c25015c391ed37c52f3..4b8dd683c566615c6db9b5a7b4fd128f9ae5da89 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -31,6 +31,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[web-frontend]"
 )
   "role[web-frontend]"
 )

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index 096fcb01d95d5c28651bf17eef32563b8d116302..ba73876e0d1bdf6ae303fb318a91fa5e7956550a 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -31,6 +31,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[web-frontend]"
 )
   "role[web-frontend]"
 )

diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb
index 4641119fb52ffca18337d20d40205dcf0aaf1474..f0492ad50fa84c3f76b94c12117e3e96445f54a2 100644 (file)
--- a/roles/stormfly-01.rb
+++ b/roles/stormfly-01.rb
@@ -16,6 +16,6 @@ default_attributes(
 
 run_list(
   "role[osuosl]",
 
 run_list(
   "role[osuosl]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[taginfo]"
 )
   "role[taginfo]"
 )

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 9108f694dd8ef7544fadc63d3e5c1f5b2f7a680b..9c31e1fb7cdcbd440254c9d5054b16d6274ba6d5 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -30,6 +30,6 @@ default_attributes(
 
 run_list(
   "role[osuosl]",
 
 run_list(
   "role[osuosl]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 5c5102333b15e1c18d0a8dd03784f1bf7e2dbebe..ef6899a1caf4f9a025066050f1412992e25cb2ba 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -22,6 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[munin]"
 )
   "role[munin]"
 )