Module: check_mk
Branch: master
Commit: a810f718146f4e646b1927c69aeaca444458bc5f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a810f718146f4e…
Author: Óscar Nájera <on(a)mathias-kettner.de>
Date: Thu Sep 27 18:51:55 2018 +0200
refactor license
Change-Id: I7cf21718f774005c9d1ecbfee3c89897c993ae26
---
agents/special/agent_netapp | 4 ++--
checks/esx_vsphere_licenses | 9 ++++-----
checks/ibm_svc_license | 22 +++++++++++-----------
checks/stormshield_cluster_node | 4 ++--
4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp
index 055dc8f..6330a91 100755
--- a/agents/special/agent_netapp
+++ b/agents/special/agent_netapp
@@ -865,9 +865,9 @@ licenses = {"v1": {}, "v1_disabled": {},
"v2": {}, "v2_disabled": {}}
license_info = query("license-list-info")
if license_info:
licenses["v1"] = create_dict(license_info, custom_key =
["service"], is_counter = False)
- for license, values in licenses["v1"].items():
+ for license_, values in licenses["v1"].items():
if values.get("is-licensed", "") == "false":
- licenses["v1_disabled"][license] = values
+ licenses["v1_disabled"][license_] = values
# The v2 license info is not used, yet
licensev2_info = query("license-v2-list-info")
diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses
index b0399ad..7905205 100644
--- a/checks/esx_vsphere_licenses
+++ b/checks/esx_vsphere_licenses
@@ -46,12 +46,12 @@ def inventory_esx_vsphere_licenses(parsed):
return [(key, None) for key in parsed.keys()]
def check_esx_vsphere_licenses(item, params, parsed):
- license = parsed.get(item)
- if not license:
+ license_ = parsed.get(item)
+ if not license_:
return 3, "License not found in agent output"
- status, infotext, perfdata = license_check_levels(license["total"],
license["used"], params)
- infotext = "%s Key(s), " % license["keys"] + infotext
+ status, infotext, perfdata = license_check_levels(license_["total"],
license_["used"], params)
+ infotext = "%s Key(s), " % license_["keys"] + infotext
return status, infotext, perfdata
@@ -64,4 +64,3 @@ check_info['esx_vsphere_licenses'] = {
"group" : "esx_licenses",
"includes" : [ "license.include" ]
}
-
diff --git a/checks/ibm_svc_license b/checks/ibm_svc_license
index 3454379..2860785 100644
--- a/checks/ibm_svc_license
+++ b/checks/ibm_svc_license
@@ -44,23 +44,23 @@ def parse_ibm_svc_license(info):
licenses = {}
for line in info:
if line[0].startswith("license_"):
- license = line[0].replace("license_", "")
- if not license in licenses.keys():
- licenses[license] = [0.0, 0.0]
+ license_ = line[0].replace("license_", "")
+ if not license_ in licenses.keys():
+ licenses[license_] = [0.0, 0.0]
if line[1] == "off":
- licenses[license][0] = 0.0
+ licenses[license_][0] = 0.0
else:
- licenses[license][0] = float(line[1])
+ licenses[license_][0] = float(line[1])
if line[0].startswith("used_"):
- license = line[0].replace("used_", "")
- if not license in licenses.keys():
- licenses[license] = [0.0, 0.0]
- licenses[license][1] = float(line[1])
+ license_ = line[0].replace("used_", "")
+ if not license_ in licenses.keys():
+ licenses[license_] = [0.0, 0.0]
+ licenses[license_][1] = float(line[1])
return licenses
def inventory_ibm_svc_license(info):
- return [ (license, None)
- for license in parse_ibm_svc_license(info) ]
+ return [ (license_, None)
+ for license_ in parse_ibm_svc_license(info) ]
def check_ibm_svc_license(item, params, info):
licenses = parse_ibm_svc_license(info)
diff --git a/checks/stormshield_cluster_node b/checks/stormshield_cluster_node
index abdbde6..279b276 100644
--- a/checks/stormshield_cluster_node
+++ b/checks/stormshield_cluster_node
@@ -50,7 +50,7 @@ def inventory_stormshield_cluster_node(info):
def check_stormshield_cluster_node(item, params, info):
- for index, serial, online, model, version, license, quality, priority, \
+ for index, serial, online, model, version, license_, quality, priority, \
statusforced, active, _uptime in info:
if item == index:
warn, crit = params['quality']
@@ -70,7 +70,7 @@ def check_stormshield_cluster_node(item, params, info):
yield 0, 'Quality: %s' % quality
infotext = 'Model: %s, Version: %s, Role: %s, Priority: %s, Serial:
%s' \
- % ( model, version, license, priority, serial )
+ % ( model, version, license_, priority, serial )
yield 0, infotext