[checkmk-commits] ucs_c_rack_server_health: consider id in agent output

Module: check_mk Branch: master Commit: 510fc34d41cf373edb1599113f60c517326227fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=510fc34d41cf37… Author: Florian Kromer &lt;fk(a)mathias-kettner.de&gt; Date: Fri Mar 1 11:52:05 2019 +0100 ucs_c_rack_server_health: consider id in agent output Change-Id: Ie57300e1e9ac11a87875a8e7096b01752df4c58c --- checks/ucs_c_rack_server_health | 8 +++++--- .../unit/checks/generictests/datasets/ucs_c_rack_server_health.py | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/checks/ucs_c_rack_server_health b/checks/ucs_c_rack_server_health index 8ff34da..f3ff547 100644 --- a/checks/ucs_c_rack_server_health +++ b/checks/ucs_c_rack_server_health @@ -25,8 +25,10 @@ # Boston, MA 02110-1301 USA. # exemplary output of special agent agent_ucs_bladecenter (<TAB> is tabulator): -# storageControllerHealth<TAB>dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good -# storageControllerHealth<TAB>dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0<TAB>health Good +# storageControllerHealth<TAB>dn +# sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0 <TAB>id SLOT-HBA<TAB>health Good +# storageControllerHealth<TAB>dn +# sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0 <TAB>id SLOT-HBA<TAB>health Good # Dict keys are storage controller health strings provided via special agent -> XML # API of servers. Dict values are corresponding check status. @@ -48,7 +50,7 @@ def parse_ucs_c_rack_server_health(info): 'health' if rack server has racks attached or empty dict if not. """ parsed = {} - for _, dn, health in info: + for _, dn, _id, health in info: rack_storage_board = dn.replace("dn sys/", "").replace("rack-unit-", "Rack unit ").replace( "/board/storage-", " Storage ").replace("-", " ").replace("/", " ") parsed[rack_storage_board] = health.replace("health ", "").lower() diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py index b5ebb9e..52cf0de 100644 --- a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py @@ -1,11 +1,12 @@ checkname = 'ucs_c_rack_server_health' info = [[ - 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'health Good' + 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'id SLOT-HBA', + 'health Good' ], [ 'storageControllerHealth', 'dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0', - 'health AnythingElse' + 'id SLOT-HBA', 'health AnythingElse' ]] discovery = {