Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 58db0d7123458f04fb51fa27887989f59354fb2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58db0d7123458f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 11:44:51 2018 +0200 Stylize pseudo-class a bit more. Change-Id: I47fbf26ab34422ac3b221b2b2cad7ba529bea9e7 --- cmk/ec/history.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/ec/history.py b/cmk/ec/history.py index 316cad6..17a8dbd 100644 --- a/cmk/ec/history.py +++ b/cmk/ec/history.py @@ -72,7 +72,7 @@ class History(object): def housekeeping(self): if self._config['archive_mode'] == 'mongodb': - pass + _housekeeping_mongodb(self) else: _housekeeping_files(self) @@ -114,6 +114,10 @@ def _reload_configuration_mongodb(history, config): _update_mongodb_history_lifetime(history._settings, history._config, history._mongodb) +def _housekeeping_mongodb(history): + pass + + def _connect_mongodb(settings, mongodb): if Connection is None: raise Exception('Could not initialize MongoDB (Python-Modules are missing)')

6 years, 4 months

Moved several gloabl functions into History class.

by Sven Panne

Module: check_mk Branch: master Commit: b0486c75b1b24e4d493a197b394157c11992fe31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0486c75b1b24e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 10:52:10 2018 +0200 Moved several gloabl functions into History class. Use self as parameter object for now internally. Some renamings on the way. Change-Id: I3a6844b8e0f19b33445f275b0664756cc23507ec --- cmk/ec/actions.py | 14 +++---- cmk/ec/history.py | 123 +++++++++++++++++++++++++++++------------------------- cmk/ec/main.py | 60 +++++++++++++------------- 3 files changed, 104 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b0486c75b1…

6 years, 4 months

Removed default argument, it's more confusing than helpful.

by Sven Panne

Module: check_mk Branch: master Commit: 03c5b82606709c7ee610f0ed6dfbf1a5329860d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03c5b82606709c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 11:35:48 2018 +0200 Removed default argument, it's more confusing than helpful. Change-Id: Ibf7a2e0fc8b1583844091ebaa5787feb46ee72b7 --- cmk/ec/actions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/ec/actions.py b/cmk/ec/actions.py index 969f921..ea620ae 100644 --- a/cmk/ec/actions.py +++ b/cmk/ec/actions.py @@ -75,13 +75,13 @@ def do_event_actions(history, settings, config, logger, event_server, active_his else: logger.info("Going to execute action '%s' on event %d" % (action["title"], event["id"])) - do_event_action(history, settings, config, logger, active_history_period, table_events, action, event) + do_event_action(history, settings, config, logger, active_history_period, table_events, action, event, "") # Rule actions are currently done synchronously. Actions should # not hang for more than a couple of ms. -def do_event_action(history, settings, config, logger, active_history_period, table_events, action, event, user=""): +def do_event_action(history, settings, config, logger, active_history_period, table_events, action, event, user): if action["disabled"]: logger.info("Skipping disabled action %s." % action["id"]) return

6 years, 4 months

Add some debug output to new test

by Lars Michelsen

Module: check_mk Branch: master Commit: ce75e11ab292e7b5cb86e4773bab9ba10792a718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce75e11ab292e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 11:10:42 2018 +0200 Add some debug output to new test Change-Id: I18a615b7f9ef71a05272a388be8d019ed5725d00 --- tests/integration/core/test_active_checks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/core/test_active_checks.py b/tests/integration/core/test_active_checks.py index 0f17a7b..5bbeb84 100644 --- a/tests/integration/core/test_active_checks.py +++ b/tests/integration/core/test_active_checks.py @@ -54,6 +54,7 @@ def test_active_check_execution(test_cfg, site, web, core): site.schedule_check("test-host", u'\xc4ctive-Check', 0) result = site.live.query_row("GET services\nColumns: host_name description state plugin_output has_been_checked\nFilter: host_name = test-host\nFilter: description = Äctive-Check") + print "Result: %r" % result assert result[4] == 1 assert result[0] == "test-host" assert result[1] == u'\xc4ctive-Check'

6 years, 4 months

Fixed test_get_graph() check

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c3eabfb8f52ada574dcee0d004f53563b45f7f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c3eabfb8f52ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 11:08:51 2018 +0200 Fixed test_get_graph() check Change-Id: Ib7a3cece53a189d5225847050af959c69d843cea --- tests/integration/web/test_webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/web/test_webapi.py b/tests/integration/web/test_webapi.py index cad20c1..1674483 100644 --- a/tests/integration/web/test_webapi.py +++ b/tests/integration/web/test_webapi.py @@ -356,7 +356,7 @@ def test_get_graph(web, site): }) web.discover_services("test-host-get-graph") web.activate_changes() - web.schedule_check("test-host-get-graph", "Check_MK") + site.schedule_check("test-host-get-graph", "Check_MK", 0) # Wait for RRD file creation # Isn't this a bug that the graph is not instantly available?

6 years, 4 months

Removed print

by Simon Betz

Module: check_mk Branch: master Commit: 2cae841a408df674cf6cf9a009cbfad92eaab8c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cae841a408df6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 10:40:50 2018 +0200 Removed print Change-Id: Ica7ec118ac0ee6ae9ae9c7fcb27a4f4f74544c64 --- checks/websphere_mq_instance | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/websphere_mq_instance b/checks/websphere_mq_instance index 6c2d300..eb91199 100644 --- a/checks/websphere_mq_instance +++ b/checks/websphere_mq_instance @@ -175,7 +175,6 @@ def inventory_websphere_mq_manager(parsed): def check_websphere_mq_manager(item, params, parsed): if item in parsed["manager"]: data = parsed["manager"][item] - pprint.pprint(data) status = data["STATUS"] default = data["DEFAULT"] standby = data.get("STANDBY", "")

6 years, 4 months

6083 FIX websphere_mq_instance: Fixed crash if no standby status is reported

by Simon Betz

Module: check_mk Branch: master Commit: 5462bef7103f9aceec36c41481fa4e07458f4244 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5462bef7103f9a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 10:39:26 2018 +0200 6083 FIX websphere_mq_instance: Fixed crash if no standby status is reported Change-Id: If4bcef077b1c13d17c58528304332434ee8411d0 --- .werks/6083 | 10 ++++++++++ checks/websphere_mq_instance | 16 +++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.werks/6083 b/.werks/6083 new file mode 100644 index 0000000..a317e2a --- /dev/null +++ b/.werks/6083 @@ -0,0 +1,10 @@ +Title: websphere_mq_instance: Fixed crash if no standby status is reported +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526632737 +Class: fix + + diff --git a/checks/websphere_mq_instance b/checks/websphere_mq_instance index 5f530d6..6c2d300 100644 --- a/checks/websphere_mq_instance +++ b/checks/websphere_mq_instance @@ -175,9 +175,10 @@ def inventory_websphere_mq_manager(parsed): def check_websphere_mq_manager(item, params, parsed): if item in parsed["manager"]: data = parsed["manager"][item] + pprint.pprint(data) status = data["STATUS"] default = data["DEFAULT"] - standby = data["STANDBY"] + standby = data.get("STANDBY", "") installation_name = data.get("INSTNAME") installation_path = data.get("INSTPATH") installation_version = data.get("INSTVER") @@ -190,28 +191,29 @@ def check_websphere_mq_manager(item, params, parsed): yield get_websphere_mq_status("manager", status, params), \ 'Status: %s' % status.lower() - extra_info = "" + standby_info = standby.lower() if standby.startswith("Not"): if len(instances_modes) == 1: state = 0 - extra_info += " (standalone)" + standby_info += " (standalone)" else: state = 1 - extra_info += " (standalone but %d instances)" % len(instances_modes) + standby_info += " (standalone but %d instances)" % len(instances_modes) elif standby == "Permitted": if instances_modes in [ [ "Active", "Standby" ], [ "Standby", "Active" ] ]: state = 0 else: state = 1 - extra_info += " (Missing partner)" + standby_info += " (Missing partner)" else: state = 1 - extra_info += " (unknown)" + standby_info += " (unknown)" if "map_instance_states" in params: state = get_websphere_mq_status("standby", standby, params) - yield state, "Status: %s%s, Default: %s" % (standby.lower(), extra_info, default) + yield state, "Standby: %s" % standby_info.strip() + yield 0, "Default: %s" % data["DEFAULT"] for what, title in [ (installation_name, "Name"), (installation_path, "Path"),

6 years, 4 months

6082 FIX aix_hacmp_services: Fixed parsing data; If a subsystem is in ' inoperative' status no PID is reported

by Simon Betz

Module: check_mk Branch: master Commit: 59813d7f216b882a9208fe8905ef92439de2b401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59813d7f216b88… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 10:23:58 2018 +0200 6082 FIX aix_hacmp_services: Fixed parsing data; If a subsystem is in 'inoperative' status no PID is reported Change-Id: Ibfe0ed0788b3d58d4455e7e1bbaeef33f950e21c --- .werks/6082 | 10 ++++++++++ checks/aix_hacmp_services | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.werks/6082 b/.werks/6082 new file mode 100644 index 0000000..a09babb --- /dev/null +++ b/.werks/6082 @@ -0,0 +1,10 @@ +Title: aix_hacmp_services: Fixed parsing data; If a subsystem is in 'inoperative' status no PID is reported +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526631625 +Class: fix + + diff --git a/checks/aix_hacmp_services b/checks/aix_hacmp_services index 8379ca3..e5fdfcf 100644 --- a/checks/aix_hacmp_services +++ b/checks/aix_hacmp_services @@ -105,9 +105,7 @@ def parse_aix_hacmp_services(info): if line[0] == 'Subsystem': parsed.setdefault(subsystem_ty_name, []) else: - parsed[subsystem_ty_name].append( - (line[0], line[3]) - ) + parsed[subsystem_ty_name].append((line[0], line[-1])) return parsed

6 years, 4 months

Cleaned up naming and fixed pylint issue

by Lars Michelsen

Module: check_mk Branch: master Commit: bc6b90577b8513632b90c3a5b0b60bb09ffd89d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc6b90577b8513… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 10:16:12 2018 +0200 Cleaned up naming and fixed pylint issue Change-Id: I332262be2d5db00f8361771ba4a2c51085f93f01 --- web/plugins/webapi/webapi.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 65d0309..ee553fe 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -778,13 +778,17 @@ class APICallRules(APICallCollection): # Remove obsolete rulesets for folder_path in folders_obsolete_ruleset: folder = watolib.Folder.folder(folder_path) - new_ruleset = watolib.FolderRulesets(ruleset_name) + + folder_rulesets = watolib.FolderRulesets(ruleset_name) + # TODO: Shouldn't this call .load()? + # TODO: This add_change() call should be made by the data classes watolib.add_change("edit-ruleset", _("Deleted ruleset '%s' for '%s'") % - (new_ruleset.title(), folder.title()), + (watolib.Ruleset(ruleset_name).title(), folder.title()), sites=folder.all_site_ids()) - new_ruleset.from_config(folder, []) - new_ruleset.save() + + folder_rulesets.from_config(folder, []) + folder_rulesets.save() def _get_rulesets_info(self, request):

6 years, 4 months

6102 FIX Web API: set_ruleset call adds a config change log entry now

by Lars Michelsen

Module: check_mk Branch: master Commit: f6ea074807cb125d7eea4ba0de27d66293190658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6ea074807cb12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 08:21:27 2018 +0200 6102 FIX Web API: set_ruleset call adds a config change log entry now Change-Id: I6ab568bc92c09f6a06c0dc941cc88aa5dc2d7ced --- .werks/6102 | 11 +++++++++++ web/plugins/webapi/webapi.py | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/.werks/6102 b/.werks/6102 new file mode 100644 index 0000000..882283d --- /dev/null +++ b/.werks/6102 @@ -0,0 +1,11 @@ +Title: Web API: set_ruleset call adds a config change log entry now +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526624429 + + diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index cce2963..65d0309 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -767,6 +767,10 @@ class APICallRules(APICallCollection): folder_rulesets = watolib.FolderRulesets(folder) folder_rulesets.load() + # TODO: This add_change() call should be made by the data classes + watolib.add_change("edit-ruleset", _("Set ruleset '%s' for '%s' with %d rules") % + (new_ruleset.title(), folder.title(), len(rules)), + sites=folder.all_site_ids()) folder_rulesets.set(ruleset_name, new_ruleset) folder_rulesets.save() @@ -775,6 +779,10 @@ class APICallRules(APICallCollection): for folder_path in folders_obsolete_ruleset: folder = watolib.Folder.folder(folder_path) new_ruleset = watolib.FolderRulesets(ruleset_name) + # TODO: This add_change() call should be made by the data classes + watolib.add_change("edit-ruleset", _("Deleted ruleset '%s' for '%s'") % + (new_ruleset.title(), folder.title()), + sites=folder.all_site_ids()) new_ruleset.from_config(folder, []) new_ruleset.save()

6 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018