[checkmk-commits] Minor cleanup

Module: check_mk Branch: master Commit: 0f31532adb258bc5e702d716b94e923f71b66f9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f31532adb258b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 2 09:50:54 2018 +0100 Minor cleanup Change-Id: Idfb740978a4eb660dbdee54d216f83f679c0fd83 --- checks/salesforce_instances | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/checks/salesforce_instances b/checks/salesforce_instances index 6e09451..7a08bfa 100644 --- a/checks/salesforce_instances +++ b/checks/salesforce_instances @@ -31,16 +31,21 @@ def parse_salesforce(info): except ImportError: import json - parsed = [] + pre_parsed = [] for line in info: - parsed.append(json.loads(" ".join(line))) + pre_parsed.append(json.loads(" ".join(line))) + + parsed = {} + for entry in pre_parsed: + if entry.get("key"): + parsed.setdefault(entry.get("key"), entry) return parsed def inventory_salesforce_instances(parsed): - for entry in parsed: - if entry.get("key") and entry.get("isActive"): - yield entry["key"], {} + for instance, attrs in parsed.iteritems(): + if attrs.get("isActive"): + yield instance, {} def check_salesforce_instances(item, params, parsed): @@ -56,20 +61,19 @@ def check_salesforce_instances(item, params, parsed): "INFORMATIONAL_NONCORE": (0, "informational noncore"), } - for entry in parsed: - if entry.get("key") == item: - status = entry.get("status") - state, state_readable = map_states.get(status, (3, "unknown[%s]" % status)) - yield state, "Status: %s" % state_readable - if entry.get("environment"): - yield 0, "Environment: %s" % entry["environment"] - release_info = [] - if entry.get("releaseNumber"): - release_info.append("Number: %s" % entry["releaseNumber"]) - if entry.get("releaseVersion"): - release_info.append("Version: %s" % entry["releaseVersion"]) - if release_info: - yield 0, "Release %s" % ", ".join(release_info) + if item in parsed: + data = parsed[item] + status = data.get("status") + state, state_readable = map_states.get(status, (3, "unknown[%s]" % status)) + yield state, "Status: %s" % state_readable + + for key, title in [ + ("environment", "Environment"), + ("releaseNumber", "Release Number"), + ("releaseVersion", "Release Version") + ]: + if data.get(key): + yield 0, "%s: %s" % (title, data[key]) check_info['salesforce_instances'] = {