Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Fixed restore dialog when using encrypted backups

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c6f64dd1c58a3bf2a5451588b017808f325e122 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c6f64dd1c58a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 07:53:42 2016 +0200 Fixed restore dialog when using encrypted backups --- web/htdocs/backup.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index fbbf0f7..6952a0f 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1692,10 +1692,13 @@ class PageBackupRestore(object): except MKUserError, e: html.add_user_error(e.varname, e) - html.header(_("Insert passphrase")) - html.begin_context_buttons() - html.context_button(_("Back"), html.makeuri([("mode", "backup_restore")]), "back") - html.end_context_buttons() + # Special handling for Check_MK / CMA differences + if is_site(): + html.header(_("Insert passphrase")) + html.begin_context_buttons() + html.context_button(_("Back"), html.makeuri([("mode", "backup_restore")]), "back") + html.end_context_buttons() + html.show_user_errors() html.write("<p>%s</p>" % _("To be able to decrypt and restore the encrypted backup, you need to enter the "

8 years, 1 month

backup restore: some cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 076943453c3e84bb919bea67559bb9d9fc18e6df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=076943453c3e84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 18:11:27 2016 +0200 backup restore: some cleanups --- web/htdocs/backup.py | 10 ++++++---- web/htdocs/images/icon_backup_restore_complete.png | Bin 0 -> 2217 bytes web/htdocs/wato.py | 10 ++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 124d8a6..fbbf0f7 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1578,13 +1578,13 @@ class PageBackupRestore(object): self._target_ident = ident try: - self._get_target(self._target_ident) + self._target = self._get_target(self._target_ident) except KeyError: raise MKUserError("target_p_target", _("This backup target does not exist.")) def _get_target(self, target_ident): - raise NotImplementedError() + return self.targets().get(target_ident) def title(self): @@ -1763,10 +1763,12 @@ class PageBackupRestore(object): self._show_backup_list() else: + self._show_target_list() + + + def _show_target_list(self): html.p(_("Please choose a target to perform the restore from.")) self.targets().show_list() - SystemBackupTargetsReadOnly().show_list(editable=False, - title=_("System global targets")) def _show_backup_list(self): diff --git a/web/htdocs/images/icon_backup_restore_complete.png b/web/htdocs/images/icon_backup_restore_complete.png new file mode 100644 index 0000000..328493e Binary files /dev/null and b/web/htdocs/images/icon_backup_restore_complete.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c90f1c6..1d41c8c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5474,9 +5474,15 @@ class ModeBackupRestore(backup.PageBackupRestore, WatoMode): def _get_target(self, target_ident): try: - self._target = self.targets().get(target_ident) + return self.targets().get(target_ident) except KeyError: - self._target = backup.SystemBackupTargetsReadOnly().get(target_ident) + return backup.SystemBackupTargetsReadOnly().get(target_ident) + + + def _show_target_list(self): + super(ModeBackupRestore, self)._show_target_list() + backup.SystemBackupTargetsReadOnly().show_list( + editable=False, title=_("System global targets")) def _show_backup_list(self):

8 years, 1 month

Minor cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 8929403fb1c98e52652888ce7ed6c655ef7468a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8929403fb1c98e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 12:58:56 2016 +0200 Minor cleanup --- web/htdocs/htmllib.py | 60 +++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0885ee1..04bd1aa 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -258,12 +258,6 @@ class html(GUITester): self.flush() self.plugged = False - def heading(self, text): - self.write("<h2>%s</h2>\n" % text) - - def rule(self): - self.write("<hr/>") - def age_text(self, timedif): timedif = int(timedif) if timedif < 120: @@ -345,22 +339,6 @@ class html(GUITester): self.write('<br>'.join(self.user_errors.values())) self.write('</div>\n') - - def hidden_field(self, *args, **kwargs): - self.write(self.render_hidden_field(*args, **kwargs)) - - - def render_hidden_field(self, var, value, id=None, add_var=False): - if value == None: - return "" - - if add_var: - self.add_form_var(var) - - id = id and ' id="%s"' % self.attrencode(id) or '' - return "<input type=\"hidden\" name=\"%s\" value=\"%s\"%s />" % \ - (self.attrencode(var), self.attrencode(value), id) - # Beware: call this method just before end_form(). It will # add all current non-underscored HTML variables as hiddedn # field to the form - *if* they are not used in any input @@ -411,6 +389,43 @@ class html(GUITester): def makeactionuri_contextless(self, addvars, filename=None): return self.makeuri_contextless(addvars + [("_transid", self.get_transid())], filename=filename) + + # + # Generic HTML rendering and writing functions + # + + def heading(self, text): + self.write("<h2>%s</h2>\n" % text) + + + def rule(self): + self.write("<hr/>") + + + def p(self, content): + self.write("<p>%s</p>" % self.attrencode(content)) + + + # + # HTML form rendering + # + + + def hidden_field(self, *args, **kwargs): + self.write(self.render_hidden_field(*args, **kwargs)) + + + def render_hidden_field(self, var, value, id=None, add_var=False): + if value == None: + return "" + + if add_var: + self.add_form_var(var) + + id = id and ' id="%s"' % self.attrencode(id) or '' + return "<input type=\"hidden\" name=\"%s\" value=\"%s\"%s />" % \ + (self.attrencode(var), self.attrencode(value), id) + def image_button(self, varname, title, cssclass = '', style=None): if not self.mobile: self.write('<label for="%s" class="image_button"%s>' % @@ -419,6 +434,7 @@ class html(GUITester): if not self.mobile: self.write('</label>') + def button(self, *args, **kwargs): self.image_button(*args, **kwargs)

8 years, 1 month

Backup restore: Reworked restore dialogs

by Lars Michelsen

Module: check_mk Branch: master Commit: d88d787ec3a8917fad983d8b395ac17331aa956e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d88d787ec3a891… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 17:52:28 2016 +0200 Backup restore: Reworked restore dialogs --- web/htdocs/backup.py | 152 ++++++++++---------- web/htdocs/images/button_backup_restore.png | Bin 0 -> 2653 bytes ...store_stop.png => icon_backup_restore_stop.png} | Bin 796 -> 796 bytes web/htdocs/wato.py | 32 +---- 4 files changed, 79 insertions(+), 105 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d88d787ec3…

8 years, 1 month

Restore of backups cleans up backup job states

by Lars Michelsen

Module: check_mk Branch: master Commit: 14fd737950040bf43eef559c53ecd885d2c3b44d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14fd737950040b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 17:58:13 2016 +0200 Restore of backups cleans up backup job states --- bin/.f12 | 2 +- bin/mkbackup | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bin/.f12 b/bin/.f12 index 5b9bf09..f9f022e 100644 --- a/bin/.f12 +++ b/bin/.f12 @@ -4,7 +4,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} OMD_ROOT=/omd/sites/${SITE} make -sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup pwquery $OMD_ROOT/bin/ +sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup $OMD_ROOT/bin/ sudo chown root.omd $OMD_ROOT/bin/mkeventd_open514 sudo chmod 4750 $OMD_ROOT/bin/mkeventd_open514 echo "Installed to $OMD_ROOT/bin" diff --git a/bin/mkbackup b/bin/mkbackup index 18926be..e791c8d 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1373,6 +1373,19 @@ def state_path(): return "%s/%s.state" % (path, name) +def cleanup_backup_job_states(): + if is_root(): + path = "/var/lib/mkbackup" + else: + 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) + + def add_output(s): state = load_state() state["output"] += s @@ -1740,6 +1753,7 @@ def read_from_tarfile_threaded(s, pipeout_fd): def complete_restore(): + cleanup_backup_job_states() state = load_state() duration = time.time() - state["started"] log("--- Restore completed (Duration: %s, IO: %s/s) ---" %

8 years, 1 month

WATO snapshots are not accessible through GUI anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bb3e1605b1efcb9da68badf983188cb9d1993b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bb3e1605b1efc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 15:37:58 2016 +0200 WATO snapshots are not accessible through GUI anymore Please use the new backup system for real backups of your monitoring environment. Some kind of smaller section backup may come soon. --- web/htdocs/wato.py | 353 ------------------------------------ web/plugins/wato/backup_domains.py | 4 +- 2 files changed, 3 insertions(+), 354 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bb3e1605b…

8 years, 1 month

Fix recent exception in WATO GIT commit messages

by Mathias Kettner

Module: check_mk Branch: master Commit: fe23c9a17762a3e1900a68eec9363febe449fdeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe23c9a17762a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 26 14:23:56 2016 +0200 Fix recent exception in WATO GIT commit messages --- web/htdocs/watolib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 049f1b7..b88d836 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -204,6 +204,8 @@ def log_entry(linkinfo, action, message, logfilename, user_id = None): def log_audit(linkinfo, what, message, user_id = None): if config.wato_use_git: + if isinstance(message, HTML): + message = html.strip_tags(message.value) g_git_messages.append(message) log_entry(linkinfo, what, message, "audit.log", user_id)

8 years, 1 month

A bit longer fields for backup titles

by Mathias Kettner

Module: check_mk Branch: master Commit: 497de8142521d3e0a04f794269f8fdaf72bb56c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=497de8142521d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 26 13:22:13 2016 +0200 A bit longer fields for backup titles --- web/htdocs/backup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index cd79a4c..f2c6564 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -733,6 +733,7 @@ class PageEditBackupJob(object): ("title", TextUnicode( title = _("Title"), allow_empty = False, + size = 64, )), ("target", DropdownChoice( title = _("Target"), @@ -1165,6 +1166,7 @@ class PageEditBackupTarget(object): ("title", TextUnicode( title = _("Title"), allow_empty = False, + size = 64, )), ("remote", CascadingDropdown( title = _("Destination"), @@ -1301,9 +1303,11 @@ class BackupTargetLocal(BackupTargetType): "network share on your own."), allow_empty = False, validate = cls.validate_local_directory, + size = 64, )), ("is_mountpoint", Checkbox( - title = _("Is mountpoint"), + title = _("Mountpoint"), + label = _("Is mountpoint"), help = _("When this is checked, the backup ensures that the configured path " "is a mountpoint. If there is no active mount on the path, the backup " "fails with an error message."),

8 years, 1 month

Hiding Cma free and total memory

by Lars Michelsen

Module: check_mk Branch: master Commit: 174a2fd8110ca253f48b9fd3ce2c24d4f8515203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174a2fd8110ca2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 12:57:00 2016 +0200 Hiding Cma free and total memory --- web/plugins/metrics/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 27a6ab4..b4cb8ad 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3848,6 +3848,8 @@ check_metrics["check_mk-mem.linux"] = { "inactive" : { "name" : "mem_lnx_inactive", "auto_graph" : False }, "total_used" : { "name" : "mem_lnx_total_used", "auto_graph" : False }, "unevictable" : { "name" : "mem_lnx_unevictable", "auto_graph" : False }, + "cma_free" : { "auto_graph" : False }, + "cma_total" : { "auto_graph" : False }, } check_metrics["check_mk-mem.vmalloc"] = {

8 years, 1 month

Fixed exception in recent implemented scientific graph value rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: c2c2d4df95e2fd271992c3a645f3a978cd776e4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2c2d4df95e2fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 11:57:14 2016 +0200 Fixed exception in recent implemented scientific graph value rendering --- web/htdocs/lib.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 79c77f4..29b9062 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -485,6 +485,11 @@ def frexp10(x): def render_scientific(v, precision=3): + if v == 0: + return "0" + elif v < 0: + return "-" + render_scientific(v, precision) + mantissa, exponent = frexp10(float(v)) # Render small numbers without exponent if exponent >= -3 and exponent <= 4:

8 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
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