Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Moved multiple modes to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: e5efe352af1a724dc4c56b22942a147551293dd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5efe352af1a72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 17 09:29:54 2018 +0200 Moved multiple modes to dedicated modules Change-Id: I9a6e1e8edaf8a6e7c4f682641df40ca7bcb98367 --- cmk/gui/wato/__init__.py | 810 +------------------------------- cmk/gui/wato/pages/backup.py | 320 +++++++++++++ cmk/gui/wato/pages/main.py | 64 +++ cmk/gui/wato/pages/object_parameters.py | 372 +++++++++++++++ cmk/gui/wato/pages/read_only.py | 157 +++++++ 5 files changed, 934 insertions(+), 789 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5efe352af…

5 years, 11 months

Moved bulk import and host rename to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: b3d497a172f0dccf25aee82b2983badd1b84d61e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d497a172f0dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 21:03:15 2018 +0200 Moved bulk import and host rename to dedicated modules Change-Id: I5cc53f5241ee87054b7eaa35ebba939fbff72d5a --- cmk/gui/wato/__init__.py | 1108 +------------------------------------ cmk/gui/wato/pages/bulk_import.py | 440 +++++++++++++++ cmk/gui/wato/pages/host_rename.py | 763 +++++++++++++++++++++++++ 3 files changed, 1205 insertions(+), 1106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b3d497a172…

5 years, 11 months

generic testing: ignore __pycache__ directory

by Moritz Kiemer

Module: check_mk Branch: master Commit: f7b8281df1f620a7796a46ead75f9902d262ed82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7b8281df1f620… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 12 14:37:33 2018 +0200 generic testing: ignore __pycache__ directory Change-Id: I05eee0a2ce871437f2db8583078fc44697c1da5f --- tests/unit/checks/test_generic_datasets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/checks/test_generic_datasets.py b/tests/unit/checks/test_generic_datasets.py index 333a139..3e1f0fc 100644 --- a/tests/unit/checks/test_generic_datasets.py +++ b/tests/unit/checks/test_generic_datasets.py @@ -24,7 +24,7 @@ from importlib import import_module pytestmark = pytest.mark.checks -EXCLUDES = ('', '__init__', 'conftest') +EXCLUDES = ('', '__init__', 'conftest', '__pycache__') DATASET_DIR = os.path.join(os.path.dirname(__file__), 'generictests', 'datasets')

5 years, 11 months

Centralized background job detail url computation

by Lars Michelsen

Module: check_mk Branch: master Commit: f2ca67a691fb09cb68c51d7ab229657044578eaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2ca67a691fb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 5 18:02:54 2018 +0200 Centralized background job detail url computation Change-Id: Id390fde3b160cef8697d08d8d2b6941ad92bbe19 --- cmk/gui/gui_background_job.py | 14 +++++++++++ cmk/gui/userdb.py | 4 +++ cmk/gui/wato/__init__.py | 48 ++++++++++++++++-------------------- cmk/gui/wato/pages/bulk_discovery.py | 9 ++----- cmk/gui/wato/pages/users.py | 6 ++--- 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 1564a9b..ada2388 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -183,6 +183,20 @@ class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions): self.update_status({"acknowledged_by": user_id}) + def detail_url(self): + """Returns the URL that displays the job detail page""" + return html.makeuri_contextless([ + ("mode", "background_job_details"), + ("job_id", self.get_job_id()), + ("back_url", self._back_url()), + ], filename="wato.py") + + + def _back_url(self): + """Returns either None or the URL that the job detail page may be link back""" + return None + + @classmethod def get_concrete_subclasses(cls): # Note: Due to the strange execfile plugin mechanism, there is a risk diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 91657ab..de4ba97 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1330,6 +1330,10 @@ class UserSyncBackgroundJob(gui_background_job.GUIBackgroundJob): super(UserSyncBackgroundJob, self).__init__(self.job_prefix, **kwargs) + def _back_url(self): + return html.makeuri_contextless([("mode", "users")], filename="wato.py") + + def do_sync(self, job_interface, add_to_changelog, enforce_sync): job_interface.send_progress_update(_("Synchronization started...")) if self._execute_sync_action(job_interface, add_to_changelog, enforce_sync): diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a529deb..100f63d 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -324,6 +324,21 @@ class RenameHostsBackgroundJob(WatoBackgroundJob): raise MKGeneralException(_("Another renaming operation is currently in progress")) + def _back_url(self): + return html.makeuri([]) + + + +class RenameHostBackgroundJob(RenameHostsBackgroundJob): + def __init__(self, host, title=None): + super(RenameHostBackgroundJob, self).__init__(title) + self._host = host + + + def _back_url(self): + return self._host.folder().url() + + #. # .--Main----------------------------------------------------------------. # | __ __ _ | @@ -1861,11 +1876,7 @@ class ModeBulkRenameHost(WatoMode): html.context_button(_("Folder"), watolib.folder_preserving_link([("mode", "folder")]), "back") host_renaming_job = RenameHostsBackgroundJob() if host_renaming_job.is_available(): - html.context_button(_("Last result"), html.makeuri([ - ("mode", "background_job_details"), - ("job_id", host_renaming_job.get_job_id()), - ("back_url", html.makeuri([])), - ], filename="wato.py"), "background_job_details") + html.context_button(_("Last result"), host_renaming_job.detail_url(), "background_job_details") def action(self): @@ -1897,13 +1908,7 @@ class ModeBulkRenameHost(WatoMode): except background_job.BackgroundJobAlreadyRunning, e: raise MKGeneralException(_("Another host renaming job is already running: %s") % e) - job_id = host_renaming_job.get_job_id() - job_details_url = html.makeuri_contextless([ - ("mode", "background_job_details"), - ("job_id", job_id), - ("back_url", html.makeuri([])), - ], filename="wato.py") - html.response.http_redirect(job_details_url) + html.response.http_redirect(host_renaming_job.detail_url()) elif c == False: # not yet confirmed return "" else: @@ -2138,13 +2143,9 @@ class ModeRenameHost(WatoMode): global_buttons() html.context_button(_("Host Properties"), self._host.edit_url(), "back") - host_renaming_job = RenameHostsBackgroundJob() + host_renaming_job = RenameHostBackgroundJob(self._host) if host_renaming_job.is_available(): - html.context_button(_("Last result"), html.makeuri([ - ("mode", "background_job_details"), - ("job_id", host_renaming_job.get_job_id()), - ("back_url", html.makeuri([])), - ], filename="wato.py"), "background_job_details") + html.context_button(_("Last result"), host_renaming_job.detail_url(), "background_job_details") def action(self): @@ -2160,7 +2161,7 @@ class ModeRenameHost(WatoMode): if c: # Creating pending entry. That makes the site dirty and that will force a sync of # the config to that site before the automation is being done. - host_renaming_job = RenameHostsBackgroundJob(title=_("Renaming of %s -> %s") % (self._host.name(), newname)) + host_renaming_job = RenameHostBackgroundJob(self._host, title=_("Renaming of %s -> %s") % (self._host.name(), newname)) renamings = [(watolib.Folder.current(), self._host.name(), newname)] host_renaming_job.set_function(rename_hosts_background_job, renamings) @@ -2169,14 +2170,7 @@ class ModeRenameHost(WatoMode): except background_job.BackgroundJobAlreadyRunning, e: raise MKGeneralException(_("Another host renaming job is already running: %s") % e) - job_id = host_renaming_job.get_job_id() - - job_details_url = html.makeuri_contextless([ - ("mode", "background_job_details"), - ("job_id", job_id), - ("back_url", self._host.folder().url()), - ], filename="wato.py") - html.response.http_redirect(job_details_url) + html.response.http_redirect(host_renaming_job.detail_url()) elif c == False: # not yet confirmed return "" diff --git a/cmk/gui/wato/pages/bulk_discovery.py b/cmk/gui/wato/pages/bulk_discovery.py index 9d40a8f..9ff0949 100644 --- a/cmk/gui/wato/pages/bulk_discovery.py +++ b/cmk/gui/wato/pages/bulk_discovery.py @@ -65,13 +65,8 @@ class BulkDiscoveryBackgroundJob(WatoBackgroundJob): super(BulkDiscoveryBackgroundJob, self).__init__(self.job_prefix, **kwargs) - # TODO: Move something like this to one of the parent classes - def detail_url(self): - return html.makeuri_contextless([ - ("mode", "background_job_details"), - ("job_id", self.get_job_id()), - ("back_url", watolib.Folder.current().url()), - ], filename="wato.py") + def _back_url(self): + return watolib.Folder.current().url() def do_execute(self, mode, use_cache, do_scan, error_handling, tasks, job_interface=None): diff --git a/cmk/gui/wato/pages/users.py b/cmk/gui/wato/pages/users.py index 07b90fb..72ca9fa 100644 --- a/cmk/gui/wato/pages/users.py +++ b/cmk/gui/wato/pages/users.py @@ -85,6 +85,7 @@ class ModeUsers(WatoMode): def __init__(self): super(ModeUsers, self).__init__() + self._job = userdb.UserSyncBackgroundJob() self._job_snapshot = userdb.UserSyncBackgroundJob().get_status_snapshot() @@ -100,7 +101,7 @@ class ModeUsers(WatoMode): if userdb.sync_possible(): if not self._job_snapshot.is_running(): html.context_button(_("Sync users"), html.makeactionuri([("_sync", 1)]), "replicate") - html.context_button(_("Last sync result"), self._job_details_url(), "background_job_details") + html.context_button(_("Last sync result"), self._job.detail_url(), "background_job_details") if config.user.may("general.notify"): @@ -189,8 +190,7 @@ class ModeUsers(WatoMode): def _job_details_link(self): - job = userdb.UserSyncBackgroundJob().get_status_snapshot() - return html.render_a("%s" % job.get_title(), href=self._job_details_url()) + return html.render_a("%s" % self._job.get_title(), href=self._job.detail_url()) def _job_details_url(self):

5 years, 11 months

Moved bulk discovery mode to dedicated file

by Lars Michelsen

Module: check_mk Branch: master Commit: d933bf2b679e738b220a4a5918cece7d0db5bc5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d933bf2b679e73… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 9 19:26:31 2018 +0200 Moved bulk discovery mode to dedicated file Change-Id: Idce393814cb8724e1eb2c21d45f78583241e85e9 --- cmk/gui/wato/__init__.py | 319 +--------------------------------- cmk/gui/wato/pages/bulk_discovery.py | 321 +++++++++++++++++++++++++++++++++++ cmk/gui/watolib.py | 27 +++ 3 files changed, 351 insertions(+), 316 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d933bf2b67…

5 years, 11 months

Bulk discovery is now executed using background jobs

by Lars Michelsen

Module: check_mk Branch: master Commit: ce5981c39b6762eba56f233640c4cfc2662aa1d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce5981c39b6762… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 5 17:45:22 2018 +0200 Bulk discovery is now executed using background jobs Change-Id: I7a6f650f2c6df766eff82d828b13009a3d9434f3 --- cmk/gui/wato/pages/bulk_discovery.py | 371 ++++++++++++++++++++--------------- 1 file changed, 217 insertions(+), 154 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ce5981c39b…

5 years, 11 months

6785 FIX Fixed truncating leading new lines in text area input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 48b6e853ffede5208f5a4e9ab3c06cae96083ac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b6e853ffede5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 16:34:04 2018 +0200 6785 FIX Fixed truncating leading new lines in text area input fields When a multi line text area was used for editing a text that starts with an empty line, the leading empty line was stripped off during rendering of the dialog. This affected, for example, the body template of ASCII mail notifications. CMK-930 Change-Id: I11a991a298629731cbb584f2169a0b96556ebe93 --- .werks/6785 | 15 +++++++++++++++ cmk/gui/htmllib.py | 13 +++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.werks/6785 b/.werks/6785 new file mode 100644 index 0000000..1cb01de --- /dev/null +++ b/.werks/6785 @@ -0,0 +1,15 @@ +Title: Fixed truncating leading new lines in text area input fields +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539700301 + +When a multi line text area was used for editing a text that starts with an +empty line, the leading empty line was stripped off during rendering of the +dialog. + +This affected, for example, the body template of ASCII mail notifications. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 17fc4e5..ddc9f59 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2420,6 +2420,19 @@ class html(HTMLGenerator): attrs["cols"] = cols attrs["name"] = varname + # Fix handling of leading newlines (https://www.w3.org/TR/html5/syntax.html#element-restrictions) + # + # """ + # A single newline may be placed immediately after the start tag of pre + # and textarea elements. This does not affect the processing of the + # element. The otherwise optional newline must be included if the + # element’s contents themselves start with a newline (because otherwise + # the leading newline in the contents would be treated like the + # optional newline, and ignored). + # """ + if value and value.startswith("\n"): + value = "\n" + value + if error: self.open_x(class_="inputerror") self.write_html(self._render_content_tag("textarea", value, **attrs))

5 years, 11 months

Status data inventory is ignored for Check_MK clusters

by Simon Betz

Module: check_mk Branch: master Commit: 26678569925e26edcd3d9abb4e2d9028822548f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26678569925e26… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 16 16:24:22 2018 +0200 Status data inventory is ignored for Check_MK clusters Change-Id: Ib351b9a639c49d04e4beb1f701ac21d4628c38f1 --- .werks/6736 | 16 ++++++++++++++++ cmk_base/inventory.py | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/6736 b/.werks/6736 new file mode 100644 index 0000000..6d2493c --- /dev/null +++ b/.werks/6736 @@ -0,0 +1,16 @@ +Title: Status data inventory is ignored for Check_MK clusters +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538487393 + +Status data inventory is not executed for Check_MK clusters +because they do not have own data sources for which status data +inventory is reasonable. +If status data inventory should be done for the related nodes +then you enable {{Status data inventory}} wihtin the ruleset +{{Do hardware/software Inventory}} for these nodes. diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 1a70030..3ffdaca 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -152,8 +152,10 @@ def do_inv_check(hostname, options): def do_status_data_inventory(sources, multi_host_sections, hostname, ipaddress): - import cmk_base.inventory_plugins as inventory_plugins + if config.is_cluster(hostname): + return # cmk_base/modes/check_mk.py loads check plugins but not inventory plugins + import cmk_base.inventory_plugins as inventory_plugins do_inv = False section_names = multi_host_sections.get_host_sections().get((hostname, ipaddress)).sections.keys() inventory_plugins.load_plugins(check_api.get_check_api_context, get_inventory_context) @@ -337,6 +339,7 @@ def _save_inventory_tree(hostname, inventory_tree): filepath = _inventory_output_dir + "/" + hostname if inventory_tree: old_tree = StructuredDataTree().load_from(filepath) + old_tree.normalize_nodes() if old_tree.is_equal(inventory_tree): console.verbose("Inventory was unchanged\n") else:

5 years, 11 months

Moved user modes to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: 1502d3279d967cc37e30edb448a557863cc0f924 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1502d3279d967c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 15 19:48:06 2018 +0200 Moved user modes to dedicated modules Change-Id: Icd8d46bd04aa6dca1328812920ae12143034ebfc --- cmk/gui/wato/__init__.py | 928 +---------------------------------------- cmk/gui/wato/pages/users.py | 982 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 987 insertions(+), 923 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1502d3279d…

5 years, 11 months

Moved notification modes and user profile page to dedicated modules

by Lars Michelsen

Module: check_mk Branch: master Commit: cb9fc63ef5000c8567c66de94891818e76d0f318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb9fc63ef5000c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 16 13:33:21 2018 +0200 Moved notification modes and user profile page to dedicated modules Change-Id: I61b4aa2a7a81a3c112452eb56776976deb5572e4 --- cmk/gui/notifications.py | 4 +- cmk/gui/wato/__init__.py | 1817 +---------------------------------- cmk/gui/wato/pages/notifications.py | 1291 +++++++++++++++++++++++++ cmk/gui/wato/user_profile.py | 373 +++++++ cmk/gui/watolib.py | 232 +++++ 5 files changed, 1906 insertions(+), 1811 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb9fc63ef5…

5 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018