Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

7335 FIX Fixed broken regex based hostname translation in EC

by Lars Michelsen

Module: check_mk Branch: master Commit: a29f048f5bda06cffecb1609e9cf31c319de4b19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29f048f5bda06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 14:14:22 2019 +0200 7335 FIX Fixed broken regex based hostname translation in EC The hostname translation of the EC was broken since release of Check_MK 1.4.0 (caused by #3687). This issue lead to dropped events once the translation has been condifgured. The problem was visible in the mkeventd.log in the following form: C+: 2019-04-04 11:36:24,286 [40] [cmk.mkeventd.EventServer] Unable to parse host "HOST" ('tuple' object has no attribute 'endswith') Traceback (most recent call last): File "/omd/sites/snmp/lib/python/cmk/ec/main.py", line 2787, in do_translate_hostname event["host"] = self.translate_hostname(event["host"]) File "/omd/sites/snmp/lib/python/cmk/ec/main.py", line 2768, in translate_hostname if not regex.endswith('$'): AttributeError: 'tuple' object has no attribute 'endswith' C-: Change-Id: I5d8b8dee696c02ac29d8118e66104338b91fbdea --- .werks/7335 | 24 ++++++++++++++++++++++++ cmk/ec/export.py | 5 +++++ cmk/ec/main.py | 19 ++++++++++--------- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/.werks/7335 b/.werks/7335 new file mode 100644 index 0000000..80e0add --- /dev/null +++ b/.werks/7335 @@ -0,0 +1,24 @@ +Title: Fixed broken regex based hostname translation in EC +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554805735 + +The hostname translation of the EC was broken since release of +Check_MK 1.4.0 (caused by #3687). This issue lead to dropped events +once the translation has been condifgured. The problem was visible +in the mkeventd.log in the following form: + +C+: + 2019-04-04 11:36:24,286 [40] [cmk.mkeventd.EventServer] Unable to parse host "HOST" ('tuple' object has no attribute 'endswith') +Traceback (most recent call last): + File "/omd/sites/snmp/lib/python/cmk/ec/main.py", line 2787, in do_translate_hostname + event["host"] = self.translate_hostname(event["host"]) + File "/omd/sites/snmp/lib/python/cmk/ec/main.py", line 2768, in translate_hostname + if not regex.endswith('$'): +AttributeError: 'tuple' object has no attribute 'endswith' +C-: diff --git a/cmk/ec/export.py b/cmk/ec/export.py index f3b1f35..147e3bb 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -250,6 +250,11 @@ def load_config(settings): levels["cmk.mkeventd.lock"] = levels["cmk.mkeventd"] config["log_level"] = levels + # Convert pre 1.4 hostname translation config + translation = config["hostname_translation"] + if "regex" in translation and not isinstance(translation["regex"], list): + translation["regex"] = [translation["regex"]] + return config diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 2a16fb1..71d7add 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1750,15 +1750,16 @@ class EventServer(ECServerThread): # 3. Regular expression conversion if "regex" in translation: - regex, subst = translation.get("regex") - if not regex.endswith('$'): - regex += '$' - rcomp = cmk.utils.regex.regex(regex) - mo = rcomp.match(backedhost) - if mo: - backedhost = subst - for nr, text in enumerate(mo.groups()): - backedhost = backedhost.replace("\\%d" % (nr + 1), text) + for regex, subst in translation["regex"]: + if not regex.endswith('$'): + regex += '$' + rcomp = cmk.utils.regex.regex(regex) + mo = rcomp.match(backedhost) + if mo: + backedhost = subst + for nr, text in enumerate(mo.groups()): + backedhost = backedhost.replace("\\%d" % (nr + 1), text) + break # 4. Explicity mapping for from_host, to_host in translation.get("mapping", []):

5 years, 6 months

Fix integration test get_rrddata data limits

by Óscar Nájera

Module: check_mk Branch: master Commit: 898dc2bc8717d7825231c4975a7f518e38b9fd4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=898dc2bc8717d7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Apr 9 14:03:52 2019 +0200 Fix integration test get_rrddata data limits Change-Id: I7d0afc06d8d22cecb2cd783d9ecbd21261f46f7a --- tests/integration/cmk_base/test_services_prediction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index a5a279b..ff67a18 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -89,7 +89,7 @@ def test_get_rrd_data(cfg_setup, utcdate, timezone, period, result): @pytest.mark.parametrize("max_entries, result", [(400, (180, 401)), (20, (3600, 21)), - (50, (1800, 41)), (1000, (120, 600)), + (50, (1440, 51)), (1000, (120, 600)), (1200, (60, 1200))]) def test_get_rrd_data_point_max(cfg_setup, max_entries, result): from_time, until_time = 1543430040, 1543502040

5 years, 6 months

agent_aws: Fixed return value of colleague contents of S3Summary section if no colleague results

by Simon Betz

Module: check_mk Branch: master Commit: eb34f546d33291204baa67a5549313d428f5bfb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb34f546d33291… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 9 11:50:36 2019 +0200 agent_aws: Fixed return value of colleague contents of S3Summary section if no colleague results Change-Id: If749992e5fd58495282d52661098dca8c23c07f6 --- cmk/special_agents/agent_aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 85bb891..7f50f5d 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -1266,7 +1266,7 @@ class S3Summary(AWSSectionGeneric): colleague = self._received_results.get('s3_limits') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0.0) + return AWSColleagueContents([], 0.0) def _fetch_raw_content(self, colleague_contents): found_buckets = []

5 years, 6 months

aws_*_limits: Fixed inventory section text

by Simon Betz

Module: check_mk Branch: master Commit: cd02de8fd8b10d07b8c825da2d6efa1647c76046 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd02de8fd8b10d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 9 11:56:23 2019 +0200 aws_*_limits: Fixed inventory section text Change-Id: I4894d8d543fccd308a3a69a5a3c00a8fec677744 --- checkman/aws_ebs_limits | 2 +- checkman/aws_ec2_limits | 2 +- checkman/aws_elb_limits | 2 +- checkman/aws_rds_limits | 2 +- checkman/aws_s3_limits | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checkman/aws_ebs_limits b/checkman/aws_ebs_limits index 4c91e1a..3ebd059 100644 --- a/checkman/aws_ebs_limits +++ b/checkman/aws_ebs_limits @@ -28,4 +28,4 @@ description: possibly configured restriction to names or tags. inventory: - One service per bucket will be created. + One service will be created. diff --git a/checkman/aws_ec2_limits b/checkman/aws_ec2_limits index ca58c89..72f441a 100644 --- a/checkman/aws_ec2_limits +++ b/checkman/aws_ec2_limits @@ -41,4 +41,4 @@ description: additionally fetched. inventory: - One service per bucket will be created. + One service will be created. diff --git a/checkman/aws_elb_limits b/checkman/aws_elb_limits index 3b3ad88..500b1c0 100644 --- a/checkman/aws_elb_limits +++ b/checkman/aws_elb_limits @@ -21,4 +21,4 @@ description: possibly configured restriction to names or tags. inventory: - One service per bucket will be created. + One service will be created. diff --git a/checkman/aws_rds_limits b/checkman/aws_rds_limits index af58481..7418d02 100644 --- a/checkman/aws_rds_limits +++ b/checkman/aws_rds_limits @@ -37,4 +37,4 @@ description: additionally fetched. inventory: - One service per bucket will be created. + One service will be created. diff --git a/checkman/aws_s3_limits b/checkman/aws_s3_limits index 2e17390..34419f4 100644 --- a/checkman/aws_s3_limits +++ b/checkman/aws_s3_limits @@ -16,4 +16,4 @@ description: possibly configured restriction to names or tags. inventory: - One service per bucket will be created. + One service will be created.

5 years, 6 months

GUI CSS: Deployed view styles for availability tables (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: c2c67ec3a202fb6c89a096261b9643709af30f3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2c67ec3a202fb… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Apr 8 12:39:23 2019 +0200 GUI CSS: Deployed view styles for availability tables (CMK-1171) Change-Id: I34392e7220c61d634333985ddeeecd779f3e53bf --- web/htdocs/themes/facelift/images/ooservice.png | Bin 0 -> 102 bytes web/htdocs/themes/facelift/scss/_main.scss | 14 - web/htdocs/themes/facelift/scss/_views.scss | 591 ++++++++++++------------ 3 files changed, 307 insertions(+), 298 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2c67ec3a2…

5 years, 6 months

Show effective labels of hosts / service on WATO "Parameters of X" page

by Lars Michelsen

Module: check_mk Branch: master Commit: e7ce93b73b76a9fc61623a343bcc7a2ab69a8dc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7ce93b73b76a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 7 20:52:14 2019 +0200 Show effective labels of hosts / service on WATO "Parameters of X" page The page is used to show effective settings of the hosts and services, most of them are based on ruleset configurations, but the pages are not limited to this. The page now also shows the effective labels for hosts and services of all three possible sources (explicit host attribute, ruleset, discovered). Change-Id: I5d5e181b78a0c80b6e24a808504dbf7f684aa873 --- cmk/gui/wato/pages/object_parameters.py | 36 ++++++++++++++++-- cmk_base/automations/check_mk.py | 51 +++++++++++++++++++++++-- tests/unit/cmk_base/test_unit_automations.py | 56 ++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 8 deletions(-) diff --git a/cmk/gui/wato/pages/object_parameters.py b/cmk/gui/wato/pages/object_parameters.py index e27e4aa..de8252d 100644 --- a/cmk/gui/wato/pages/object_parameters.py +++ b/cmk/gui/wato/pages/object_parameters.py @@ -32,6 +32,7 @@ import cmk import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.forms as forms +import cmk.gui.view_utils from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.exceptions import MKUserError @@ -109,10 +110,11 @@ class ModeObjectParameters(WatoMode): all_rulesets = watolib.AllRulesets() all_rulesets.load() - # For services we make a special handling the for origin and parameters - # of that service! + # Object type specific detail information if self._service: - self._show_service_rules(all_rulesets) + self._show_service_info(all_rulesets) + else: + self._show_host_info() last_maingroup = None for groupname in sorted(rulespec_group_registry.get_host_rulespec_group_names()): @@ -137,7 +139,16 @@ class ModeObjectParameters(WatoMode): forms.end() - def _show_service_rules(self, all_rulesets): + def _show_host_info(self): + host_info = watolib.check_mk_automation(self._host.site_id(), "analyse-host", + [self._hostname]) + if not host_info: + return + + forms.header(_("Host information"), isopen=True, narrow=True, css="rulesettings") + self._show_labels(host_info["labels"], "host") + + def _show_service_info(self, all_rulesets): serviceinfo = watolib.check_mk_automation(self._host.site_id(), "analyse-service", [self._hostname, self._service]) if not serviceinfo: @@ -261,6 +272,23 @@ class ModeObjectParameters(WatoMode): html.close_tr() html.close_table() + self._show_labels(serviceinfo.get("labels", []), "service") + + def _show_labels(self, labels, object_type): + forms.section(_("Effective labels")) + html.open_table(class_="setting") + html.open_tr() + + html.open_td(class_="reason") + html.i(_("Explicit, ruleset, discovered")) + html.close_td() + html.open_td(class_=["settingvalue", "used"]) + html.write(cmk.gui.view_utils.render_labels(labels, object_type, with_links=False)) + html.close_td() + + html.close_tr() + html.close_table() + def _render_rule_reason(self, title, title_url, reason, reason_url, is_default, setting): if title_url: title = html.render_a(title, href=title_url) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 2d13555..7520a73 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -569,15 +569,21 @@ class AutomationAnalyseServices(Automation): needs_config = True needs_checks = True # TODO: Can we change this? + def execute(self, args): + config_cache = config.get_config_cache() + hostname = args[0] + servicedesc = args[1].decode("utf-8") + + service_info = self._get_service_info(config_cache, hostname, servicedesc) + service_info["labels"] = config_cache.labels_of_service(hostname, servicedesc) + return service_info + # Determine the type of the check, and how the parameters are being # constructed # TODO: Refactor this huge function # TODO: Was ist mit Clustern??? # TODO: Klappt das mit automatischen verschatten von SNMP-Checks (bei dual Monitoring) - def execute(self, args): - config_cache = config.get_config_cache() - hostname = args[0] - servicedesc = args[1].decode("utf-8") + def _get_service_info(self, config_cache, hostname, servicedesc): check_api_utils.set_hostname(hostname) # We just consider types of checks that are managed via WATO. @@ -703,6 +709,20 @@ class AutomationAnalyseServices(Automation): automations.register(AutomationAnalyseServices()) +class AutomationAnalyseHost(Automation): + cmd = "analyse-host" + needs_config = True + needs_checks = False + + def execute(self, args): + host_name = args[0] + config_cache = config.get_config_cache() + return {"labels": config_cache.get_host_config(host_name).labels} + + +automations.register(AutomationAnalyseHost()) + + class AutomationDeleteHosts(Automation): cmd = "delete-hosts" needs_config = True @@ -1497,3 +1517,26 @@ class AutomationGetServiceConfigurations(Automation): automations.register(AutomationGetServiceConfigurations()) + + +class AutomationGetLabelsOf(Automation): + cmd = "get-labels-of" + needs_config = True + needs_checks = False + + def execute(self, args): + object_type, host_name = args[:2] + + config_cache = config.get_config_cache() + + if object_type == "host": + return {"labels": config_cache.get_host_config(host_name).labels} + + if object_type == "service": + service_description = args[2].decode("utf-8") + return {"labels": config_cache.labels_of_service(host_name, service_description)} + + raise NotImplementedError() + + +automations.register(AutomationGetLabelsOf()) diff --git a/tests/unit/cmk_base/test_unit_automations.py b/tests/unit/cmk_base/test_unit_automations.py index 1a6ca0f..1789606 100644 --- a/tests/unit/cmk_base/test_unit_automations.py +++ b/tests/unit/cmk_base/test_unit_automations.py @@ -28,3 +28,59 @@ def test_static_check_rules_of_host(monkeypatch): 'param1': 1 }), ] + + +def test_get_labels_of_host(monkeypatch): + automation = automations.AutomationGetLabelsOf() + + monkeypatch.setattr(config, "all_hosts", ["test-host"]) + monkeypatch.setattr(config, "host_paths", {"test-host": "/"}) + monkeypatch.setattr(config, "host_labels", { + "test-host": { + "explicit": "ding", + }, + }) + config.get_config_cache().initialize() + + assert automation.execute(["host", "test-host"]) == {"labels": {"explicit": "ding"}} + + +def test_get_labels_of_service(monkeypatch): + automation = automations.AutomationGetLabelsOf() + + monkeypatch.setattr(config, "all_hosts", ["test-host"]) + monkeypatch.setattr(config, "host_paths", {"test-host": "/"}) + + ruleset = [ + ({ + "label1": "val1" + }, [], config.ALL_HOSTS, ["CPU load$"], {}), + ({ + "label2": "val2" + }, [], config.ALL_HOSTS, ["CPU load$"], {}), + ] + monkeypatch.setattr(config, "service_label_rules", ruleset) + + config.get_config_cache().initialize() + + assert automation.execute(["service", "test-host", "CPU load"]) == { + "labels": { + "label1": "val1", + "label2": "val2" + } + } + + +def test_analyse_host(monkeypatch): + automation = automations.AutomationAnalyseHost() + + monkeypatch.setattr(config, "all_hosts", ["test-host"]) + monkeypatch.setattr(config, "host_paths", {"test-host": "/"}) + monkeypatch.setattr(config, "host_labels", { + "test-host": { + "explicit": "ding", + }, + }) + config.get_config_cache().initialize() + + assert automation.execute(["test-host"]) == {"labels": {"explicit": "ding"}}

5 years, 6 months

Add tests for piggyback data processing

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f02a2bdad1621be2f19fa88049d26d05ecac9f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f02a2bdad1621… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 11:55:18 2019 +0200 Add tests for piggyback data processing CMK-1944 Change-Id: Iea2fe2f012c73cfafdca0efc392699f3f8734c51 --- cmk/utils/paths.py | 4 +- cmk_base/piggyback.py | 24 ++++---- tests/conftest.py | 4 ++ tests/unit/cmk_base/test_piggyback.py | 111 ++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1f02a2bdad…

5 years, 6 months

DCD: Improve removal of vanished piggyback hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 866210246d31180947ccb753ccb1ad92d89cad2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866210246d3118… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 12:54:37 2019 +0200 DCD: Improve removal of vanished piggyback hosts The DCD now uses the piggyback data processing logic of Check_MK base to invalidate outdated piggyback data. This makes the DCD able to remove vanished piggyback hosts as soon as they are not relevant anymore for Check_MK base. CMK-1944 Change-Id: Ic7acca696fd80c2933a0e712178abb73bd756069 --- cmk_base/piggyback.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 48b7feb..5379c82 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -47,8 +47,8 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): return [] piggyback_data = [] - for source_host, piggyback_file_path in _get_piggyback_files(piggyback_max_cachefile_age, - hostname): + for source_host, piggyback_file_path in get_piggyback_files(piggyback_max_cachefile_age, + hostname): try: raw_data = file(piggyback_file_path).read() except IOError as e: @@ -62,14 +62,14 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): def has_piggyback_raw_data(piggyback_max_cachefile_age, hostname): - return _get_piggyback_files(piggyback_max_cachefile_age, hostname) != [] + return get_piggyback_files(piggyback_max_cachefile_age, hostname) != [] -def _get_piggyback_files(piggyback_max_cachefile_age, hostname): +def get_piggyback_files(piggyback_max_cachefile_age, hostname): """Gather a list of piggyback files to read for further processing. Please note that there may be multiple parallel calls executing the - _get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() + get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() functions. Therefor all these functions needs to deal with suddenly vanishing or updated files/directories. """ @@ -215,7 +215,7 @@ def cleanup_piggyback_files(piggyback_max_cachefile_age): # Cleanup empty backed host directories below "piggyback" Please note that there may be multiple parallel calls executing the - _get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() + get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() functions. Therefor all these functions needs to deal with suddenly vanishing or updated files/directories. """ @@ -245,7 +245,7 @@ def _cleanup_old_source_status_files(piggyback_max_cachefile_age): def _cleanup_old_piggybacked_files(piggyback_max_cachefile_age): """Remove piggyback data that is not needed anymore - The monitoring (_get_piggyback_files()) is already skipping these files, + The monitoring (get_piggyback_files()) is already skipping these files, but we need some cleanup mechanism. - Remove all piggyback files created by sources without status file

5 years, 6 months

storeonce_servicesets: minor cleanup

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9d0ded6973c50e0ac54da07835208efd50e841c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0ded6973c50e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 8 15:39:09 2019 +0200 storeonce_servicesets: minor cleanup Change-Id: Ica1c25d45ce85a47f7df5c0dbfdc2a07e9ad7e03 --- checks/storeonce_servicesets | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index 9d4ca2c..c54f242 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -71,9 +71,13 @@ # combinedUserBytes 265622218292968 +def _get_item(data): + return data["ServiceSet ID"] + + def inventory_storeonce_servicesets(parsed): for values in parsed.itervalues(): - yield (values["ServiceSet ID"], {}) + yield _get_item(values), {} def check_storeonce_servicesets(item, params, parsed): @@ -109,20 +113,14 @@ check_info['storeonce_servicesets'] = { } -def inventory_storeonce_servicesets_capacity(parsed): - for values in parsed.itervalues(): - yield (values["ServiceSet ID"], {}) - - def check_storeonce_servicesets_capacity(item, params, parsed): for values in parsed.itervalues(): - if not item == values["ServiceSet ID"]: - continue - yield check_storeonce_space(item, params, values) + if _get_item(values) == item: + return check_storeonce_space(item, params, values) check_info['storeonce_servicesets.capacity'] = { - 'inventory_function': inventory_storeonce_servicesets_capacity, + 'inventory_function': inventory_storeonce_servicesets, 'check_function': check_storeonce_servicesets_capacity, 'service_description': "ServiceSet %s Capacity", 'has_perfdata': True,

5 years, 6 months

storeonce_stores: minor cleanup

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4b6a20848316cc62f9f247bde9aeecae7b3788fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b6a20848316cc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 8 15:28:12 2019 +0200 storeonce_stores: minor cleanup Change-Id: I34e1838ccf4d4897913e6ea9c54b6d2b466c112d --- checks/storeonce_stores | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/checks/storeonce_stores b/checks/storeonce_stores index 1d7ba1d..e1ab132 100644 --- a/checks/storeonce_stores +++ b/checks/storeonce_stores @@ -75,32 +75,33 @@ # numTeamMembers 0 +def _get_item(data): + return "ServiceSet %s Store %s" % (data["ServiceSet ID"], data["Name"]) + + def inventory_storeonce_stores(parsed): for values in parsed.itervalues(): - yield ("ServiceSet %s Store %s" % \ - (values["ServiceSet ID"], values["Name"]), \ - {}) + yield _get_item(values), {} -def check_storeonce_stores(item, params, parsed): +def check_storeonce_stores(item, _no_params, parsed): for values in parsed.itervalues(): - item_name = "ServiceSet %s Store %s" % \ - (values["ServiceSet ID"], values["Name"]) - if not item == item_name: + if _get_item(values) != item: continue state = translate_storeonce_status(values["Health Level"]) + yield state, "Status: %s" % values["Status"] + size = float(values["diskBytes"]) - yield state, "Status: %s, Size: %s" % \ - (values["Status"], get_bytes_human_readable(size)), \ - [ ("data_size", size) ] + yield 0, "Size: %s" % get_bytes_human_readable(size), [("data_size", size)] if "Dedupe Ratio" in values: dedup = float(values["Dedupe Ratio"]) - yield 0, "Dedup ratio: %.2f" % dedup, \ - [ ( "dedup_rate", dedup) ] - if not values["Description"] == "": - yield 0, "Description: %s" % values["Description"] + yield 0, "Dedup ratio: %.2f" % dedup, [("dedup_rate", dedup)] + + description = values.get("Description") + if description: + yield 0, "Description: %s" % description check_info['storeonce_stores'] = {

5 years, 6 months

← Newer
1
...
34
35
36
37
38
39
40
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019