Module: check_mk Branch: master Commit: 55cfc236c62b57f355fa867638c7532acc102538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55cfc236c62b57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 6 08:57:31 2016 +0200 3529 FIX agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0) The agent was unable to determine if the machine is running in 7-mode or cluster-mode. --- .werks/3529 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3529 b/.werks/3529 new file mode 100644 index 0000000..d3092ec --- /dev/null +++ b/.werks/3529 @@ -0,0 +1,10 @@ +Title: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462517694 + +The agent was unable to determine if the machine is running in 7-mode or cluster-mode. diff --git a/ChangeLog b/ChangeLog index cc8dabc..0323c05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -209,6 +209,7 @@ * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" * 3565 FIX: wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output * 3528 FIX: netapp_api_protocol: fixed service discovery problem with older 7mode versions + * 3529 FIX: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0)... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index f6b8091..a8d1b5b 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -404,7 +404,13 @@ if not version_info: sys.stderr.write(",".join(section_errors)) sys.exit(1) -netapp_mode = version_info.child_get_string("is-clustered").lower() == "false" and "7mode" or "clustermode" +clustered_info = version_info.child_get_string("is-clustered") +if clustered_info: + netapp_mode = clustered_info.lower() == "false" and "7mode" or "clustermode" +else: + # Looks like the is-clustered attribute is not set, e.g. NetApp 7-Mode Version 8.0 + netapp_mode = "7-mode" in version_info.child_get_string("version").lower() and "7mode" or "clustermode" + #. # .--Clustermode Settings------------------------------------------------.