Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Changes for "all sites" are only added to the currently configured replication sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 35d1536e84aebf2513cd1c2d344b102a0762f13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35d1536e84aebf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 08:13:18 2016 +0100 Changes for "all sites" are only added to the currently configured replication sites Change-Id: I1340e7dbd5b3262a80152b481cffbc8750fe49ce --- web/htdocs/watolib.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 52a7239..cd0cff9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -229,9 +229,9 @@ def add_change(action_name, text, obj=None, add_user=True, need_sync=None, need_ # pylint: disable=undefined-variable need_to_bake_agents() - # All sites in case no specific site is given + # All replication sites in case no specific site is given if sites == None: - sites = config.sitenames() + sites = ActivateChanges().activation_site_ids() change_id = gen_id() @@ -3863,11 +3863,17 @@ class ActivateChanges(object): return self._repstatus.get(site_id, {}).get("changes", []) - # Returns the list of sites that should be shown on activation page + # Returns the list of sites that are affected by WATO changes. + # these sites are shown on activation page and get change entries + # added during WATO changes. def _activation_sites(self): return [ (site_id, site) for site_id, site in config.configured_sites() - if config.site_is_local(site_id) - or site.get("replication") ] + if config.site_is_local(site_id) + or site.get("replication") ] + + + def activation_site_ids(self): + return [ s[0] for s in self._activation_sites() ] # Returns the list of sites that should be used when activating all @@ -3953,7 +3959,7 @@ class ActivateChanges(object): def _affects_all_sites(self, change): - return len(change["affected_sites"]) == len(config.sitenames()) + return not set(change["affected_sites"]).symmetric_difference(set(self.activation_site_ids())) def update_activation_time(self, site_id, ty, duration):

7 years, 9 months

Added missing space before password help text

by Mathias Kettner

Module: check_mk Branch: master Commit: c72b7c43145cde7e1b7833a3e25816a9e5b85a5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c72b7c43145cde… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 06:58:31 2016 +0100 Added missing space before password help text Change-Id: I0fd37c80bec45143ff2bc7e2c18217feec5aed8b --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e3c3223..8657d60 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3733,7 +3733,7 @@ class Password(TextAscii): html.password_input(varprefix, str(value), **kwargs) if self._is_stored_plain: - html.write("%s" % _("Please note that this password is stored in plain " + html.write(" %s" % _("Please note that this password is stored in plain " "text."))

7 years, 9 months

Better styling of SNMP credentials

by Mathias Kettner

Module: check_mk Branch: master Commit: ca4f7567ebc7fa7b687ee04142c23e0ee08b1e25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca4f7567ebc7fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 06:58:19 2016 +0100 Better styling of SNMP credentials Change-Id: I69a0fd773a14d77aa9f74978f2b329bd57e1adba --- web/plugins/wato/builtin_attributes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index c66c9d4..338f515 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -173,6 +173,7 @@ class SNMPCredentials(Alternative): kwargs.setdefault("title", _("SNMPv3 credentials")) else: kwargs.setdefault("title", _("SNMP credentials")) + kwargs["orientation"] = "vertical" Alternative.__init__(self, **kwargs) declare_host_attribute(

7 years, 9 months

Fix vertical layout of Alternative() ValueSpec

by Mathias Kettner

Module: check_mk Branch: master Commit: 870e2a5fe00b71e9cc343c03f8880ec12e047b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870e2a5fe00b71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 06:57:31 2016 +0100 Fix vertical layout of Alternative() ValueSpec Change-Id: I31101cb15f7a316c83ebc5328d8840674219b10f --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f260c4e..e3c3223 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3018,7 +3018,7 @@ class Alternative(ValueSpec): html.write("<table><tr><td>") html.select(varprefix + "_use", options, sel_option, onchange) if self._orientation == "vertical": - html.write(" ") + html.write(" ") for nr, vs in enumerate(self._elements): if str(nr) == sel_option:

7 years, 9 months

4218 FIX Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression)

by Lars Michelsen

Module: check_mk Branch: master Commit: 55df84ebf6543bf0444c7324c2dffb6f3ad1b745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55df84ebf6543b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:54:59 2016 +0100 4218 FIX Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) Change-Id: I05fb47bd22d28b001d16bf02e9209f69a70ab03a --- .werks/4218 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 10 ++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/4218 b/.werks/4218 new file mode 100644 index 0000000..d4070d7 --- /dev/null +++ b/.werks/4218 @@ -0,0 +1,9 @@ +Title: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482335663 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 354153c..2bee0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 4217 WATO rules can now be moved via drag&drop... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" + * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2951568..eb1dac4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9323,11 +9323,13 @@ def mode_edit_site(phase): # affecting all domains add_change("edit-sites", msg, sites=[id], domains=ConfigDomain.enabled_domains()) + # In case a site is not being replicated anymore, confirm all changes for this site! + if not repl: + clear_site_replication_status(id) + if id != config.omd_site(): - # On central site issue a change only for the GUI - # NOTE: Was marking all to be restarted (ec and core) before, but I don't - # think that this was really needed. - add_change("edit-sites", msg, sites=[id], domains=[ConfigDomainGUI]) + # On central site issue a change only affecting the GUI + add_change("edit-sites", msg, sites=[config.omd_site()], domains=[ConfigDomainGUI]) return "sites"

7 years, 9 months

Tests: Now do not use the system apache at all; For testing the proxy setup we should create dedicated tests

by Lars Michelsen

Module: check_mk Branch: master Commit: d0ce8b68ebbbfbf6a99ac1fedc84bed1890839b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0ce8b68ebbbfb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:39:14 2016 +0100 Tests: Now do not use the system apache at all; For testing the proxy setup we should create dedicated tests Change-Id: I58a6d93db10ad9d02ce6a7d2bce813e4b3f8ae89 --- tests/testlib/__init__.py | 8 ++------ tests/web/test_crawl.py | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d213fea..17ce733 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -434,14 +434,10 @@ class Site(object): class WebSession(requests.Session): def __init__(self): self.transids = [] - # Resources are + # Resources are only fetched and verified once per session self.verified_resources = set() - self.via_system_apache = True - super(WebSession, self).__init__() - - - def dont_use_system_apache(self): self.via_system_apache = False + super(WebSession, self).__init__() def check_redirect(self, path, proto="http", expected_code=302, expected_target=None): diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 6c10fd6..9fc2aa3 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -57,7 +57,6 @@ class Worker(threading.Thread): self.idle = True self.client = CMKWebSession(self.crawler.site) - self.client.dont_use_system_apache() self.client.login() self.client.set_language("en")

7 years, 9 months

Improved error handling of failed drag updates

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d6cd663becbddedffbb761d7cff74b99f522d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d6cd663becbdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:07:10 2016 +0100 Improved error handling of failed drag updates Change-Id: I672ee36bf434d70d9477d9427fbc2304cca12272 --- web/htdocs/js/checkmk.js | 13 +++++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 14 insertions(+) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 88e137f..15e8513 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1825,9 +1825,22 @@ function finalize_dragging() var url = g_dragging.base_url + "&_index="+encodeURIComponent(index); call_ajax(url, { method : "GET", + response_handler : handle_finalize_dragging, + error_handler : handle_finalize_dragging_error, + plain_error : true }); } +function handle_finalize_dragging(handler_data, response_text) { + if (response_text != "") + alert("Failed to persist drag result: " + response_text); +} + +function handle_finalize_dragging_error(handler_data, status_code, error_msg) { + if (status_code != 0) + alert("Failed to persist drag result: (" + status_code + "): " + error_msg); +} + // TODO: Only register when needed? add_event_handler('mousemove', function(event) { return element_dragging(event); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2951568..dc49052 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12289,6 +12289,7 @@ class ModeEditRuleset(WatoMode): ruleset.move_rule_to_top(rule) elif action == "move_to": ruleset.move_rule_to(rule, int(html.var("_index"))) + return "" else: ruleset.move_rule_to_bottom(rule)

7 years, 9 months

Implemented element dragger in rule lists

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c9556a35a0f810dbaee38d3d43d626ec595588c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c9556a35a0f81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 09:35:33 2016 +0100 Implemented element dragger in rule lists The new generic GUI element can currently drag rows of data tables. The user can move the rows around and release it again. Upon release, the javascript code informs the backend about this change using an ajax call. Change-Id: I9e8ce7ea4d329eb1865d8dbf175b3badbe6e8d70 --- web/htdocs/htmllib.py | 15 ++++ web/htdocs/images/icon_drag.png | Bin 0 -> 2011 bytes web/htdocs/js/checkmk.js | 171 ++++++++++++++++++++++++++++++++++++++++ web/htdocs/pages.css | 14 ++++ web/htdocs/wato.py | 29 +++---- web/htdocs/watolib.py | 24 +++++- 6 files changed, 232 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6c9556a35a…

7 years, 9 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 953be48061e17433b9d8f577aa5cf8859f090de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953be48061e174… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:29:22 2016 +0100 Reserved 20 Werk IDS Change-Id: I1ae820b54b398cd1d332e1ae63ae5354b1a2e307 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index dc2f5ce..b437f2c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4217 +4237

7 years, 9 months

For simplicity/testing of element dragger: Do not use ajax call, instead reload the page

by Lars Michelsen

Module: check_mk Branch: master Commit: 473da023d29982cad722c77dbe81cd9761cecc33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473da023d29982… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:11:05 2016 +0100 For simplicity/testing of element dragger: Do not use ajax call, instead reload the page Change-Id: I3ab6a7a2b99e70c8ddeaa8cb6fdfc64cedeb2363 --- web/htdocs/js/checkmk.js | 14 ++++++++------ web/htdocs/wato.py | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 15e8513..d1d6aa6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1823,12 +1823,14 @@ function finalize_dragging() index -= 1; var url = g_dragging.base_url + "&_index="+encodeURIComponent(index); - call_ajax(url, { - method : "GET", - response_handler : handle_finalize_dragging, - error_handler : handle_finalize_dragging_error, - plain_error : true - }); + location.href = url; + + //call_ajax(url, { + // method : "GET", + // response_handler : handle_finalize_dragging, + // error_handler : handle_finalize_dragging_error, + // plain_error : true + //}); } function handle_finalize_dragging(handler_data, response_text) { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dc49052..2951568 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12289,7 +12289,6 @@ class ModeEditRuleset(WatoMode): ruleset.move_rule_to_top(rule) elif action == "move_to": ruleset.move_rule_to(rule, int(html.var("_index"))) - return "" else: ruleset.move_rule_to_bottom(rule)

7 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016