[checkmk-commits] Check_MK Git: check_mk: further update of #2413: prevents errors with certain ESX datasource configurations

Module: check_mk Branch: master Commit: 5b71ed3455dcce023fe8a784c3bf41ff70c56989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b71ed3455dcce… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri Jul 31 17:06:19 2015 +0200 further update of #2413: prevents errors with certain ESX datasource configurations --- agents/special/agent_vsphere | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5597595..2c7c455 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -846,16 +846,16 @@ if not error: ########################### # Datastores ########################### - datastores = {} # We also need the datastore info later in the virtualmachines section - if "datastore" in query_objects: - reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"]) - elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response) - for datastore, content in elements: - entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content) - datastores[datastore] = {} - for name, value in entries: - datastores[datastore][name] = value + datastores = {} # We need the datastore info later on in the virtualmachines and counter sections + reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"]) + elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response) + for datastore, content in elements: + entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content) + datastores[datastore] = {} + for name, value in entries: + datastores[datastore][name] = value + if "datastore" in query_objects: output("<<<esx_vsphere_datastores:sep(9)>>>") for key in sorted(datastores.keys()): data = datastores[key]