Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Reworked audit log rendering and started adding filter/display options

by Lars Michelsen

Module: check_mk Branch: master Commit: 6359e00ea117465e3b181da6bd451c02b1f035d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6359e00ea11746… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 2 17:50:27 2016 +0100 Reworked audit log rendering and started adding filter/display options --- web/htdocs/htmllib.py | 4 +- web/htdocs/wato.css | 4 + web/htdocs/wato.py | 512 ++++++++++++++++++++++++++++---------------------- web/htdocs/watolib.py | 37 +--- 4 files changed, 299 insertions(+), 258 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6359e00ea1…

7 years, 10 months

Minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: e92822015c22d82c4c0fec8837a191f25a2e945e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e92822015c22d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 3 15:15:36 2016 +0100 Minor cleanups --- web/htdocs/wato.py | 74 +++++++++------------------------------------------ web/htdocs/watolib.py | 6 ++--- 2 files changed, 15 insertions(+), 65 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 98f2e18..54b876a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4354,7 +4354,7 @@ def create_random_hosts(folder, count, folders, levels): # '----------------------------------------------------------------------' class ModeAuditLog(WatoMode): - log_path = "%s/audit.log" % log_dir + log_path = audit_log_path def __init__(self): self._options = self._vs_audit_log_options().default_value() @@ -4935,12 +4935,16 @@ class ModeActivateChanges(WatoMode, ActivateChanges): has_foreign = self._site_has_foreign_changes(site_id) can_activate_all = not has_foreign or config.user.may("wato.activateforeign") + need_restart = self._is_activate_needed(site_id) + need_sync = self._is_sync_needed(site_id) + need_action = need_restart or need_sync + # TODO: Handle not logged in sites # if not config.site_is_local(site_id) and not "secret" in site: # Activation checkbox - table.cell("", css="buttons") - if can_activate_all: + if can_activate_all and need_action: + table.cell("", css="buttons") html.checkbox("site_%s" % site_id, cssclass="site_checkbox") # Iconbuttons @@ -4974,10 +4978,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): table.cell(_("Services"), css="number") html.a(site_status.get("num_services", ""), href="view.py?view_name=sitesvcs&site=%s" % site_id) - need_restart = self._is_activate_needed(site_id) - need_sync = self._is_sync_needed(site_id) - uptodate = not (need_restart or need_sync) - + # TODO: Cleanup # Start asynchronous replication #if sitestatus_do_async_replication: # table.cell(_("Activation"), css="repprogress") @@ -5005,15 +5006,16 @@ class ModeActivateChanges(WatoMode, ActivateChanges): html.icon(_("This site is not update and needs a replication."), "need_replicate") if need_restart: html.icon(_("This site needs a restart for activating the changes."), "need_restart") - if uptodate: + if not need_action: html.icon(_("This site is up-to-date."), "siteuptodate") table.cell(_("Changes"), "%d" % len(self._changes_of_site(site_id)), css="number") - table.cell(_("Activate")) - if can_activate_all and (need_sync or need_restart): + if can_activate_all and need_action: + table.cell(_("Activate")) html.jsbutton("activate_%s" % site_id, _("Activate"), "activate_changes(\"site\", \"%s\")" % site_id, cssclass="activate_site") + # TODO: Cleanup ## Actions #table.cell(_("Activate"), css="buttons") ##if site_id not in activation_blocked_reasons.get("sites", {}): @@ -5092,58 +5094,6 @@ class ModeAjaxStartActivation(WatoWebApiMode): } -class ActivateChangesManager(object): - def __init__(self, sites, activate_until, comment=None, activate_foreign=False): - self._sites = sites - self._activate_until = activate_until - self._comment = comment - self._activate_foreign = activate_foreign - - - # Creates the snapshot and starts the single site sync processes. In case these - # steps could not be started, exceptions are raised and have to be handled by - # the caller. - # - # On success a separate thread is started that writes it's state to a state file - # below "var/check_mk/wato/activation/<id>_general.state". The <id> is written to - # the javascript code and can be used for fetching the activation state while - # the activation is running. - # - # For each site a separate thread is started that controls the activation of the - # configuration on that site. The state is checked by the general activation - # thread. - def start(self): - self._create_snapshot() - self._start_activation() - - - # Lock WATO modifications during snapshot creation - def _create_snapshot(self): - lock_exclusive() - - # TODO: Check that self._activate_until is the last made modification. - # If not, terminate this! - - # TODO: Create the snapshot (check naming that multiple activations can be made) - - unlock_exclusive() - - - def _start_activation(self): - for site_id in self._sites: - self._start_site_activation(site_id) - - - def _start_site_activation(self): - # TODO: Lock the site activation - - # TODO: Perform the activation - # TODO: Confirm changes till (self._activate_until) - - # TODO: Unlock site activation - pass - - class ModeAjaxActivationState(WatoWebApiMode): def page(self): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5986ad0..a105df8 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -128,6 +128,7 @@ 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" snapshot_dir = var_dir + "snapshots/" repstatus_file = var_dir + "replication_status.mk" php_api_dir = var_dir + "php-api/" @@ -197,9 +198,8 @@ def log_entry(linkinfo, action, message, user_id=None): elif user_id == '': user_id = '-' - log_file = ModeAuditLog.log_path - make_nagios_directory(os.path.dirname(log_file)) - with create_user_file(log_file, "ab") as f: + make_nagios_directory(os.path.dirname(audit_log_path)) + with create_user_file(audit_log_path, "ab") as f: f.write("%d %s %s %s %s\n" % (int(time.time()), link, user_id, action, message))

7 years, 10 months

Finished audit.log changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 2960fc36d1c285c0e0df8a923bee2fbb8ae3f408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2960fc36d1c285… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 3 14:34:18 2016 +0100 Finished audit.log changes * Implemented option handling in audit log * Added display_option handling to WATO pages * Audit log can now be embedded into the custom URL dashlet (Apply the options you like to the audit log page, then add this URL parameter "display_options=tznbcm", copy the URL and add it to the custom URL dashlet URL) --- web/htdocs/htmllib.py | 19 ++-- web/htdocs/pages.css | 5 + web/htdocs/wato.py | 238 ++++++++++++++++++++++++++++++------------- web/htdocs/watolib.py | 15 +-- web/htdocs/weblib.py | 2 + web/plugins/wato/mkeventd.py | 1 + 6 files changed, 196 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2960fc36d1…

7 years, 10 months

Cleaned up some old code; Adding activation timing information to status details now

by Lars Michelsen

Module: check_mk Branch: master Commit: 696a04ecc1fa9980f888b1818c8e13ddb526a1aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696a04ecc1fa99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 3 20:28:16 2016 +0100 Cleaned up some old code; Adding activation timing information to status details now --- web/htdocs/js/wato.js | 28 +++++-- web/htdocs/wato.py | 113 +++++--------------------- web/htdocs/watolib.py | 183 ++++++++++++++++++++++++------------------- web/plugins/sidebar/wato.py | 2 +- web/plugins/webapi/webapi.py | 5 +- 5 files changed, 146 insertions(+), 185 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=696a04ecc1…

7 years, 10 months

Moved DisplayOptions to weblib to make it available for other modules than views

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a5d92e0feaf7e571eaf7e0fff21716bb7821d22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a5d92e0feaf7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 3 14:17:05 2016 +0100 Moved DisplayOptions to weblib to make it available for other modules than views --- web/htdocs/views.py | 119 +-------------------------------------------------- web/htdocs/weblib.py | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a5d92e0fe…

7 years, 10 months

Cleaned up some deprecated code

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d2d36f64ba45e165f1e8202b1376c2fd6d679e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d2d36f64ba45e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 2 17:58:21 2016 +0100 Cleaned up some deprecated code --- web/htdocs/wato.py | 294 -------------------------------------------------- web/htdocs/watolib.py | 22 ++++ 2 files changed, 22 insertions(+), 294 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d2d36f64b…

7 years, 10 months

Fixed handling of not logged in sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 55300bc53082ce7d6d80786bc4170bd03bc56b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55300bc53082ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 12:40:58 2016 +0100 Fixed handling of not logged in sites --- web/htdocs/htmllib.py | 2 +- web/htdocs/wato.py | 19 +++++------- web/htdocs/watolib.py | 73 +++++++++++++++++++++++++++++++------------- web/plugins/wato/mkeventd.py | 21 +++++++++++++ 4 files changed, 82 insertions(+), 33 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 10821c6..29714d2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1478,7 +1478,7 @@ class html(DeprecationWrapper): for key, val in self.all_vars().items(): if key not in [ "request", "output_format" ] + exclude_vars: - request[key] = val + request[key] = val.decode("utf-8") return request diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f6e9dd5..a3e2aab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4920,18 +4920,13 @@ class ModeActivateChanges(WatoMode, ActivateChanges): def _activation_status(self): table.begin("site-status", searchable=False, sortable=False) - for site_id, site in sort_sites(wato_activation_sites()): + for site_id, site in sort_sites(self._activation_sites()): table.row() - if site.get("disabled"): - site_status = {} - status = "disabled" - else: - site_status = sites.state(site_id, {}) - status = site_status.get("state", "unknown") + site_status, status = self._get_site_status(site_id, site) - is_online = status in [ "online", "disabled" ] - is_logged_in = config.site_is_local(site_id) or "secret" in site + is_online = self._site_is_online(status) + is_logged_in = self._site_is_logged_in(site_id, site) has_foreign = self._site_has_foreign_changes(site_id) can_activate_all = not has_foreign or config.user.may("wato.activateforeign") @@ -5036,9 +5031,11 @@ class ModeAjaxStartActivation(WatoWebApiMode): if not activate_until: raise MKUserError("activate_until", _("Missing parameter \"%s\".") % "activate_until") + manager = ActivateChangesManager() + sites = request.get("sites", "").strip() if not sites: - sites = get_dirty_sites() + sites = manager.dirty_and_active_activation_sites() else: sites = sites.split(",") @@ -5048,7 +5045,6 @@ class ModeAjaxStartActivation(WatoWebApiMode): activate_foreign = request.get("activate_foreign", "0") == "1" - manager = ActivateChangesManager() activation_id = manager.start(sites, activate_until, comment, activate_foreign) return { @@ -5057,6 +5053,7 @@ class ModeAjaxStartActivation(WatoWebApiMode): + class ModeAjaxActivationState(WatoWebApiMode): def page(self): init_wato_datastructures() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a088dfa..0590f9d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -168,13 +168,17 @@ def log_entry(linkinfo, action, message, user_id=None): link = linkinfo if user_id == None and config.user.id != None: - user_id = config.user.id.encode("utf-8") + user_id = config.user.id elif user_id == '': user_id = '-' + if user_id: + user_id = user_id.encode("utf-8") + make_nagios_directory(os.path.dirname(audit_log_path)) with create_user_file(audit_log_path, "ab") as f: - f.write("%d %s %s %s %s\n" % (int(time.time()), link, user_id, action, message)) + f.write("%d %s %s %s %s\n" % (int(time.time()), link, user_id, + action, message)) def log_audit(linkinfo, action, message, user_id = None): @@ -3481,12 +3485,6 @@ def wato_slave_sites(): if site.get("replication") ] -def wato_activation_sites(): - return [ (site_id, site) for site_id, site in config.configured_sites() - if config.site_is_local(site_id) - or site.get("replication") ] - - def declare_site_attribute(): undeclare_host_attribute("site") declare_host_attribute(SiteAttribute(), show_in_table = True, show_in_folder = True) @@ -3580,15 +3578,6 @@ def update_login_sites_replication_status(): update_replication_status(site_id, {'need_sync': True}) -def get_dirty_sites(): - dirty = [] - repstatus = load_replication_status() - for site_id, _unused_site in wato_activation_sites(): - if repstatus[site_id].get("changes", []): - dirty.append(site_id) - return dirty - - def automation_push_snapshot(): site_id = html.var("siteid") @@ -3783,7 +3772,47 @@ class ActivateChanges(object): def _changes_of_site(self, site_id): - return self._repstatus[site_id].get("changes", []) + return self._repstatus.get(site_id, {}).get("changes", []) + + + # Returns the list of sites that should be shown on activation page + 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") ] + + + # Returns the list of sites that should be used when activating all + # affected sites. + def dirty_and_active_activation_sites(self): + dirty = [] + for site_id, site in self._activation_sites(): + status = self._get_site_status(site_id, site)[1] + is_online = self._site_is_online(status) + is_logged_in = self._site_is_logged_in(site_id, site) + + if is_online and is_logged_in and self._changes_of_site(site_id): + dirty.append(site_id) + return dirty + + + def _site_is_logged_in(self, site_id, site): + return config.site_is_local(site_id) or "secret" in site + + + def _site_is_online(self, status): + return status in [ "online", "disabled" ] + + + def _get_site_status(self, site_id, site): + if site.get("disabled"): + site_status = {} + status = "disabled" + else: + site_status = sites.state(site_id, {}) + status = site_status.get("state", "unknown") + + return site_status, status def _site_has_foreign_changes(self, site_id): @@ -3803,7 +3832,7 @@ class ActivateChanges(object): def _last_activation_state(self, site_id): - last_activation_id = self._repstatus[site_id].get("last_activation") + last_activation_id = self._repstatus.get(site_id, {}).get("last_activation") manager = ActivateChangesManager() try: manager.load(last_activation_id) @@ -3937,7 +3966,7 @@ class ActivateChangesManager(ActivateChanges): def _get_sites(self, sites): for site_id in sites: - if site_id not in dict(wato_activation_sites()): + if site_id not in dict(self._activation_sites()): raise MKUserError("sites", _("The site \"%s\" does not exist.") % site_id) return sites @@ -4189,6 +4218,8 @@ class ActivateChangesSite(threading.Thread, ActivateChanges): if self._is_activate_needed(self._site_id): configuration_warnings = self._do_activate() + else: + configuration_warnings = [] self._confirm_activated_changes() @@ -4524,7 +4555,7 @@ def create_snapshot(comment): data["comment"] = _("Activated changes by %s.") % config.user.id if comment: - data["comment"] = _("Comment: %s") % comment + data["comment"] += _("Comment: %s") % comment data["created_by"] = config.user.id data["type"] = "automatic" diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 687e930..359d420 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1675,6 +1675,27 @@ def mode_mkeventd_changes(phase): else: html.write("<div class=info>" + _("There are no pending changes.") + "</div>") + +# TODO: Remove when wato recode finished +def parse_audit_log(name): + log_path = log_dir + "/" + name + ".log" + if not os.path.exists(log_path): + return [] + + entries = [] + for line in file(log_path): + line = line.rstrip().decode("utf-8") + splitted = line.split(None, 4) + + if len(splitted) == 5 and splitted[0].isdigit(): + splitted[0] = int(splitted[0]) + entries.append(splitted) + + entries.reverse() + + return entries + + def log_mkeventd(what, message): log_entry(None, what, message, "audit.log") # central WATO audit log # TODO: Change to new changes tracking!

7 years, 10 months

Activate changes is now compatible to legacy slave sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 751c93a94e1816f76054cbb4d8df3c460dd31e03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=751c93a94e1816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 11:38:53 2016 +0100 Activate changes is now compatible to legacy slave sites --- web/htdocs/watolib.py | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 72ef127..51b0f7f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4237,6 +4237,7 @@ class ActivateChangesSite(threading.Thread, ActivateChanges): state=STATE_ERROR) finally: + self._cleanup_snapshot() self._unlock_activation() @@ -4339,10 +4340,7 @@ class ActivateChangesSite(threading.Thread, ActivateChanges): start = time.time() - try: - result = self._push_snapshot_to_site() - finally: - self._cleanup_snapshot() + result = self._push_snapshot_to_site() duration = time.time() - start self._update_activation_time(ACTIVATION_TIME_SYNC, duration) @@ -4410,15 +4408,47 @@ class ActivateChangesSite(threading.Thread, ActivateChanges): if config.site_is_local(self._site_id): return execute_activate_changes(domains) else: - response = do_remote_automation( - config.site(self._site_id), "activate-changes", [ - ("domains", repr(domains)), - ("site_id", self._site_id), - ]) + try: + response = do_remote_automation( + config.site(self._site_id), "activate-changes", [ + ("domains", repr(domains)), + ("site_id", self._site_id), + ]) + except MKAutomationException, e: + if "Invalid automation command: activate-changes" in "%s" % e: + return self._call_legacy_activate_changes_automation() + else: + raise return response + # This is needed to be able to activate the changes on legacy (pre 1.4.0i3) slave sites. + # Sadly this is only possible by syncing the snapshot a second time. + def _call_legacy_activate_changes_automation(self): + site = config.site(self._site_id) + + url = html.makeuri_contextless([ + ("command", "push-snapshot"), + ("secret", site["secret"]), + ("siteid", site["id"]), + ("mode", "slave"), + ("restart", "yes"), + ("debug", config.debug and "1" or ""), + ], filename=site["multisiteurl"] + "automation.py") + + response_text = self._upload_file(url, site.get('insecure', False)) + + try: + cmk_configuration_warnings = ast.literal_eval(response_text) + return { + "check_mk": cmk_configuration_warnings + } + except: + raise MKAutomationException(_("Garbled automation response from site %s: '%s'") % + (site["id"], response_text)) + + def _get_domains_needing_activation(self): domains = set([]) for change in self._site_changes:

7 years, 10 months

store: load func is now unlocking on exception; save is locking at start of write

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ae4e4dfe33f817321e8cbae46c22c250ca1c10a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ae4e4dfe33f81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 8 14:45:22 2016 +0100 store: load func is now unlocking on exception; save is locking at start of write --- lib/store.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/store.py b/lib/store.py index de4e057..bb12c59 100644 --- a/lib/store.py +++ b/lib/store.py @@ -124,6 +124,9 @@ def load_data_from_file(path, default=None, lock=False): raise except Exception, e: + if lock: + release_lock(path) + # TODO: How to handle debug mode or logging? raise MKGeneralException(_("Cannot read file \"%s\": %s") % (path, e)) @@ -151,6 +154,10 @@ def save_data_to_file(path, data, pretty=True): # Then the new file is written to a temporary file and moved to the target path def save_file(path, content, mode=0660): try: + # Normally the file is already locked (when data has been loaded before with lock=True), + # but lock it just to be sure we have the lock on the file + aquire_lock(path) + tmp_path = None with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(path), prefix=".%s.new" % os.path.basename(path),

7 years, 10 months

Moved Event Console activation to generic config sync/actiation mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: d2a14533d64887e6efc94e1f74baa5cdc45801d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2a14533d64887… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 16:13:01 2016 +0100 Moved Event Console activation to generic config sync/actiation mechanism --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 39 ++++++++++---- web/plugins/wato/mkeventd.py | 122 +++++++------------------------------------ 3 files changed, 51 insertions(+), 112 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d2a14533d6…

7 years, 10 months

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