Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Moved locking and .mk config file handling code to store.py

by Lars Michelsen

Module: check_mk Branch: master Commit: 353fbdabdf3e9bb768813718a91223bc4bf7d32e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=353fbdabdf3e9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 12:58:36 2016 +0200 Moved locking and .mk config file handling code to store.py --- lib/store.py | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/lib.py | 52 ++----------------- 2 files changed, 155 insertions(+), 47 deletions(-) diff --git a/lib/store.py b/lib/store.py index f433bb6..1885d36 100644 --- a/lib/store.py +++ b/lib/store.py @@ -30,7 +30,11 @@ manager.""" import fcntl import os +import pprint import tempfile +import time + +from .exceptions import MKGeneralException # TODO: Please note that this is still experimental. @@ -120,3 +124,149 @@ class LockedOpenWithTempfile(LockedOpen): open = LockedOpenWithTempfile + + +#. +# .--.mk Configs---------------------------------------------------------. +# | _ ____ __ _ | +# | _ __ ___ | | __ / ___|___ _ __ / _(_) __ _ ___ | +# | | '_ ` _ \| |/ / | | / _ \| '_ \| |_| |/ _` / __| | +# | _| | | | | | < | |__| (_) | | | | _| | (_| \__ \ | +# | (_)_| |_| |_|_|\_\ \____\___/|_| |_|_| |_|\__, |___/ | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Loading and saving of .mk configuration files | +# '----------------------------------------------------------------------' + +# This function generalizes reading from a .mk configuration file. It is basically meant to +# generalize the exception handling for all file IO. +def load_mk_file(path, default=None, lock=False): + if default == None: + raise MKGeneralException(_("You need to provide a config dictionary to merge with the " + "read configuration. The dictionary should have all expected " + "keys and their default values set.")) + + if lock: + aquire_lock(path) + + try: + execfile(path, globals(), default) + return default + except IOError, e: + if e.errno == 2: # IOError: [Errno 2] No such file or directory + return default + else: + raise + + except Exception, e: + # TODO: How to handle debug mode or logging? + raise MKGeneralException(_("Cannot read configuration file \"%s\": %s") % (path, e)) + + +# A simple wrapper for cases where you only have to read a single value from a .mk file. +def load_from_mk_file(path, key, default, **kwargs): + return load_mk_file(path, {key: default}, **kwargs)[key] + + +# Saving assumes a locked destination file (usually done by loading code) +# Then the new file is written to a temporary file and moved to the target path +def save_mk_file(path, formated): + try: + tmp_path = None + with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(path), + prefix=os.path.basename(path)+".new", + delete=False) as tmp: + tmp_path = tmp.name + + os.chmod(tmp_path, 0660) + tmp.write("# Written by Check_MK store (%s)\n\n" % time.strftime("%Y-%m-%d %H:%M:%S")) + tmp.write(formated) + tmp.write("\n") + + os.rename(tmp_path, path) + + except Exception, e: + # TODO: How to handle debug mode or logging? + raise MKGeneralException(_("Cannot write configuration file \"%s\": %s") % (path, e)) + + finally: + release_lock(path) + + +# A simple wrapper for cases where you only have to write a single value to a .mk file. +def save_to_mk_file(path, key, value): + if type(value) == dict: + formated = "%s.update(%s)" % (key, pprint.pformat(value)) + else: + formated = "%s += %s" % (key, pprint.pformat(value)) + + save_mk_file(path, formated) + + +#. +# .--File locking--------------------------------------------------------. +# | _____ _ _ _ _ _ | +# | | ___(_) | ___ | | ___ ___| | _(_)_ __ __ _ | +# | | |_ | | |/ _ \ | |/ _ \ / __| |/ / | '_ \ / _` | | +# | | _| | | | __/ | | (_) | (__| <| | | | | (_| | | +# | |_| |_|_|\___| |_|\___/ \___|_|\_\_|_| |_|\__, | | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Helper functions to lock files (between processes) for disk IO | +# | Currently only exclusive locks are implemented and they always will | +# | wait forever. | +# '----------------------------------------------------------------------' + +g_aquired_locks = [] +g_locked_paths = [] + +def aquire_lock(path): + if path in g_locked_paths: + return True # No recursive locking + + # Create file (and base dir) for locking if not existant yet + if not os.path.exists(os.path.dirname(path)): + os.makedirs(os.path.dirname(path), mode=0770) + + fd = os.open(path, os.O_RDONLY | os.O_CREAT, 0660) + + # Handle the case where the file has been renamed in the meantime + while True: + fcntl.flock(fd, fcntl.LOCK_EX) + fd_new = os.open(path, os.O_RDONLY | os.O_CREAT, 0660) + if os.path.sameopenfile(fd, fd_new): + os.close(fd_new) + break + else: + os.close(fd) + fd = fd_new + + g_aquired_locks.append((path, fd)) + g_locked_paths.append(path) + + +def release_lock(path): + if path not in g_locked_paths: + return # no unlocking needed + + for lock_path, fd in g_aquired_locks: + if lock_path == path: + fcntl.flock(fd, fcntl.LOCK_UN) + os.close(fd) + g_aquired_locks.remove((lock_path, fd)) + + g_locked_paths.remove(path) + + +def have_lock(path): + return path in g_locked_paths + + +def release_all_locks(): + global g_aquired_locks, g_locked_paths + + for path, fd in g_aquired_locks: + os.close(fd) + + g_aquired_locks = [] + g_locked_paths = [] diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 29b9062..42d0e4d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -27,6 +27,7 @@ import math, grp, pprint, os, errno, marshal, re, fcntl, time from cmk.exceptions import MKException, MKGeneralException from cmk.regex import regex +import cmk.store as store # Workaround when the file is included from outside of Multisite try: @@ -381,53 +382,10 @@ def set_is_disjoint(a, b): return False return True -# Functions for locking files. All locks must be freed if a request -# has terminated (in good or in bad manner). Currently only exclusive -# locks are implemented and they always will wait for ever. -g_aquired_locks = [] -g_locked_paths = [] -def aquire_lock(path): - if path in g_locked_paths: - return True # No recursive locking - - # Create file (and base dir) for locking if not existant yet - make_nagios_directory(os.path.dirname(path)) - fd = os.open(path, os.O_RDONLY | os.O_CREAT) - - # Handle the case where the file has been renamed in the meantime - while True: - fcntl.flock(fd, fcntl.LOCK_EX) - fd_new = os.open(path, os.O_RDONLY | os.O_CREAT) - if os.path.sameopenfile(fd, fd_new): - os.close(fd_new) - break - else: - os.close(fd) - fd = fd_new - - g_aquired_locks.append((path, fd)) - g_locked_paths.append(path) - - -def release_lock(path): - if path not in g_locked_paths: - return # no unlocking needed - for lock_path, fd in g_aquired_locks: - if lock_path == path: - fcntl.flock(fd, fcntl.LOCK_UN) - os.close(fd) - g_aquired_locks.remove((lock_path, fd)) - g_locked_paths.remove(path) - -def have_lock(path): - return path in g_locked_paths - -def release_all_locks(): - global g_aquired_locks, g_locked_paths - for path, fd in g_aquired_locks: - os.close(fd) - g_aquired_locks = [] - g_locked_paths = [] +aquire_lock = store.aquire_lock +release_lock = store.release_lock +have_lock = store.have_lock +release_all_locks = store.release_all_locks # Splits a word into sequences of numbers and non-numbers. # Creates a tuple from these where the number are converted

8 years, 1 month

Started implementation of new password store

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b1ae8992eb0b9e41ae1c30f5f15e7ce2fbed67d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b1ae8992eb0b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 15:29:42 2016 +0200 Started implementation of new password store --- web/htdocs/images/icon_passwords.png | Bin 0 -> 2339 bytes web/htdocs/valuespec.py | 106 ++++----------- web/htdocs/wato.py | 249 ++++++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 10 +- web/plugins/wato/builtin_modules.py | 3 + 5 files changed, 281 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9b1ae8992e…

8 years, 1 month

Password store passwordsa are now correctly added to command lines

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c8caebcc00c62d40ba3548fbcccb3d117c69fe3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8caebcc00c62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 12:11:53 2016 +0200 Password store passwordsa are now correctly added to command lines --- checks/check_http | 85 ++++++++++++++++++------------------- modules/automation.py | 2 +- modules/check_mk.py | 41 ++++++++++++++++++ modules/check_mk_base.py | 8 +++- modules/config.py | 1 + modules/nagios.py | 3 +- web/htdocs/valuespec.py | 4 ++ web/htdocs/wato.py | 6 ++- web/plugins/wato/active_checks.py | 10 ++++- 9 files changed, 111 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8c8caebcc0…

8 years, 1 month

Write out passwords for monitoring core during core config creation

by Lars Michelsen

Module: check_mk Branch: master Commit: b54b7e3aeac1fc11bc4c13d805d282995cf8d554 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54b7e3aeac1fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 13:06:55 2016 +0200 Write out passwords for monitoring core during core config creation --- modules/check_mk.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 994f097..aaa4b69 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,6 +48,7 @@ import inspect from cmk.regex import regex, is_regex from cmk.exceptions import MKGeneralException, MKTerminate import cmk.tty as tty +import cmk.store as store # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' @@ -3382,6 +3383,8 @@ def create_core_config(): out = file(nagios_objects_file, "w") create_nagios_config(out) + write_stored_passwords() + num_warnings = len(g_configuration_warnings) if num_warnings > 10: g_configuration_warnings = g_configuration_warnings[:10] + \ @@ -3435,6 +3438,14 @@ def verify_cluster_address_family(hostname): (hostname, ", ".join(address_families))) +def write_stored_passwords(): + formated = "" + for ident, pw in stored_passwords.items(): + formated += "%s:%s\n" % (ident, pw["password"]) + + store.save_mk_file(var_dir + "/stored_passwords.mk", formated) + + def get_cluster_nodes_for_config(hostname): verify_cluster_address_family(hostname)

8 years, 1 month

Fixed/Cleaned up some edge cases in DropDownChoice()

by Lars Michelsen

Module: check_mk Branch: master Commit: 237ecbbed6813506cf5cb618941f1cb63b8c0873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=237ecbbed68135… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 11:18:28 2016 +0200 Fixed/Cleaned up some edge cases in DropDownChoice() --- web/htdocs/valuespec.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9faee81..dd700b5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1238,6 +1238,9 @@ class DropdownChoice(ValueSpec): self._sorted = kwargs.get("sorted", False) self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) self._invalid_choice = kwargs.get("invalid_choice", "replace") # also possible: "complain" + self._invalid_choice_title = kwargs.get("invalid_choice_title", _("Element does not exist anymore")) + self._invalid_choice_error = kwargs.get("invalid_choice_error", + _("The selected element is not longer available. Please select something else.")) self._no_preselect = kwargs.get("no_preselect", False) self._no_preselect_value = kwargs.get("no_preselect_value", None) self._no_preselect_title = kwargs.get("no_preselect_title", "") # if not preselected @@ -1276,15 +1279,15 @@ class DropdownChoice(ValueSpec): if entry[0] == value: defval = str(n) + # In complain mode: Use the value received from the HTML variable + if self._invalid_choice == "complain" and value != None and self._value_is_invalid(value): + defval = value + options.append((value, "%s (%s)" % (value, self._invalid_choice_title))) + if value == None and not options: html.write(self._empty_text) return - # In complain mode: Use the value received from the HTML variable - if self._invalid_choice == "complain" and self._value_is_invalid(value): - defval = "invalid" - options.append((defval, _("(element does not exist anymore)"))) - if len(options) == 0: html.write(self._empty_text) elif len(options[0]) == 3: @@ -1316,15 +1319,18 @@ class DropdownChoice(ValueSpec): if self._invalid_choice == "replace": return self.default_value() # garbled URL or len(choices) == 0 else: - if choices: - raise MKUserError(varprefix, _("The selected element is not longer available. Please select something else.")) - else: - raise MKUserError(varprefix, _("There is no element available to choose from.")) + return sel def validate_value(self, value, varprefix): if self._no_preselect and value == self._no_preselect_value: raise MKUserError(varprefix, self._no_preselect_error) + if self._invalid_choice == "complain" and self._value_is_invalid(value): + if value != None: + raise MKUserError(varprefix, self._invalid_choice_error) + else: + raise MKUserError(varprefix, _("There is no element available to choose from.")) + ValueSpec.custom_validate(self, value, varprefix) def validate_datatype(self, value, varprefix):

8 years, 1 month

Added mem_total and pagefile_total metrics to mem.win check

by Lars Michelsen

Module: check_mk Branch: master Commit: f87c979119dc1e02b956ddb708ccd5250848bfbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87c979119dc1e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 10:44:27 2016 +0200 Added mem_total and pagefile_total metrics to mem.win check --- checks/mem | 5 +++++ web/plugins/metrics/check_mk.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/checks/mem b/checks/mem index c1323c2..246990a 100644 --- a/checks/mem +++ b/checks/mem @@ -465,6 +465,11 @@ def check_mem_windows(item, params, info): else: perfdata = [(paramname, used_kb / 1024.0, None, None, 0, total_kb / 1024.0)] + if what == "Mem": + perfdata.append(("mem_total", total_kb / 1024.0)) + elif what == "Page": + perfdata.append(("pagefile_total", total_kb / 1024.0)) + # Do averaging, if configured, just for matching the levels if "average" in params: average_min = params["average"] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d7e2d14..357c7a7 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -839,6 +839,11 @@ metric_info["mem_esx_private"] = { "unit" : "bytes", } +metric_info["pagefile_total"] = { + "title" : _("Pagefile installed"), + "color": "#e0e0e0", + "unit" : "bytes", +} metric_info["load1"] = { "title" : _("CPU load average of last minute"), @@ -3779,8 +3784,10 @@ check_metrics["check_mk-aix_memory"] = { } check_metrics["check_mk-mem.win"] = { - "memory" : { "name" : "mem_used", "scale" : MB }, - "pagefile" : { "name" : "pagefile_used", "scale" : MB } + "memory" : { "name" : "mem_used", "scale" : MB }, + "pagefile" : { "name" : "pagefile_used", "scale" : MB }, + "mem_total" : { "auto_graph" : False }, + "pagefile_total" : { "auto_graph" : False }, } check_metrics["check_mk-brocade_mlx.module_mem"] = {

8 years, 1 month

Fixed description of metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: 69bfe4cc2b2237b69e6faa9d40e62e33810caed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69bfe4cc2b2237… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 27 10:10:40 2016 +0200 Fixed description of metrics --- web/plugins/metrics/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b4cb8ad..d7e2d14 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3554,13 +3554,13 @@ metric_info["dns_failures"] = { } metric_info["dns_nxrrset"] = { - "title" : _("DNS query received for non-existent record"), + "title" : _("DNS queries received for non-existent record"), "unit" : "count", "color" : "31/a", } metric_info["dns_nxdomain"] = { - "title" : _("DNS query received for non-existent domain"), + "title" : _("DNS queries received for non-existent domain"), "unit" : "count", "color" : "34/a", }

8 years, 1 month

backup: Some minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 6efe666819783884835ccefd7d15a484028c71f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6efe6668197838… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 09:52:55 2016 +0200 backup: Some minor cleanups --- bin/mkbackup | 23 +++++++++++------------ web/htdocs/backup.py | 39 +++++++++++++++++++++++++-------------- web/htdocs/js/checkmk.js | 14 +++++++++++++- web/htdocs/wato.py | 8 ++++++-- 4 files changed, 55 insertions(+), 29 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index e791c8d..3c02f6c 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -615,7 +615,7 @@ def do_site_backup(opts, site=None, try_stop=True): with open(backup_path, "w") as backup_file: s = BackupStream(stream=p.stdout, is_alive=lambda: p.poll() is None, - key_ident=g_job_config.get("encrypt")) + key_ident=g_job_config["encrypt"]) for chunk in s.process(): backup_file.write(chunk) @@ -1029,11 +1029,11 @@ def needed_backup_archive_files(info): def compress_archives(): - return "compress" in g_job_config + return g_job_config["compress"] def encrypt_archives(): - return "encrypt" in g_job_config + return g_job_config["encrypt"] != None def target_cfg(target_ident): @@ -1150,7 +1150,7 @@ def do_system_rw_backup(opts): # Process backup stream and write to destination file s = BackupStream(stream=pipein, is_alive=lambda: t.is_alive(), - key_ident=g_job_config.get("encrypt")) + key_ident=g_job_config["encrypt"]) for chunk in s.process(): backup_file.write(chunk) @@ -1168,7 +1168,7 @@ def do_system_data_backup(opts): # Process backup stream and write to destination file s = BackupStream(stream=pipein, is_alive=lambda: t.is_alive(), - key_ident=g_job_config.get("encrypt")) + key_ident=g_job_config["encrypt"]) for chunk in s.process(): backup_file.write(chunk) @@ -1380,10 +1380,9 @@ def cleanup_backup_job_states(): path = "%s/var/check_mk/backup" % os.environ["OMD_ROOT"] for f in glob.glob("%s/*.state" % path): - if "/restore.state" in f or "/restore-" in f: - continue - - os.unlink(f) + if os.path.basename(f) != "restore.state" \ + and not os.path.basename(f).startswith("restore-"): + os.unlink(f) def add_output(s): @@ -1500,7 +1499,7 @@ def do_site_restore(opts, info, site=None): with open(backup_path, "r") as backup_file: s = RestoreStream(stream=backup_file, is_alive=lambda: False, - key_ident=g_job_config.get("encrypt")) + key_ident=g_job_config["encrypt"]) try: archive_started = False for chunk in s.process(): @@ -1719,7 +1718,7 @@ def do_system_data_restore(opts, info): def restore_system_backup(backup_path): with open(backup_path, "r") as backup_file: s = RestoreStream(stream=backup_file, is_alive=lambda: False, - key_ident=g_job_config.get("encrypt")) + key_ident=g_job_config["encrypt"]) pipein_fd, pipeout_fd = os.pipe() pipein = os.fdopen(pipein_fd) @@ -1781,7 +1780,7 @@ def mode_list(target_id, opts): sys.stdout.write(fmt_detail % ("From:", from_info)) sys.stdout.write(fmt_detail % ("Finished:", render.date_and_time(info["finished"]))) sys.stdout.write(fmt_detail % ("Size:", render.bytes(info["size"]))) - if "encrypt" in info["config"]: + if info["config"]["encrypt"] != None: sys.stdout.write(fmt_detail % ("Encrypted:", info["config"]["encrypt"])) else: sys.stdout.write(fmt_detail % ("Encrypted:", "No")) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 9a96e12..e722d0e 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -313,7 +313,7 @@ class Job(MKBackupJob, BackupEntity): def key_ident(self): - return self._config.get("encrypt") + return self._config["encrypt"] # TODO: Duplicated code with mkbackup (globalize_job_id()) @@ -746,23 +746,33 @@ class PageEditBackupJob(object): invalid_choice = "complain", )), ("schedule", self.vs_backup_schedule()), - ("compress", FixedValue(True, + ("compress", Checkbox( title = _("Compression"), help = _("Enable gzip compression of the backed up files. The tar archives " "created by the backup are gzipped during backup."), - totext = _("Compress the backed up files"), + label = _("Compress the backed up files"), )), - ("encrypt", DropdownChoice( - title = _("Encrypt"), + ("encrypt", Alternative( + title = _("Encryption"), help = _("Enable encryption of the backed up files. The tar archives " "created by the backup are encrypted using the specified key " - "during backup. You will need the private key and the passphrase " - "to decrypt the backup."), - choices = self.backup_key_choices, - invalid_choice = "complain", + "during backup. You will need the private key and the " + "passphrase to decrypt the backup."), + style = "dropdown", + elements = [ + FixedValue(None, + title = _("Do not encrypt the backup"), + totext = "", + ), + DropdownChoice( + title = _("Encrypt the backup using the key:"), + choices = self.backup_key_choices, + invalid_choice = "complain", + ), + ], )), ] + self.custom_job_attributes(), - optional_keys = ["compress", "encrypt"], + optional_keys = [], render = "form", ) @@ -861,7 +871,7 @@ class PageBackupJobState(object): def page(self): html.write("<div id=\"job_details\">") - self._show_job_details() + self.show_job_details() html.write("</div>") html.javascript("refresh_job_details('%s', '%s', %s)" % (self._update_url(), self._ident, "true" if is_site() else "false")) @@ -871,7 +881,7 @@ class PageBackupJobState(object): return "ajax_backup_job_state.py?job=%s" % self._ident - def _show_job_details(self): + def show_job_details(self): job = self._job state = job.state() @@ -975,7 +985,7 @@ class Target(BackupEntity): table.cell(_("Finished"), render.date_and_time(info["finished"])) table.cell(_("Size"), render.bytes(info["size"])) table.cell(_("Encrypted")) - if "encrypt" in info["config"]: + if info["config"]["encrypt"] != None: html.write(info["config"]["encrypt"]) else: html.write(_("No")) @@ -1678,7 +1688,7 @@ class PageBackupRestore(object): def _start_restore(self, backup_ident): backup_info = self._target.get_backup(backup_ident) - if "encrypt" in backup_info["config"]: + if backup_info["config"]["encrypt"] != None: return self._start_encrypted_restore(backup_ident, backup_info) else: return self._start_unencrypted_restore(backup_ident) @@ -1808,3 +1818,4 @@ class PageBackupRestore(object): class PageBackupRestoreState(PageBackupJobState): def __init__(self): self._job = RestoreJob(None, None) # TODO: target_ident and backup_ident needed? + self._ident = "restore" diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index aeebbe1..272242b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3184,10 +3184,22 @@ function do_job_detail_refresh(url, ident, is_site) function handle_job_detail_response(handler_data, response_body) { + // when a message was shown and now not anymore, assume the job has finished + if (document.getElementById("job_detail_msg")) + had_message = true; + else + had_message = false; + var container = document.getElementById("job_details"); container.innerHTML = response_body; - refresh_job_details(handler_data["url"], handler_data["ident"], handler_data["is_site"]); + if (!had_message) { + refresh_job_details(handler_data["url"], handler_data["ident"], handler_data["is_site"]); + } + else { + reload_sidebar(); + window.location.reload(); + } } function handle_job_detail_error(handler_data, status_code, error_msg) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c26770..4d18062 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5426,10 +5426,14 @@ class ModeBackupJobState(backup.PageBackupJobState, WatoMode): -class ModeAjaxBackupJobState(ModeBackupJobState): +class ModeAjaxBackupJobState(WatoMode): def page(self): config.need_permission("wato.backups") - self._show_job_details() + if html.var("job") == "restore": + page = backup.PageBackupRestoreState() + else: + page = ModeBackupJobState() + page.show_job_details()

8 years, 1 month

backup/target deletion: Fixed GUI styling

by Lars Michelsen

Module: check_mk Branch: master Commit: bb1cf694984c4c93f16e9f91a0c6c03af3ba81ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb1cf694984c4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 09:10:09 2016 +0200 backup/target deletion: Fixed GUI styling --- web/htdocs/backup.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index c9003ee..9a96e12 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1090,8 +1090,13 @@ class PageBackupTargets(object): self._verify_not_used(target) - if html.confirm(_("Do you really want to delete this target?"), - add_header=self.title()): + confirm = html.confirm(_("Do you really want to delete this target?"), + add_header=self.title()) + + if confirm == False: + return False + + elif confirm: targets.remove(target) targets.save() return None, _("The target has been deleted.") @@ -1651,8 +1656,13 @@ class PageBackupRestore(object): if backup_ident not in self._target.backups(): raise MKUserError(None, _("This backup does not exist.")) - if html.confirm(_("Do you really want to delete this backup?"), - add_header=self.title(), method="GET"): + confirm = html.confirm(_("Do you really want to delete this backup?"), + add_header=self.title(), method="GET") + + if confirm == False: + return False + + elif confirm: html.check_transaction() # invalidate transid self._target.remove_backup(backup_ident) return None, _("The backup has been deleted.")

8 years, 1 month

Backup/Restore job details: page is being updated automatically

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c662eb9c219e8b87e8684dfc95431563ada0f0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c662eb9c219e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 09:07:08 2016 +0200 Backup/Restore job details: page is being updated automatically --- web/htdocs/backup.py | 12 +++++++ web/htdocs/js/checkmk.js | 80 +++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 7 ++++ web/plugins/pages/wato.py | 1 + 4 files changed, 100 insertions(+) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 6952a0f..c9003ee 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -860,6 +860,18 @@ class PageBackupJobState(object): def page(self): + html.write("<div id=\"job_details\">") + self._show_job_details() + html.write("</div>") + html.javascript("refresh_job_details('%s', '%s', %s)" % + (self._update_url(), self._ident, "true" if is_site() else "false")) + + + def _update_url(self): + return "ajax_backup_job_state.py?job=%s" % self._ident + + + def _show_job_details(self): job = self._job state = job.state() diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a7baec2..aeebbe1 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3147,3 +3147,83 @@ function hide_crash_report_processing_msg() var msg = document.getElementById("pending_msg"); msg.parentNode.removeChild(msg); } + +//#. +//# .-Backup-------------------------------------------------------------. +//# | ____ _ | +//# | | __ ) __ _ ___| | ___ _ _ __ | +//# | | _ \ / _` |/ __| |/ / | | | '_ \ | +//# | | |_) | (_| | (__| <| |_| | |_) | | +//# | |____/ \__,_|\___|_|\_\\__,_| .__/ | +//# | |_| | +//# +--------------------------------------------------------------------+ +//# | | +//# '--------------------------------------------------------------------' + +function refresh_job_details(url, ident, is_site) +{ + setTimeout(function() { + do_job_detail_refresh(url, ident, is_site); + }, 1000); +} + +function do_job_detail_refresh(url, ident, is_site) +{ + call_ajax(url, { + method : "GET", + post_data : "job=" + encodeURIComponent(ident), + response_handler : handle_job_detail_response, + error_handler : handle_job_detail_error, + handler_data : { + "url" : url, + "ident" : ident, + "is_site" : is_site, + } + }); +} + +function handle_job_detail_response(handler_data, response_body) +{ + var container = document.getElementById("job_details"); + container.innerHTML = response_body; + + refresh_job_details(handler_data["url"], handler_data["ident"], handler_data["is_site"]); +} + +function handle_job_detail_error(handler_data, status_code, error_msg) +{ + hide_job_detail_msg(); + + if (status_code == 0) + return; // ajax request aborted. Stop refresh. + + var container = document.getElementById("job_details"); + + var msg = document.createElement("div"); + container.insertBefore(msg, container.firstChild); + msg.setAttribute("id", "job_detail_msg"); + msg.className = "message"; + + txt = "Could not update the job details."; + if (handler_data.is_site) + txt += " The site will be started again after the restore."; + else + txt += " Maybe the device is currently being rebooted."; + + txt += "<br>Will continue trying to refresh the job details."; + + txt += "<br><br>HTTP status code: "+status_code; + if (error_msg) + txt += ", Error: "+error_msg; + + msg.innerHTML = txt; + + refresh_job_details(handler_data["url"], handler_data["ident"], handler_data["is_site"]); +} + +function hide_job_detail_msg() +{ + var msg = document.getElementById("job_detail_msg"); + if (msg) + msg.parentNode.removeChild(msg); +} diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1d41c8c..2c26770 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5426,6 +5426,13 @@ class ModeBackupJobState(backup.PageBackupJobState, WatoMode): +class ModeAjaxBackupJobState(ModeBackupJobState): + def page(self): + config.need_permission("wato.backups") + self._show_job_details() + + + class SiteBackupKeypairStore(backup.BackupKeypairStore): def __init__(self): super(SiteBackupKeypairStore, self).__init__( diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 10ecf98..f9a702d 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -40,4 +40,5 @@ pagehandlers.update({ "wato_ajax_execute_check" : wato.ajax_execute_check, "download_agent_output" : wato.page_download_agent_output, "ajax_popup_move_to_folder" : wato.ajax_popup_move_to_folder, + "ajax_backup_job_state" : lambda: wato.ModeAjaxBackupJobState().page(), })

8 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016