[checkmk-commits] ucs_c_rack_server: consider model in agent output

Module: check_mk Branch: master Commit: 79e3f0657a5ec29f19ef6a99369231518757e48f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e3f0657a5ec2… Author: Florian Kromer &lt;fk(a)mathias-kettner.de&gt; Date: Thu Feb 28 17:47:35 2019 +0100 ucs_c_rack_server: consider model in agent output Change-Id: I6e1e237c05da554aa312539a2bda674d23ba686a --- checks/ucs_c_rack_server_fans | 4 ++-- tests/unit/checks/generictests/datasets/ucs_c_rack_server_fans.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/ucs_c_rack_server_fans b/checks/ucs_c_rack_server_fans index d8ad8f5..ae7f66a 100644 --- a/checks/ucs_c_rack_server_fans +++ b/checks/ucs_c_rack_server_fans @@ -26,7 +26,7 @@ # exemplary agent output (separator is <TAB> and is tabulator): # <<<ucs_c_rack_server_fans:sep(9)>>> -# equipmentFan<TAB>dn sys/rack-unit-1/fan-module-1-1/fan-1<TAB>id 1<TAB>operability operable +# equipmentFan<TAB>dn sys/rack-unit-1/fan-module-1-1/fan-1<TAB>id 1<TAB>model <TAB>operability operable def parse_ucs_c_rack_server_fans(info): @@ -39,7 +39,7 @@ def parse_ucs_c_rack_server_fans(info): "").replace("rack-unit-", "Rack Unit ").replace( "/fan-module-", " Module ").replace( "/fan-", " ") - parsed[fan] = {'operability': key_value_pairs[2][1]} + parsed[fan] = {'operability': key_value_pairs[3][1]} except (IndexError, ValueError): pass diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_fans.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_fans.py index c09c517..1d9bd04 100644 --- a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_fans.py +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_fans.py @@ -6,22 +6,27 @@ checkname = 'ucs_c_rack_server_fans' info = [['equipmentFan', 'dn sys/rack-unit-1/fan-module-1-1/fan-1', 'id 1', + 'model ', 'operability operable'], ['equipmentFan', 'dn sys/rack-unit-1/fan-module-1-1/fan-2', 'id 2', + 'model ', 'operability operable'], ['equipmentFan', 'dn sys/rack-unit-2/fan-module-1-1/fan-1', 'id 1', + 'model ', 'operability operable'], ['equipmentFan', 'dn sys/rack-unit-2/fan-module-1-1/fan-2', 'id 2', + 'model ', 'operability bla'], ['equipmentFan', 'dn sys/rack-unit-2/fan-module-1-1/fan-3', 'id 3', + 'model ', 'operability blub']]