[checkmk-commits] Check_MK Git: check_mk: #2070 FIX agent_netapp: fixed exception when a channel has no shelf-list configured

Module: check_mk Branch: master Commit: 8112dce63e6f59c0a27e1043c249fc4f65eae6ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8112dce63e6f59… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 21 13:23:11 2015 +0200 #2070 FIX agent_netapp: fixed exception when a channel has no shelf-list configured --- .werks/2070 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2070 b/.werks/2070 new file mode 100644 index 0000000..d63e851 --- /dev/null +++ b/.werks/2070 @@ -0,0 +1,10 @@ +Title: agent_netapp: fixed exception when a channel has no shelf-list configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429615270 + + diff --git a/ChangeLog b/ChangeLog index 029cd37..e52046d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -336,6 +336,7 @@ * 2068 FIX: Filesystem checks: Fix crash when legacy parameters (tuple) were used... * 2213 FIX: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature... * 2069 FIX: netapp_api_disk.summary: fixed one missing disk in summary check... + * 2070 FIX: agent_netapp: fixed exception when a channel has no shelf-list configured Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 577b251..83c8947 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -160,6 +160,9 @@ def output_environment(results): channel_name = channel.child_get_string("channel-name") shelf_list = channel.child_get("shelf-environ-shelf-list") + if not shelf_list: + continue + for idx, child in enumerate(shelf_list.children_get()): current_shelf = child.child_get("ses-generic-info").child_get_string("ses-logical-id") # convert 0x50050cc002219406 to 50:05:0c:c0:02:21:94:06