Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Using better function to get the local site id

by Lars Michelsen

Module: check_mk Branch: master Commit: fd3b0d5a2524f45376d4ce05ef51df204c68bdbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd3b0d5a2524f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 16:36:40 2016 +0100 Using better function to get the local site id --- web/htdocs/config.py | 1 + web/htdocs/wato.py | 11 +++-------- web/htdocs/watolib.py | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 6a81da8..1ef46c1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -662,6 +662,7 @@ def site(site_id): return s +# TODO: Does this work when using liveproxyd locally? def site_is_local(site_name): s = sites.get(site_name, {}) sock = s.get("socket") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b30f389..5c9c74a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4830,7 +4830,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): "activate_changes(\"affected\")") html.jsbutton("activate_selected", _("Activate selected"), "activate_changes(\"selected\")") - # TODO: Revert button? + html.hidden_fields() html.end_form() @@ -9358,10 +9358,6 @@ def mode_edit_site(phase): save_sites(configured_sites) - # TODO: Why? - # Own site needs RESTART in any case - # update_replication_status(our_site_id(), { "need_restart" : True }) - if new: msg = _("Created new connection to site %s") % id else: @@ -9371,7 +9367,7 @@ def mode_edit_site(phase): # affecting all domains add_change("edit-sites", msg, sites=[id], domains=ConfigDomain.all_classes()) - if id != our_site_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. @@ -9637,7 +9633,7 @@ def automation_push_profile(): if not user_id: raise MKGeneralException(_("Missing variable user_id")) - our_id = our_site_id() + our_id = config.omd_site() if our_id != None and our_id != site_id: raise MKGeneralException( @@ -13986,7 +13982,6 @@ def user_profile_async_replication_dialog(): html.icon(status_txt, icon) if start_sync: - # TODO: Change to new functions estimated_duration = srs.get("times", {}).get(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'))) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 08311d1..72ef127 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -188,7 +188,7 @@ def log_audit(linkinfo, action, message, user_id = None): def confirm_all_local_changes(): - site_id = our_site_id() + site_id = config.omd_site() repl_status = load_replication_status(lock=True) try: @@ -3155,8 +3155,6 @@ def get_login_secret(create_on_demand = False): # Returns the ID of our site. This function only works in replication # mode and looks for an entry connecting to the local socket. def our_site_id(): - if not is_distributed(): - return None for site_id in config.allsites(): if config.site_is_local(site_id): return site_id @@ -3641,7 +3639,7 @@ def verify_slave_site_config(site_id): if not site_id: raise MKGeneralException(_("Missing variable siteid")) - our_id = our_site_id() + our_id = config.omd_site() if not config.is_single_local_site(): raise MKGeneralException(_("Configuration error. You treat us as "

7 years, 10 months

Added missing validation calls

by Lars Michelsen

Module: check_mk Branch: master Commit: f603069c55f3c15560c835e178c67d49c88d7f28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f603069c55f3c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 12:00:36 2016 +0100 Added missing validation calls --- web/htdocs/watolib.py | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 51b0f7f..f8b0074 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3914,42 +3914,28 @@ class ActivateChangesManager(ActivateChanges): self._time_started = time.time() self._snapshot_id = None - # TODO - # # Let host validators do their work - # defective_hosts = validate_all_hosts([], force_all = True) - # if defective_hosts: - # raise MKUserError(None, _("You cannot activate changes while some hosts have " - # "an invalid configuration: ") + ", ".join( - # [ '<a href="%s">%s</a>' % (folder_preserving_link([("mode", "edit_host"), ("host", hn)]), hn) - # for hn in defective_hosts.keys() ])) - + self._verify_valid_host_config() self._save_activation() self._pre_activate_changes() - - # TODO: - # # Give hooks chance to do some pre-activation things (and maybe stop - # # the activation) - # try: - # call_hook_pre_distribute_changes() - # except Exception, e: - # if config.debug: - # raise - # else: - # raise MKUserError(None, "<h1>%s</h1>%s" % (_("Cannot activate changes"), e)) - # - self._create_snapshots() - self._save_activation() self._start_activation() - self._do_housekeeping() return self._activation_id + def _verify_valid_host_config(self): + defective_hosts = validate_all_hosts([], force_all=True) + if defective_hosts: + raise MKUserError(None, _("You cannot activate changes while some hosts have " + "an invalid configuration: ") + ", ".join( + [ '<a href="%s">%s</a>' % (folder_preserving_link([("mode", "edit_host"), ("host", hn)]), hn) + for hn in defective_hosts.keys() ])) + + def activate_until(self): return self._activate_until

7 years, 10 months

Different fixes and improvements when syncing with slave

by Lars Michelsen

Module: check_mk Branch: master Commit: 094eeaa81ee97482cedff7c1c8ada1e97fe4c125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094eeaa81ee974… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 12:17:52 2016 +0100 Different fixes and improvements when syncing with slave --- web/htdocs/js/wato.js | 2 +- web/htdocs/wato.py | 64 +++++++++++++++++++++++++++++---------------------- web/htdocs/watolib.py | 49 +++++++++++++++++++++------------------ 3 files changed, 63 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=094eeaa81e…

7 years, 10 months

Implemented cleanup of stale activations

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ddca49ee400a1e7bdbf471967be4c5133bb7256 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddca49ee400a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 14:33:50 2016 +0100 Implemented cleanup of stale activations --- web/htdocs/wato.py | 7 ++- web/htdocs/watolib.py | 154 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 126 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2ddca49ee4…

7 years, 10 months

Reload the sidebar after activation

by Lars Michelsen

Module: check_mk Branch: master Commit: a57af54a02eec01b8f24fcb8ff62e96e9e7306fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a57af54a02eec0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 16:21:37 2016 +0100 Reload the sidebar after activation --- web/htdocs/js/wato.js | 3 +++ web/htdocs/watolib.py | 12 ++---------- web/plugins/wato/bi.py | 6 +----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 8f5e99f..b5e3b20 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -836,6 +836,9 @@ function finish_activation() // Maybe change this not to make a reload and only update the relevant // parts of the activate changes page. schedule_reload('', 1000); + + // Trigger a reload of the sidebar (to update changes in WATO snapin) + reload_sidebar(); } // .-Profile Repl----------------------------------------------------------. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 0b826be..08311d1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -127,9 +127,7 @@ wato_root_dir = cmk.paths.check_mk_config_dir + "/wato/" multisite_dir = cmk.paths.default_config_dir + "/multisite.d/wato/" sites_mk = cmk.paths.default_config_dir + "/multisite.d/sites.mk" var_dir = cmk.paths.var_dir + "/wato/" -# TODO: Clean this up! -log_dir = var_dir + "log/" -audit_log_path = log_dir + "audit.log" +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/" @@ -310,7 +308,7 @@ class ConfigDomainGUI(ConfigDomain): class ConfigDomainEventConsole(ConfigDomain): needs_sync = True - needs_activation = False + needs_activation = True ident = "ec" def activate(self): @@ -3592,12 +3590,6 @@ def get_event_console_sync_sites(): return sites -# TODO: This needs to to be recoded to new mechanism -def update_login_sites_replication_status(): - for site_id in get_login_sites(): - update_replication_status(site_id, {'need_sync': True}) - - def automation_push_snapshot(): site_id = html.var("siteid") diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 6da79fe..d0a9e89 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -161,10 +161,6 @@ class ModeBI(WatoMode): out.write("bi_packs[%r] = %s\n\n" % ( pack_id, self._replace_bi_constants(pprint.pformat(converted_pack, width=50)))) - # Make sure that BI aggregates are replicated to all other sites that allow - # direct user login - update_login_sites_replication_status() - def _convert_pack_to_bi(self, pack): converted_rules = dict([ @@ -859,7 +855,7 @@ class ModeBIPacks(ModeBI): _("Do you really want to delete the BI pack <b>%s</b> <i>%s</i> with <b>%d</b> rules and <b>%d</b> aggregations?") % (pack_id, pack["title"], len(pack["rules"]), len(pack["aggregations"]))) if c: - log_mkeventd("delete-bi-pack", _("Deleted BI pack %s") % pack_id) + self._add_change("delete-bi-pack", _("Deleted BI pack %s") % pack_id) del self._packs[pack_id] self.save_config() elif c == False:

7 years, 10 months

Changed pending log (change) creation mechanism; Dirty mark is now done in add_change() call

by Lars Michelsen

Module: check_mk Branch: master Commit: 62b8f1dfd99230f1112d0ae6676b8c7857ce0d85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62b8f1dfd99230… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 10:27:52 2016 +0200 Changed pending log (change) creation mechanism; Dirty mark is now done in add_change() call --- web/htdocs/wato.py | 214 ++++++++++++++--------------- web/htdocs/watolib.py | 318 ++++++++++++++++++++++++++----------------- web/plugins/userdb/ldap.py | 17 ++- web/plugins/wato/bi.py | 22 +-- web/plugins/webapi/webapi.py | 6 +- 5 files changed, 322 insertions(+), 255 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=62b8f1dfd9…

7 years, 10 months

New activation page in progress

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d78149e968af85a111a88e4b57e4498ffd0bfcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d78149e968af8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 14:49:32 2016 +0200 New activation page in progress --- web/htdocs/check_mk.css | 12 + web/htdocs/config.py | 9 + web/htdocs/htmllib.py | 13 +- web/htdocs/index.py | 5 +- web/htdocs/js/wato.js | 199 ++++++- web/htdocs/lib.py | 5 + web/htdocs/valuespec.py | 18 +- web/htdocs/wato.py | 1420 +++++++++++++++++++++++---------------------- web/htdocs/watolib.py | 1061 +++++++++++++++++++++++++++------ web/plugins/pages/wato.py | 6 +- 10 files changed, 1847 insertions(+), 901 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d78149e96…

7 years, 10 months

Implemented handling of foreign changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e707e912181b3794457a669e31fe2f9e2adcf79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e707e912181b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 31 12:01:58 2016 +0100 Implemented handling of foreign changes --- web/htdocs/js/wato.js | 11 ++++---- web/htdocs/wato.css | 8 ++++++ web/htdocs/wato.py | 69 +++++++++++++++++++++++++++++++----------------- web/htdocs/watolib.py | 73 ++++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 118 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e707e9121…

7 years, 10 months

Showing activation progress in GUI again

by Lars Michelsen

Module: check_mk Branch: master Commit: de32bf18ddd600da5985b1f8c1c07e831abbb802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de32bf18ddd600… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 31 13:57:43 2016 +0100 Showing activation progress in GUI again --- web/htdocs/js/wato.js | 155 +++++++++++++++++++++++++------------------------- web/htdocs/wato.css | 61 ++++++++++++++++++-- web/htdocs/wato.py | 12 +++- web/htdocs/watolib.py | 109 +++++++++++++++++++++-------------- 4 files changed, 209 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=de32bf18dd…

7 years, 10 months

Detecting stale activation processes now; Really start activations now

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f2f35c399d9392f660297e23530e15bf4ca445a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f2f35c399d939… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 1 17:31:55 2016 +0100 Detecting stale activation processes now; Really start activations now --- web/htdocs/js/wato.js | 48 ++++++++++++++++- web/htdocs/table.py | 21 +++++--- web/htdocs/wato.css | 7 +++ web/htdocs/wato.py | 51 ++++++------------ web/htdocs/watolib.py | 142 +++++++++++++++++++++++++++++++++++++------------- 5 files changed, 191 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f2f35c399…

7 years, 10 months

← Newer
1
...
19
20
21
22
23
24
25
...
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