Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Filter for times now accept ranges (from ... until)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d113085b3ac282432ac4d2b8b12deba85151491 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d113085b3ac28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 17:07:27 2012 +0200 Filter for times now accept ranges (from ... until) --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 +- web/htdocs/views.css | 33 +++++++++-- web/htdocs/views.py | 41 ++++++++------ web/plugins/views/filters.py | 129 +++++++++++++++++++++++------------------- 5 files changed, 127 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d113085b3…

12 years, 5 months

Check_MK Git: check_mk: Global settings: make boolean switches directly togglable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08a5e301ee06f39dd932d31e5ca1b3e76521adce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08a5e301ee06f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 16:21:43 2012 +0200 Global settings: make boolean switches directly togglable --- ChangeLog | 1 + web/htdocs/wato.css | 5 ++++ web/htdocs/wato.py | 57 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 310c645..0e5a18a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ WATO: * Reimplemented folder listing in host/folders module * Redesigned the breadcrumb navigation + * Global settings: make boolean switches directly togglable * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fb8422b..94d3a83 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -664,6 +664,11 @@ table.validationerror img { font-size: 8pt; } +.wato table.data.globalvars img.iconbutton { + width: 60px; + height: 16px; +} + /* configuration overview */ .wato table.configmodules { empty-cells: show; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8708765..b165568 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4688,26 +4688,46 @@ def mode_globalvars(phase): current_settings = load_configuration_settings() if phase == "action": - varname = html.var("_reset") + varname = html.var("_varname") + action = html.var("_action") if varname: domain, valuespec, need_restart = g_configvars[varname] def_value = default_values.get(varname, valuespec.canonical_value()) - c = wato_confirm( - _("Resetting configuration variable"), - _("Do you really want to reset the configuration variable %s " - "back to the default value of <tt>%s</tt>?") % - (varname, valuespec.value_to_text(def_value))) + if action == "reset" and not isinstance(valuespec, Checkbox): + c = wato_confirm( + _("Resetting configuration variable"), + _("Do you really want to reset the configuration variable %s " + "back to the default value of <tt>%s</tt>?") % + (varname, valuespec.value_to_text(def_value))) + else: + if not html.check_transaction(): + return + c = True # no confirmation for direct toggle if c: - del current_settings[varname] + if action == "reset": + del current_settings[varname] + msg = _("Resetted configuration variable %s to its default.") % varname + else: + if varname in current_settings: + current_settings[varname] = not current_settings[varname] + else: + current_settings[varname] = not def_value + msg = _("Changed Configuration variable %s to %s." % (varname, + current_settings[varname] and "on" or "off")) save_configuration_settings(current_settings) - msg = _("Resetted configuration variable %s to its default.") % varname log_pending(need_restart and SYNCRESTART or SYNC, None, "edit-configvar", msg) - return "globalvars", msg + if action == "_reset": + return "globalvars", msg + else: + return "globalvars" elif c == False: return "" else: return None + else: + return + groupnames = g_configvar_groups.keys() groupnames.sort() @@ -4737,17 +4757,30 @@ def mode_globalvars(phase): html.write('<td class=title><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) if not config.wato_hide_varnames: html.write('<td class=varname><tt>%s</tt></td>' % varname) + toggle_url = make_action_link([("mode", "globalvars"), + ("_action", "toggle"), ("_varname", varname)]) if varname in current_settings: html.write('<td class=inherited>%s</td>' % valuespec.value_to_text(defaultvalue)) - html.write('<td>%s</td>' % valuespec.value_to_text(current_settings[varname])) + html.write('<td>') + if isinstance(valuespec, Checkbox): + html.icon_button(toggle_url, _("Immediately toggle this setting"), + "snapin_switch_" + (current_settings[varname] and "on" or "off")) + else: + html.write('%s' % valuespec.value_to_text(current_settings[varname])) + html.write("</td>") else: html.write('<td>%s</td>' % valuespec.value_to_text(defaultvalue)) - html.write('<td></td>') + html.write('<td>') + if isinstance(valuespec, Checkbox): + html.icon_button(toggle_url, _("Immediately toggle this setting"), + "snapin_switch_" + (defaultvalue and "on" or "off")) + html.write('</td>') html.write("<td class=buttons>") # html.buttonlink(edit_url, _("Edit")) if varname in current_settings: - reset_url = make_action_link([("mode", "globalvars"), ("_reset", varname)]) + reset_url = make_action_link([("mode", "globalvars"), + ("_action", "reset"), ("_varname", varname)]) html.buttonlink(reset_url, _("Reset")) html.write("</td>")

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0607

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ab11a012edbcf8efbbdcfd943297ecd59f42d5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab11a012edbcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:51:49 2012 +0200 Updated bug entries #0607 --- .bugs/607 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.bugs/607 b/.bugs/607 index 0dcb48f..cf78e7e 100644 --- a/.bugs/607 +++ b/.bugs/607 @@ -15,3 +15,4 @@ Fehler muss wo anders liegen. Lars: Ich kann das bestätigen. Das ist offenbar ein Caching Problem. Ich habe gerade die start_url geändert und nach einigen Seitenaufrufen wieder auf den Default Wert zurückgesetzt. Jetzt lädt aber immer noch die zwischendurch gesetzte URL. +Ein "omd restart apache" behebt das Problem.

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11a7070ecbe4d1de82fabc2277648cb5e46feac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11a7070ecbe4d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 16:26:34 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0696, #0697, #0607

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3be400fe0eb1a9cc3a6c73d16633a07e6b24a85c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be400fe0eb1a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:51:16 2012 +0200 Updated bug entries #0696, #0697, #0607 --- .bugs/607 | 6 +++++- .bugs/696 | 9 +++++++++ .bugs/697 | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/.bugs/607 b/.bugs/607 index 660fb24..0dcb48f 100644 --- a/.bugs/607 +++ b/.bugs/607 @@ -3,7 +3,7 @@ Component: wato State: open Date: 2012-01-27 14:46:10 Targetversion: 1.2.0 -Class: nastiness +Class: bug Das Ändern der Einstellung: wato_activation_method über Wato erfordert einen Apache restart damit es funktioniert. Wato führt diesen jedoch nicht aus. @@ -11,3 +11,7 @@ Apache restart damit es funktioniert. Wato führt diesen jedoch nicht aus. Mathias: Das kann eigentlich nicht so sein. Änderungen in multisite.mk brauchen nie einen Neustart. WATO kann auch keinen Neustart von Apache machen. Der Fehler muss wo anders liegen. + +Lars: Ich kann das bestätigen. Das ist offenbar ein Caching Problem. Ich habe gerade +die start_url geändert und nach einigen Seitenaufrufen wieder auf den Default Wert +zurückgesetzt. Jetzt lädt aber immer noch die zwischendurch gesetzte URL. diff --git a/.bugs/696 b/.bugs/696 new file mode 100644 index 0000000..7d1e74a --- /dev/null +++ b/.bugs/696 @@ -0,0 +1,9 @@ +Title: WATO host/folder move to: Visualize folder tree +Component: wato +State: open +Date: 2012-04-25 12:44:55 +Targetversion: 1.2.0 +Class: nastiness + +The display text in the dropdown fields has to visualize the folder hierarchy. +At the moment there is only a plain list shown in the dropdown field. diff --git a/.bugs/697 b/.bugs/697 new file mode 100644 index 0000000..141900d --- /dev/null +++ b/.bugs/697 @@ -0,0 +1,9 @@ +Title: WATO host/folders - <form> must not be nested +Component: wato +State: open +Date: 2012-04-25 12:47:08 +Targetversion: 1.2.0 +Class: bug + +It is not allowed to have nested forms. The search host form must be moved outside the +host table form.

12 years, 5 months

Check_MK Git: check_mk: Remove unused variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fe4ba9d37d7d365feb20a4dae9be6a53dd4e526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fe4ba9d37d7d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 25 15:53:03 2012 +0200 Remove unused variable --- .bugs/681 | 10 ++++++++++ web/htdocs/wato.py | 1 - 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/.bugs/681 b/.bugs/681 new file mode 100644 index 0000000..70ff811 --- /dev/null +++ b/.bugs/681 @@ -0,0 +1,10 @@ +Title: load_plugins should raise error if plugin is broken +Component: multisite +State: open +Date: 2012-04-25 10:45:52 +Targetversion: 1.2.0 +Class: nastiness + +When loading plugins (e.g. WATO rule_specs), and there is a syntax +or other error in the plugin, an Exception should be raised. +Currently the plugin is silently ignored. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fe2801f..e89a814 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8210,7 +8210,6 @@ def mode_edit_hosttag(phase): html.write("</td></tr>") # Choices - num_choices = 16 html.write("<tr><td class=legend>") html.write(_("Choices") + " " + _("The first choice of a tag group will be its default value. "

12 years, 5 months

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: b876e5ee16f309e1b02384b993d5a4efae6f06b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b876e5ee16f309… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 25 15:53:19 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0693, #0694, #0695

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f69b62793796c84373ba56fabd203104a178a5d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f69b62793796c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:41:37 2012 +0200 Updated bug entries #0693, #0694, #0695 --- .bugs/693 | 9 +++++++++ .bugs/694 | 9 +++++++++ .bugs/695 | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/.bugs/693 b/.bugs/693 new file mode 100644 index 0000000..cefd1b7 --- /dev/null +++ b/.bugs/693 @@ -0,0 +1,9 @@ +Title: Acknowledge WATO pending changes when applying config by using cmk +Component: core +State: open +Date: 2012-04-25 12:23:47 +Targetversion: future +Class: nastiness + +It confuses users that a manual restart via "cmk" command does not acknowledge the pending +changes which can be found in the wato changelog. diff --git a/.bugs/694 b/.bugs/694 new file mode 100644 index 0000000..11d7174 --- /dev/null +++ b/.bugs/694 @@ -0,0 +1,9 @@ +Title: Allow umlauts in mail addresses +Component: wato +State: open +Date: 2012-04-25 12:25:47 +Targetversion: 1.2.0 +Class: nastiness + +The mail addresses in contacts deny umlauts. But it is possible to use umlauts as mail prefix +and also in umlaut domains. diff --git a/.bugs/695 b/.bugs/695 new file mode 100644 index 0000000..5f13780 --- /dev/null +++ b/.bugs/695 @@ -0,0 +1,15 @@ +Title: Configuring timeperiod exceptions is buggy +Component: wato +State: open +Date: 2012-04-25 12:34:06 +Targetversion: 1.2.0 +Class: bug + +- When creating one timeperiod exception it is ok. When changing the definition in the first field + WATO creates a second exception entry from it but leaves the old. + +- Deleting an exception is not possible. It remains when clearing the fields. + +- On user errors the form focuses the alias field all the time. + +Possible fix: Migrate to valuespecs.

12 years, 5 months

Check_MK Git: check_mk: Fixed umlaut problems in host ip addresses generated by WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2302ed9063d2fab7a5da780a230bf905c6ab1d11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2302ed9063d2fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:12:35 2012 +0200 Fixed umlaut problems in host ip addresses generated by WATO --- ChangeLog | 2 +- modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7306b5..dafbcdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,7 @@ * Reimplemented folder listing in host/folders module * Redesigned the breadcrumb navigation * FIX: fix page header after confirmation dialogs - * FIX: fixed umlaut problem in host aliases created by WATO + * FIX: fixed umlaut problem in host aliases and ip addresses created by WATO 1.2.0b2: Core: diff --git a/modules/check_mk.py b/modules/check_mk.py index 20e654e..a1b0c66 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1471,7 +1471,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write("\ndefine host {\n") outfile.write(" host_name\t\t\t%s\n" % hostname) outfile.write(" use\t\t\t\t%s\n" % (is_clust and cluster_template or host_template)) - outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) + outfile.write(" address\t\t\t%s\n" % (ip and ip.encode('utf-8') or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) # Levels for host check

12 years, 5 months

Check_MK Git: check_mk: FIX: Fixed exception caused by validation problems during editing tags in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c43c77c691ebeaa024a4e29ce5f2362ff6d606d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c43c77c691ebe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:14:23 2012 +0200 FIX: Fixed exception caused by validation problems during editing tags in WATO --- ChangeLog | 3 ++- web/htdocs/valuespec.py | 13 ++----------- web/htdocs/wato.py | 7 +++---- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index dafbcdc..310c645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,8 @@ * Reimplemented folder listing in host/folders module * Redesigned the breadcrumb navigation * FIX: fix page header after confirmation dialogs - * FIX: fixed umlaut problem in host aliases and ip addresses created by WATO + * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO + * FIX: Fixed exception caused by validation problems during editing tags in WATO 1.2.0b2: Core: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ca8fd11..8607b14 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -593,11 +593,6 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) - if html.has_var(varprefix + "_count"): # already filled in, complain - value = [None] * int(html.var(varprefix + "_count")) - # the underlying render_input-functions should ignore the - # value in this case themselves, so that the "None" should not - # harm here. for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) @@ -1384,12 +1379,8 @@ class Tuple(ValueSpec): if not self._vertical: html.write("<tr>") - # If the form is already filled in and we are in complain mode, - # the value in value must be ignored - if html.form_filled_in(): - value = (None,) * len(self._elements) - - for no, (element, val) in enumerate(zip(self._elements, value)): + for no, element in enumerate(self._elements): + val = value[no] vp = varprefix + "_" + str(no) if element.help(): help = " %s" % element.help() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 936b071..57ad9e0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8031,10 +8031,9 @@ def mode_edit_hosttag(phase): return hosttags, auxtags = load_hosttags() - if new: - title = "" - choices = [] - else: + title = "" + choices = [] + if not new: for id, tit, ch in hosttags: if id == tag_id: title = tit

12 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012