From d64ad43758cde5b1a3e2eadf07e9353b25a7754a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 1 Oct 2015 20:29:41 +0100 Subject: [PATCH] Ignore nonsense temperature warnings on HP DL180 G6 machines --- roles/eustace.rb | 2 +- roles/grindtooth.rb | 2 +- roles/grisu.rb | 3 ++- roles/hp-dl180-g6.rb | 35 ++++++++++++++++++++++++++++++ roles/{hp-g6.rb => hp-dl360-g6.rb} | 4 ++-- roles/noquiklos.rb | 2 +- roles/ouroboros.rb | 2 +- roles/ridley.rb | 2 +- roles/spike-01.rb | 2 +- roles/spike-02.rb | 2 +- roles/spike-03.rb | 2 +- roles/stormfly-01.rb | 2 +- roles/stormfly-02.rb | 2 +- roles/urmel.rb | 2 +- 14 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 roles/hp-dl180-g6.rb rename roles/{hp-g6.rb => hp-dl360-g6.rb} (96%) diff --git a/roles/eustace.rb b/roles/eustace.rb index ccba625c9..0002388c3 100644 --- a/roles/eustace.rb +++ b/roles/eustace.rb @@ -22,6 +22,6 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[piwik]" ) diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb index 07a26b843..d6636294c 100644 --- a/roles/grindtooth.rb +++ b/roles/grindtooth.rb @@ -22,6 +22,6 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[taginfo]" ) diff --git a/roles/grisu.rb b/roles/grisu.rb index a0fa44aa6..749be40e2 100644 --- a/roles/grisu.rb +++ b/roles/grisu.rb @@ -29,5 +29,6 @@ default_attributes( ) 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 index 000000000..5eef3246a --- /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 45076b41e..3f0cfd600 100644 --- 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 => { diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb index 8103dcfc2..036255f4f 100644 --- a/roles/noquiklos.rb +++ b/roles/noquiklos.rb @@ -22,6 +22,6 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gps-tile]" ) diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb index 0895ff5b1..9a4d65283 100644 --- a/roles/ouroboros.rb +++ b/roles/ouroboros.rb @@ -30,6 +30,6 @@ default_attributes( run_list( "role[ic]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[wiki]" ) diff --git a/roles/ridley.rb b/roles/ridley.rb index efcdd4c7d..47e12e7d0 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -82,7 +82,7 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]", diff --git a/roles/spike-01.rb b/roles/spike-01.rb index 3b4622e91..41d17b8c2 100644 --- a/roles/spike-01.rb +++ b/roles/spike-01.rb @@ -31,7 +31,7 @@ default_attributes( run_list( "role[ic]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[web-frontend]", "role[web-gpximport]", "role[web-statistics]", diff --git a/roles/spike-02.rb b/roles/spike-02.rb index d741f68be..4b8dd683c 100644 --- a/roles/spike-02.rb +++ b/roles/spike-02.rb @@ -31,6 +31,6 @@ default_attributes( run_list( "role[ic]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[web-frontend]" ) diff --git a/roles/spike-03.rb b/roles/spike-03.rb index 096fcb01d..ba73876e0 100644 --- a/roles/spike-03.rb +++ b/roles/spike-03.rb @@ -31,6 +31,6 @@ default_attributes( run_list( "role[ic]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[web-frontend]" ) diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb index 4641119fb..f0492ad50 100644 --- a/roles/stormfly-01.rb +++ b/roles/stormfly-01.rb @@ -16,6 +16,6 @@ default_attributes( run_list( "role[osuosl]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[taginfo]" ) diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb index 9108f694d..9c31e1fb7 100644 --- a/roles/stormfly-02.rb +++ b/roles/stormfly-02.rb @@ -30,6 +30,6 @@ default_attributes( run_list( "role[osuosl]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[tilecache]" ) diff --git a/roles/urmel.rb b/roles/urmel.rb index 5c5102333..ef6899a1c 100644 --- a/roles/urmel.rb +++ b/roles/urmel.rb @@ -22,6 +22,6 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[munin]" ) -- 2.39.5