Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: WATO: All hosts in hostlists are preselected now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f88deb59ca7ad8d63fc4e099a9265731f9a25c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f88deb59ca7ad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:22:51 2011 +0200 WATO: All hosts in hostlists are preselected now --- web/htdocs/htmllib.py | 10 ---------- web/htdocs/wato.py | 4 +++- web/plugins/views/layouts.py | 10 +++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9de3262..c9cbc4d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -790,13 +790,3 @@ class html: def end_foldable_container(self): self.write("</ul>") - - def init_rowselect(self): - selected = [] - if self.has_var('selected_rows'): - selected_rows = self.var('selected_rows', '') - if selected_rows or ',' in selected_rows: - selected = selected_rows.split(',') - - self.javascript('g_selected_rows = %s;\n' - 'init_rowselect();' % repr(selected)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3eaee89..9815934 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -743,7 +743,9 @@ def mode_file(phase): html.hidden_fields() html.end_form() - html.init_rowselect() + + html.javascript('g_selected_rows = %s;\n' + 'init_rowselect();' % repr(hostnames)) # Create list of all hosts that are select with checkboxes in the current file def get_hostnames_from_checkboxes(): diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index aa3030c..8172b35 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -28,7 +28,15 @@ def init_rowselect(): # Don't make rows selectable when no commands can be fired if not 'C' in html.display_options or not config.may("act"): return - html.init_rowselect() + + selected = [] + if html.has_var('selected_rows'): + selected_rows = html.var('selected_rows', '') + if selected_rows or ',' in selected_rows: + selected = selected_rows.split(',') + + html.javascript('g_selected_rows = %s;\n' + 'init_rowselect();' % repr(selected)) def render_checkbox(view, row, num_tds): # value contains the number of columns of this datarow. This is

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dad363460df173b3446042b65ab5d4f842ab4b62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad363460df173… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:18:16 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Fixed problem with first log entry in wato changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc379ab5f1a6eb60ea6850ffe0ab9236df03ecb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc379ab5f1a6eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:18:14 2011 +0200 Fixed problem with first log entry in wato changelog --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a1bd72a..3eaee89 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1745,7 +1745,7 @@ def paged_log(log): break if last_log_index is None: - last_log_index = len(log) - 1 + last_log_index = len(log) return log[first_log_index:last_log_index], (start_time, end_time, previous_log_time, next_log_time)

13 years

Check_MK Git: check_mk: Minor code optimization for WATO titles in Multisite

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f90c0530c07cafc937e9b66086eaf8a26512ef4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90c0530c07caf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:18:09 2011 +0200 Minor code optimization for WATO titles in Multisite --- web/plugins/views/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 827c13b..21da9bb 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -78,9 +78,9 @@ class FilterWatoFile(Filter): # file titles and so on. # The call below needs to use some sort of indicator wether the cache needs # to be renewed or not. - self.load_wato_data() current = html.var(self.name) if current and current != "/": + self.load_wato_data() return self.path_to_tree.get(current)

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 424eb344a691259b478e9a435638d14c8d859863 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424eb344a69125… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:18:11 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: WATO Changelog paging showing only date

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08afa76d2322c4d87f186a902f4dc1eb52c05a63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08afa76d2322c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 11:55:19 2011 +0200 WATO Changelog paging showing only date --- web/htdocs/wato.py | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d44c016..1d9070d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1703,9 +1703,6 @@ def get_timerange(t): end = start + 86399 return start, end -def fmt_datetime(t): - return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) - def fmt_date(t): return time.strftime('%Y-%m-%d', time.localtime(t)) @@ -1751,12 +1748,12 @@ def paged_log(log): def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('<div class=paged_controls>') - html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_datetime(start_time), - fmt_datetime(end_time)))) + html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_date(start_time), + fmt_date(end_time)))) if previous_log_time is not None: html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), - title = '%s: %s' % (_("Older events"), fmt_datetime(previous_log_time))) + title = '%s: %s' % (_("Older events"), fmt_date(previous_log_time))) else: html.buttonlink(html.makeuri([]), _("<"), disabled = True) @@ -1765,7 +1762,7 @@ def display_paged((start_time, end_time, previous_log_time, next_log_time)): if next_log_time is not None: html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), - title = '%s: %s' % (_("Newer events"), fmt_datetime(next_log_time))) + title = '%s: %s' % (_("Newer events"), fmt_date(next_log_time))) else: html.buttonlink(html.makeuri([]), _(">"), disabled = True) html.write('</div>')

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aa6dcac6749f2cf2cec20f031d816ced4a4c709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aa6dcac6749f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 11:55:24 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0665745bd7f8f77958dfabc707958e4d77754d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0665745bd7f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:56:44 2011 +0200 Updated bug entries --- .bugs/368 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/368 b/.bugs/368 new file mode 100644 index 0000000..5ea3bfb --- /dev/null +++ b/.bugs/368 @@ -0,0 +1,13 @@ +Title: WATO: implement finer permissions +Component: wato +Benefit: 2 +State: open +Cost: 2 +Date: 2011-09-08 10:55:44 +Class: feature + +I think we need or finely granular permission +system, for example permissions for +- downloading backups +- restoring backups +- restarting nagios

13 years

Check_MK Git: check_mk: Minor fixes in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ddcff590fbb215de2f6cc97f995102aebed5a30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ddcff590fbb21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:05:48 2011 +0200 Minor fixes in WATO --- web/htdocs/wato.py | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d44c016..32b4de4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -463,9 +463,12 @@ def mode_editfolder(phase, what, new): if new: attributes = { } parent = g_folder - else: + elif the_what == "folder": attributes = the_thing.get("attributes", {}) parent = g_folder.get(".parent") + else: # host list from current folder + attributes = the_thing.get("attributes", {}) + parent = g_folder configure_attributes({what: attributes}, "folder", parent, the_thing) @@ -979,13 +982,6 @@ def mode_snapshot(phase): snapshots.append(f) snapshots.sort(reverse=True) - html.write("<br>") - html.begin_form("upload_form", None, "POST") - html.upload_file("_upload_file") - html.button("upload_button", _("Restore from file"), "submit") - html.hidden_fields() - html.end_form() - if len(snapshots) == 0: html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") else: @@ -1002,6 +998,14 @@ def mode_snapshot(phase): html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("_download_file", name)]), name)) html.write('</table>') + html.write("<h3>" + _("Restore from uploaded file") + "</h3>") + html.begin_form("upload_form", None, "POST") + html.upload_file("_upload_file") + html.button("upload_button", _("Restore from file"), "submit") + html.hidden_fields() + html.end_form() + + def create_snapshot(): if not os.path.exists(snapshot_dir): os.mkdir(snapshot_dir) @@ -1015,7 +1019,7 @@ def create_snapshot(): tar.add(os.path.join(root,filename), os.path.join(root[len_abs:], filename)) tar.close() - log_pending(None, "snapshot-created", _("Created snapshot %s") % snapshot_name) + log_audit(None, "snapshot-created", _("Created snapshot %s") % snapshot_name) # Maintenance, remove old snapshots snapshots = []

13 years

Check_MK Git: check_mk: WATO: fix problem in import function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d0d6cd5286027ff5876b5e539b7c7d2353be030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d0d6cd5286027… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:07:11 2011 +0200 WATO: fix problem in import function --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 32b4de4..16ba1e4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1270,7 +1270,7 @@ def create_target_file_from_aliaspath(aliaspath): # Now folder points to the folder the host needs to be created # in. In that folder we put the host into the host list "hosts.mk". - if "hosts" not in folder[".files"]: + if "hosts.mk" not in folder[".files"]: new_file = { ".name" : "hosts.mk", ".path" : folder[".path"] + ("hosts.mk",),

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits