Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Small cleanup in helper config creation code

by Lars Michelsen

Module: check_mk Branch: master Commit: f3552180a888e12c95a3d0d8a7de30e4918cf750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3552180a888e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 12:00:47 2016 +0100 Small cleanup in helper config creation code --- modules/check_mk.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0f157fd..38e60e0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2435,15 +2435,11 @@ def pack_config(): except: return False - # TODO: Write using cmk.store. - filepath = cmk.paths.var_dir + "/core/helper_config.mk" - out = file(filepath + ".new", "w") - out.write("#!/usr/bin/python\n" - "# encoding: utf-8\n" - "# Created by Check_MK. Dump of the currently active configuration\n\n") - - - + helper_config = ( + "#!/usr/bin/python\n" + "# encoding: utf-8\n" + "# Created by Check_MK. Dump of the currently active configuration\n\n" + ) # These functions purpose is to filter out hosts which are monitored on different sites active_hosts = all_active_hosts() @@ -2486,22 +2482,23 @@ def pack_config(): if packable(varname, val): if varname in filter_var_functions: val = filter_var_functions[varname](val) - out.write("\n%s = %r\n" % (varname, val)) + helper_config += "\n%s = %r\n" % (varname, val) for varname, _unused_factory_setting in factory_settings.items(): if varname in globals(): - out.write("\n%s = %r\n" % (varname, globals()[varname])) + helper_config += "\n%s = %r\n" % (varname, globals()[varname]) else: # remove explicit setting from previous packed config! - out.write("\nif %r in globals():\n del %s\n" % (varname, varname)) + helper_config += "\nif %r in globals():\n del %s\n" % (varname, varname) - out.close() + + filepath = cmk.paths.var_dir + "/core/helper_config.mk" import marshal - code = compile(open(filepath + ".new").read(), '<string>', 'exec') - marshal.dump(code, open(filepath + ".compiled", "wb")) + code = compile(helper_config, '<string>', 'exec') + with open(filepath + ".compiled", "w") as compiled_file: + marshal.dump(code, compiled_file) + os.rename(filepath + ".compiled", filepath) - # Remove the configs readable version - os.unlink(filepath + ".new") def read_packed_config():

7 years, 10 months

3981 FIX Views: Fixed context button displaying depending on usage

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d2a317bd21f5dd9d357b1c431d3d9aadd8441ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d2a317bd21f5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 12:13:28 2016 +0100 3981 FIX Views: Fixed context button displaying depending on usage --- .werks/3981 | 9 +++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3981 b/.werks/3981 new file mode 100644 index 0000000..81b7eb6 --- /dev/null +++ b/.werks/3981 @@ -0,0 +1,9 @@ +Title: Views: Fixed context button displaying depending on usage +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1478689988 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d7d4c33..ff5aa66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 4046 FIX: Repaired html rendering.... * 3938 FIX: tactical overview: fixed wrong display of number of host/service problems... * 3980 FIX: Fixed possible flickering GUI when using Chrome and zooming the page + * 3981 FIX: Views: Fixed context button displaying depending on usage WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 29714d2..758df70 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1112,7 +1112,7 @@ class HTMLCheck_MK(HTMLGenerator): weights = counts.items() weights.sort(cmp = lambda a,b: cmp(a[1], b[1])) best = dict(weights[-bestof:]) - if id not in best: + if id_ not in best: display="none" self.context_button_hidden = True

7 years, 10 months

3980 FIX Fixed possible flickering GUI when using Chrome and zooming the page

by Lars Michelsen

Module: check_mk Branch: master Commit: f1cdf3da8506eeb3c25867d9dd22f35a03542127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cdf3da8506ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 11:16:45 2016 +0100 3980 FIX Fixed possible flickering GUI when using Chrome and zooming the page --- .werks/3980 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 13 ------------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.werks/3980 b/.werks/3980 new file mode 100644 index 0000000..7e704af --- /dev/null +++ b/.werks/3980 @@ -0,0 +1,9 @@ +Title: Fixed possible flickering GUI when using Chrome and zooming the page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1478686590 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6a60199..d7d4c33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... * 3938 FIX: tactical overview: fixed wrong display of number of host/service problems... + * 3980 FIX: Fixed possible flickering GUI when using Chrome and zooming the page WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 1a612b0..3e167fc 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -410,19 +410,6 @@ function set_sidebar_size() { var oFooter = document.getElementById('side_footer'); var height = pageHeight(); - // Resize sidebar frame on Chrome (and other webkit browsers). - if (isWebkit()) { - var oldcols = parent.document.body.cols.split(","); - var oldwidth = parseInt(oldcols[0]); - var width = parent.frames[0].pageWidth(); - // Note: previously this was "var width = oHeader.clientWidth;" and worked - // fine. It stopped working - probably with new Chrome versions. We do not - // know yet if the new way also works on old Chrome versions. - var target_width = parseInt(oldwidth * sidebar_width() / width); - var newcols = target_width.toString() + ",*"; - parent.document.body.cols = newcols; - } - // Don't handle zero heights if (height == 0) return;

7 years, 10 months

Fixed user profile sync and call sync only for login+replication sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 14fa966f91b1b83db565afc75101c5b603feca61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14fa966f91b1b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 8 16:48:11 2016 +0100 Fixed user profile sync and call sync only for login+replication sites --- web/htdocs/wato.py | 23 ++++++------ web/htdocs/watolib.py | 97 +++++++++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index acc1f87..086024a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9645,6 +9645,8 @@ def automation_push_profile(): if not profile: raise MKGeneralException(_('Invalid call: The profile is missing.')) + init_wato_datastructures() + users = userdb.load_users(lock = True) profile = mk_eval(profile) users[user_id] = profile @@ -13950,8 +13952,6 @@ def user_profile_async_replication_page(): def user_profile_async_replication_dialog(): - slave_sites = wato_slave_sites() - sort_sites(slave_sites) repstatus = load_replication_status() html.message(_('In order to activate your changes available on all remote sites, your user profile needs ' @@ -13962,13 +13962,9 @@ def user_profile_async_replication_dialog(): html.h3(_('Replication States')) html.open_div(id_="profile_repl") num_replsites = 0 - for site_id, site in slave_sites: - is_local = config.site_is_local(site_id) - - if is_local or (not is_local and not site.get("replication")): - continue # Skip non replication slaves - - srs = repstatus.get(site_id, {}) + for site_id in get_login_sites(): + site = config.sites[site_id] + srs = repstatus.get(site_id, {}) if not "secret" in site: status_txt = _('Not logged in.') @@ -13983,7 +13979,7 @@ def user_profile_async_replication_dialog(): html.icon(status_txt, icon) if start_sync: - estimated_duration = srs.get("times", {}).get(ACTIVATION_TIME_PROFILE_SYNC, 2.0) + estimated_duration = ActivateChanges().get_activation_time(site_id, ACTIVATION_TIME_PROFILE_SYNC, 2.0) html.javascript('wato_do_profile_replication(\'%s\', %d, \'%s\');' % (site_id, int(estimated_duration * 1000.0), _('Replication in progress'))) num_replsites += 1 @@ -14092,9 +14088,10 @@ def page_user_profile(change_pw=False): password_changed = True - # Now, if in distributed environment, set the trigger for pushing the new - # auth information to the slave sites asynchronous - if has_wato_slave_sites(): + # Now, if in distributed environment where users can login to remote sites, + # set the trigger for pushing the new auth information to the slave sites + # asynchronous + if get_login_sites(): start_async_replication = True userdb.save_users(users) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index aa86416..7b5aedf 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3524,6 +3524,26 @@ def wato_slave_sites(): if site.get("replication") ] +# Returns a list of site ids which are WATO slave sites and users can login +def get_login_sites(): + sites = [] + for site_id, site in wato_slave_sites(): + if site.get('user_login', True) and not config.site_is_local(site_id): + sites.append(site_id) + return sites + + +# Returns a list of site ids which gets the Event Console configuration replicated +def get_event_console_sync_sites(): + sites = [] + for site_id, site in config.sites.items(): + if config.site_is_local(site_id) or site.get("replicate_ec"): + sites.append(site_id) + return sites + + + + def declare_site_attribute(): undeclare_host_attribute("site") declare_host_attribute(SiteAttribute(), show_in_table = True, show_in_folder = True) @@ -3604,24 +3624,6 @@ def update_replication_status(site_id, vars, changes=None): save_replication_status(repstatus) -# Returns a list of site ids where users can login -def get_login_sites(): - sites = [] - for site_id, site in config.sites.items(): - if site.get('user_login', True) and not config.site_is_local(site_id): - sites.append(site_id) - return sites - - -# Returns a list of site ids which gets the Event Console configuration replicated -def get_event_console_sync_sites(): - sites = [] - for site_id, site in config.sites.items(): - if config.site_is_local(site_id) or site.get("replicate_ec"): - sites.append(site_id) - return sites - - def automation_push_snapshot(): site_id = html.var("siteid") @@ -3725,7 +3727,7 @@ def push_user_profile_to_site(site, user_id, profile): return response -def synchronize_profile(site, user_id): +def synchronize_profile(site_id, site, user_id): users = userdb.load_users(lock = False) if not user_id in users: raise MKUserError(None, _('The requested user does not exist')) @@ -3733,8 +3735,7 @@ def synchronize_profile(site, user_id): start = time.time() result = push_user_profile_to_site(site, user_id, users[user_id]) duration = time.time() - start - # TODO: Auf neue Funktionen umbauen - update_replication_status(site["id"], {}, {ACTIVATION_TIME_PROFILE_SYNC: duration}) + ActivateChanges().update_activation_time(site_id, ACTIVATION_TIME_PROFILE_SYNC, duration) return result @@ -3749,9 +3750,10 @@ def ajax_profile_repl(): else: site = config.site(site_id) try: - result = synchronize_profile(site, config.user.id) + result = synchronize_profile(site_id, site, config.user.id) except Exception, e: - result = str(e) + log_exception() + result = "%s" % e if result == True: answer = "0 %s" % _("Replication completed successfully."); @@ -3908,6 +3910,29 @@ class ActivateChanges(object): return len(change["affected_sites"]) == len(config.sitenames()) + def update_activation_time(self, site_id, ty, duration): + repstatus = load_replication_status(lock=True) + try: + repstatus.setdefault(site_id, {}) + times = repstatus[site_id].setdefault("times", {}) + + if ty not in times: + times[ty] = duration + else: + times[ty] = 0.8 * times[ty] + 0.2 * duration + finally: + save_replication_status(repstatus) + + + def get_activation_times(self, site_id): + repstatus = load_replication_status() + return repstatus.get(site_id, {}).get("times", {}) + + + def get_activation_time(self, site_id, ty, deflt=None): + return self.get_activation_times(site_id).get(ty, deflt) + + class ActivateChangesManager(ActivateChanges): activation_base_dir = cmk.paths.tmp_dir + "/wato/activation" @@ -4252,7 +4277,6 @@ class ActivateChangesManager(ActivateChanges): - PHASE_INITIALIZED = "initialized" # Thread object has been initialized (not in thread yet) PHASE_STARTED = "started" # Thread just started, nothing happened yet PHASE_SYNC = "sync" # About to sync @@ -4438,7 +4462,7 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): result = self._push_snapshot_to_site() duration = time.time() - start - self._update_activation_time(ACTIVATION_TIME_SYNC, duration) + self.update_activation_time(self._site_id, ACTIVATION_TIME_SYNC, duration) # Pre 1.2.7i3 and sites return True on success and a string on error. # 1.2.7i3 and later return a list of warning messages on success. @@ -4492,7 +4516,7 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): configuration_warnings = self._call_activate_changes_automation() duration = time.time() - start - self._update_activation_time(ACTIVATION_TIME_RESTART, duration) + self.update_activation_time(self._site_id, ACTIVATION_TIME_RESTART, duration) return configuration_warnings @@ -4551,25 +4575,6 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): return sorted(list(domains)) - def _update_activation_time(self, ty, duration): - repstatus = load_replication_status(lock=True) - try: - repstatus.setdefault(self._site_id, {}) - times = repstatus[self._site_id].setdefault("times", {}) - - if ty not in times: - times[ty] = duration - else: - times[ty] = 0.8 * times[ty] + 0.2 * duration - finally: - save_replication_status(repstatus) - - - def _get_activation_times(self): - repstatus = load_replication_status() - return repstatus.get(self._site_id, {}).get("times", {}) - - def _confirm_activated_changes(self): repstatus = load_replication_status(lock=True) try: @@ -4643,7 +4648,7 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def _get_expected_duration(self): - times = self._get_activation_times() + times = self.get_activation_times(self._site_id) duration = 0.0 if self.is_sync_needed(self._site_id):

7 years, 10 months

Unlock activation controls in case of an error during activation start

by Lars Michelsen

Module: check_mk Branch: master Commit: 21e8f8ca4ed0cf793b45785914d85ba9844b8045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21e8f8ca4ed0cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 8 16:57:59 2016 +0100 Unlock activation controls in case of an error during activation start --- web/htdocs/js/wato.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index b5e3b20..bb9d945 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -607,7 +607,8 @@ function handle_start_activation(_unused, response_json) var response = JSON.parse(response_json); if (response.result_code == 1) { - show_activation_error(response.result); + show_activation_error(response.result); + lock_activation_controls(false); } else { monitor_activation_progress(response.result.activation_id); }

7 years, 10 months

Web API call activate_changes now uses new activation mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ebd529cf28aeade146c144d61d58438ffd99f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ebd529cf28aea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 8 14:58:50 2016 +0100 Web API call activate_changes now uses new activation mechanism It changes in the following way: a) There is a new (optional) argument "comment" which can be used to provide a comment for the activation b) On success a dictionary of the following format is returned: <tt>{ "result": { "sites": { "heute": { "_time_updated": 1478613478.092002, "_status_details": "Started at: 14:57:57. Finished at: 14:57:58. ...", "_phase": "done", "_status_text": "Activated", "_pid": 17700, "_state": "warning", "_time_ended": 1478613478.092002, "_expected_duration": 0.6067475385436036, "_time_started": 1478613477.463729, "_site_id": "heute", "_warnings": { "check_mk": [ "Node 'heut' of cluster 'cluster1' is not a monitored host in this site." ] } } } }, "result_code": 0 }</tt> --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 202 ++++++++++++++++++++++++------------------- web/htdocs/webapi.py | 1 + web/plugins/webapi/webapi.py | 35 ++++---- 4 files changed, 134 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7ebd529cf2…

7 years, 10 months

Tests: Changed activate changes test to work with new API

by Lars Michelsen

Module: check_mk Branch: master Commit: d381a51ec5a0e6ca69775779a2a8fbaaf1bf4c12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d381a51ec5a0e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 08:54:17 2016 +0100 Tests: Changed activate changes test to work with new API --- tests/testlib/__init__.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6f16b27..4ebcd35 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -691,20 +691,26 @@ class CMKWebSession(WebSession): assert result.startswith("Service discovery successful") - def activate_changes(self, mode=None, foreign_changes=None): + def activate_changes(self, mode=None, allow_foreign_changes=None): request = {} if mode != None: request["mode"] = mode - if foreign_changes != None: - request["foreign_changes"] = foreign_changes + if allow_foreign_changes != None: + request["allow_foreign_changes"] = "1" if allow_foreign_changes else "0" + time_started = time.time() result = self._api_request("webapi.py?action=activate_changes", { "request": json.dumps(request), }) - assert result == None + assert type(result) == dict + assert len(result["sites"]) > 0 + + for site_id, status in result["sites"].items(): + assert status["_state"] == "success" + assert status["_time_ended"] > time_started class CMKEventConsole(CMKWebSession): @@ -753,17 +759,11 @@ class CMKEventConsole(CMKWebSession): assert "%d, no commands, 127.0.0.1" % self.status_port in html - # TODO: Test via self.status whether or not the reload has happened def activate_changes(self, web): old_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") assert old_t > time.time() - 86400 - html = web.get("wato.py?mode=mkeventd_changes").text - assert "Reload Config!" in html - assert "wato.py?_activate=now" in html - - html = web.get("wato.py?_activate=now&mode=mkeventd_changes", add_transid=True).text - assert "The new configuration has successfully been activated" in html + super(CMKEventConsole, self).activate_changes(allow_foreign_changes=True) new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") assert new_t > old_t

7 years, 10 months

Splitted replication status file into one file per site

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fbf7a79465b715418ea0e2ac48d8063b9a32e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fbf7a79465b71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 08:46:50 2016 +0100 Splitted replication status file into one file per site --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 101 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 66 insertions(+), 37 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 086024a..21f50e2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8863,7 +8863,7 @@ def mode_sites(phase): if c: del configured_sites[delid] save_sites(configured_sites) - clear_replication_status(delid) + clear_site_replication_status(delid) add_change("edit-sites", _("Deleted site %s") % (delid), domains=[ConfigDomainGUI], sites=[default_site()]) return None diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7b5aedf..e8d2bd5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -128,7 +128,6 @@ sites_mk = cmk.paths.default_config_dir + "/multisite.d/sites.mk" var_dir = cmk.paths.var_dir + "/wato/" audit_log_path = var_dir + "log/audit.log" snapshot_dir = var_dir + "snapshots/" -repstatus_file = var_dir + "replication_status.mk" php_api_dir = var_dir + "php-api/" @@ -190,13 +189,13 @@ def confirm_all_local_changes(): site_id = config.omd_site() try: - repl_status = load_replication_status(lock=True) - repl_status[site_id]["changes"] = [] + repl_status = load_site_replication_status(site_id, lock=True) + repl_status["changes"] = [] except KeyError: pass # No change for this site. Fine... finally: - save_replication_status(repl_status) + save_site_replication_status(site_id, repl_status) need_sidebar_reload() @@ -3586,42 +3585,73 @@ class SiteAttribute(ValueSpecAttribute): return [] -def load_replication_status(lock=False): - return store.load_data_from_file(repstatus_file, {}, lock) +def load_site_replication_status(site_id, lock=False): + return store.load_data_from_file(site_replication_status_path(site_id), {}, lock) -def save_replication_status(repstatus): - store.save_data_to_file(repstatus_file, repstatus) +def save_site_replication_status(site_id, repl_status): + store.save_data_to_file(site_replication_status_path(site_id), repl_status) + cleanup_legacy_replication_status() -def clear_replication_status(site_id): - repstatus = load_replication_status(lock=True) +# This can be removed one day. It is only meant for cleaning up the pre 1.4.0 +# global replication status file. +def cleanup_legacy_replication_status(): + try: + os.unlink(var_dir + "replication_status.mk") + except OSError, e: + if e.errno == 2: + pass # Not existant -> OK + else: + raise + +def clear_site_replication_status(site_id): try: - del repstatus[site_id] - except KeyError: - pass + os.unlink(site_replication_status_path(site_id)) + except OSError, e: + if e.errno == 2: + pass # Not existant -> OK + else: + raise + + +def site_replication_status_path(site_id): + return "%s/replication_status_%s.mk" % (var_dir, site_id) + + +def load_replication_status(lock=False): + status = {} + + for site_id in config.sites.keys(): + status[site_id] = load_site_replication_status(site_id, lock=lock) + + return status + + +def save_replication_status(status): + status = {} - save_replication_status(repstatus) + for site_id, repl_status in config.sites.items(): + save_site_replication_status(site_id, repl_status) # Updates one or more dict elements of a site in an atomic way. def update_replication_status(site_id, vars, changes=None): make_nagios_directory(var_dir) - repstatus = load_replication_status(lock=True) + repl_status = load_site_replication_status(site_id, lock=True) try: - repstatus.setdefault(site_id, {}) - repstatus[site_id].setdefault("times", {}) - repstatus[site_id].setdefault("changes", []) + repl_status.setdefault("times", {}) + repl_status.setdefault("changes", []) - repstatus[site_id].update(vars) + repl_status.update(vars) # Optionally add new pending change entries if changes: - repstatus[site_id]["changes"] += changes + repl_status["changes"] += changes finally: - save_replication_status(repstatus) + save_site_replication_status(site_id, repl_status) def automation_push_snapshot(): @@ -3911,22 +3941,21 @@ class ActivateChanges(object): def update_activation_time(self, site_id, ty, duration): - repstatus = load_replication_status(lock=True) + repl_status = load_site_replication_status(site_id, lock=True) try: - repstatus.setdefault(site_id, {}) - times = repstatus[site_id].setdefault("times", {}) + times = repl_status.setdefault("times", {}) if ty not in times: times[ty] = duration else: times[ty] = 0.8 * times[ty] + 0.2 * duration finally: - save_replication_status(repstatus) + save_site_replication_status(site_id, repl_status) def get_activation_times(self, site_id): - repstatus = load_replication_status() - return repstatus.get(site_id, {}).get("times", {}) + repl_status = load_site_replication_status(site_id) + return repl_status.get("times", {}) def get_activation_time(self, site_id, ty, deflt=None): @@ -4404,9 +4433,9 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def _lock_activation(self): # This locks the global replication status file - repstatus = load_replication_status(lock=True) + repl_status = load_site_replication_status(self._site_id, lock=True) try: - if self._is_currently_activating(repstatus.get(self._site_id, {})): + if self._is_currently_activating(repl_status): raise MKGeneralException(_("The site is currently locked by another activation process. Please try again later")) # This is needed to detect stale activation progress entries @@ -4576,21 +4605,21 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def _confirm_activated_changes(self): - repstatus = load_replication_status(lock=True) + repl_status = load_site_replication_status(self._site_id, lock=True) try: - changes = repstatus[self._site_id].get("changes", []) - repstatus[self._site_id]["changes"] = changes[len(self._site_changes):] + changes = repl_status.get("changes", []) + repl_status["changes"] = changes[len(self._site_changes):] finally: - save_replication_status(repstatus) + save_site_replication_status(self._site_id, repl_status) def _confirm_synchronized_changes(self): - repstatus = load_replication_status(lock=True) + repl_status = load_site_replication_status(self._site_id, lock=True) try: - for change in repstatus[self._site_id].get("changes", []): + for change in repl_status.get("changes", []): change["need_sync"] = False finally: - save_replication_status(repstatus) + save_site_replication_status(self._site_id, repl_status) def _set_result(self, phase, status_text, status_details=None, state=STATE_SUCCESS):

7 years, 10 months

Fixed different issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c538458aecae9488e1b7e6da088702ab0f11b31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c538458aecae9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 10:17:16 2016 +0100 Fixed different issues --- web/htdocs/views.py | 1 + web/htdocs/wato.py | 18 +++++++++--------- web/htdocs/watolib.py | 23 ++++++++++------------- web/htdocs/weblib.py | 10 ++++++++-- web/plugins/wato/mkeventd.py | 5 ----- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1a40d71..e8f1872 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -35,6 +35,7 @@ import cmk.paths # Datastructures and functions needed before plugins can be loaded loaded_with_language = False +display_options = None # Load all view plugins def load_plugins(force): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 21f50e2..cf42c3d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -111,10 +111,10 @@ except ImportError: import json g_html_head_open = False +display_options = None wato_styles = [ "pages", "wato", "status" ] - def init_wato_datastructures(): create_sample_config() # if called for the very first time! init_watolib_datastructures() @@ -1970,8 +1970,8 @@ def rename_hosts_in_check_mk(renamings): [_("%s into %s") % (oldname, newname) for (oldname, newname) in name_pairs]) # Restart is done by remote automation (below), so don't do it during rename/sync + # The sync is automatically done by the remote automation call add_change("renamed-hosts", message, sites=[site_id], need_restart=False) - synchronize_site(site, restart=False) new_counts = check_mk_automation(site_id, "rename-hosts", [], name_pairs) @@ -4865,7 +4865,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): def _change_table(self): - table.begin("changes", sortable=False, searchable=False, css="changes") + table.begin("changes", sortable=False, searchable=False, css="changes", limit=None) for change_id, change in reversed(self._changes): css = [] if self._is_foreign(change): @@ -5034,11 +5034,11 @@ class ModeAjaxStartActivation(WatoWebApiMode): manager = ActivateChangesManager() - sites = request.get("sites", "").strip() - if not sites: - sites = manager.dirty_and_active_activation_sites() + affected_sites = request.get("sites", "").strip() + if not affected_sites: + affected_sites = manager.dirty_and_active_activation_sites() else: - sites = sites.split(",") + affected_sites = affected_sites.split(",") comment = request.get("comment", "").strip() if comment == "": @@ -5046,7 +5046,7 @@ class ModeAjaxStartActivation(WatoWebApiMode): activate_foreign = request.get("activate_foreign", "0") == "1" - activation_id = manager.start(sites, activate_until, comment, activate_foreign) + activation_id = manager.start(affected_sites, activate_until, comment, activate_foreign) return { "activation_id": activation_id, @@ -5080,7 +5080,7 @@ def do_activate_changes_automation(): try: domains = ast.literal_eval(html.var("domains")) except SyntaxError: - raise MKAutomationException(_("Garbled automation response: '%s'") % response_text) + raise MKAutomationException(_("Garbled automation response: '%s'") % html.var("domains")) return execute_activate_changes(domains) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e8d2bd5..5fc409d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -50,6 +50,7 @@ import tarfile import cStringIO from lib import * from valuespec import * +from hashlib import sha256 import config, hooks, userdb, multitar import sites @@ -323,7 +324,9 @@ class ConfigDomainEventConsole(ConfigDomain): def activate(self): if getattr(config, "mkeventd_enabled", False): - mkeventd_reload() + mkeventd.execute_command("RELOAD", site=config.omd_site()) + log_audit(None, "mkeventd-activate", + _("Activated changes of event console configuration")) call_hook_mkeventd_activate_changes() @@ -1283,7 +1286,7 @@ class Folder(BaseFolder): def all_site_ids(self): site_ids = set() self._add_all_sites_to_set(site_ids) - return site_ids + return list(site_ids) def title_path(self, withlinks = False): @@ -1554,7 +1557,7 @@ class Folder(BaseFolder): raise MKUserError(None, _("Cannot move folder: A folder with this name already exists in the target folder.")) # 2. Actual modification - affected_sites = [subfolder.all_site_ids()] + affected_sites = subfolder.all_site_ids() old_filesystem_path = subfolder.filesystem_path() del self._subfolders[subfolder.name()] subfolder._parent = target_folder @@ -1562,7 +1565,7 @@ class Folder(BaseFolder): shutil.move(old_filesystem_path, subfolder.filesystem_path()) subfolder.rewrite_hosts_files() # fixes changed inheritance Folder.invalidate_caches() - affected_sites = list(set(affected_sites + [subfolder.all_site_ids()])) + affected_sites = list(set(affected_sites + subfolder.all_site_ids())) add_change("move-folder", _("Moved folder %s to %s") % (subfolder.alias_path(), target_folder.alias_path()), obj=subfolder, @@ -1722,7 +1725,7 @@ class Folder(BaseFolder): changed = rename_host_in_list(self._attributes["parents"], oldname, newname) add_change("rename-parent", _("Renamed parent (set in folder) from %s to %s") % (self.path(), oldname, newname), - obj=self, sites=[self.all_site_ids()]) + obj=self, sites=self.all_site_ids()) self.save_hosts() self.save() return changed @@ -3726,11 +3729,6 @@ def verify_slave_site_config(site_id): raise MKGeneralException(message) -def mkeventd_reload(): - mkeventd.execute_command("RELOAD", site=config.omd_site()) - log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) - - # TODO: Recode to new sync? def push_user_profile_to_site(site, user_id, profile): url = site["multisiteurl"] + "automation.py?" + html.urlencode_vars([ @@ -4123,7 +4121,7 @@ class ActivateChangesManager(ActivateChanges): log_exception() if config.debug: raise - raise MKUserError(None, _("Can not start activation: %s" % e)) + raise MKUserError(None, _("Can not start activation: %s") % e) # Lock WATO modifications during snapshot creation @@ -4230,7 +4228,6 @@ class ActivateChangesManager(ActivateChanges): def _do_start_site_activation(self, site_id): ActivateChangesSite(site_id, self._activation_id, self._site_snapshot_file(site_id), self._prevent_activate).start() - p.start() os._exit(0) @@ -4501,7 +4498,7 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): result = True if result != True: - raise MKGeneralException(_("Failed to synchronize with site: %s" % result)) + raise MKGeneralException(_("Failed to synchronize with site: %s") % result) def _push_snapshot_to_site(self): diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 500bf5c..5d2a9cc 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -139,6 +139,8 @@ def ajax_set_rowselection(): # | An upper-case char means enabled, lower-case means disabled. | # '----------------------------------------------------------------------' +display_options = None + class DisplayOptions(object): H = "H" # The HTML header and body-tag (containing the tags <HTML> and <BODY>) T = "T" # The title line showing the header and the logged in user @@ -236,5 +238,9 @@ class DisplayOptions(object): def prepare_display_options(context): - context["display_options"] = DisplayOptions() - context["display_options"].load_from_html() + global display_options + + display_options = DisplayOptions() + display_options.load_from_html() + + context["display_options"] = display_options diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index e2acbfd..9d128b7 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -3084,8 +3084,3 @@ define command { """ % { "group" : contactgroup, "facility" : config.mkeventd_notify_facility, "remote" : remote_console }) register_hook("pre-activate-changes", mkeventd_update_notifiation_configuration) - -# Only register the reload hook when mkeventd is enabled -if mkeventd_enabled: - register_hook("activate-changes", lambda hosts: config.mkeventd_enabled and mkeventd_reload()) -

7 years, 10 months

Fixed webapi activate_changes reading "allow_foreign_changes"

by Lars Michelsen

from request object too Message-ID: <5822f593.OmEhznKOyA5xVacy%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4670e24ff0f9a26bd44b639a51b209b1a6cae24c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4670e24ff0f9a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 9 09:38:39 2016 +0100 Fixed webapi activate_changes reading "allow_foreign_changes" from request object too --- web/plugins/webapi/webapi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 4044184..33c9a4b 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -292,13 +292,12 @@ api_actions["discover_services"] = { ############### -# TODO: Recode to new activation code def action_activate_changes(request): validate_request_keys(request, ["mode", "sites", "allow_foreign_changes", "comment"]) mode = html.var("mode") and html.var("mode") or "dirty" - if html.var("allow_foreign_changes"): - allow_foreign_changes = bool(int(html.var("allow_foreign_changes"))) + if request.get("allow_foreign_changes"): + allow_foreign_changes = bool(int(request.get("allow_foreign_changes"))) else: allow_foreign_changes = False

7 years, 10 months

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016