Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: ValueSpec Dict: replace magic by a more safe value

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1829d42cb00acc54cbde701471ab84fc8615e957 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1829d42cb00acc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 31 10:06:50 2012 +0200 ValueSpec Dict: replace magic by a more safe value --- web/htdocs/valuespec.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e4a117f..3e71ef4 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -544,7 +544,7 @@ class ListOf(ValueSpec): def __init__(self, valuespec, **kwargs): ValueSpec.__init__(self, **kwargs) self._valuespec = valuespec - self._magic = kwargs.get("magic", "@") + self._magic = kwargs.get("magic", "@!@") self._rowlabel = kwargs.get("row_label") self._add_label = kwargs.get("add_label", _("Add new element")) self._movable = kwargs.get("movable", True) @@ -1639,6 +1639,7 @@ class Dictionary(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] + self._required_keys = kwargs.get("required_keys", []) if "optional_keys" in kwargs: ok = kwargs["optional_keys"] if type(ok) == list: @@ -1652,7 +1653,6 @@ class Dictionary(ValueSpec): else: self._optional_keys = True - self._required_keys = kwargs.get("required_keys", []) self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() self._headers = kwargs.get("headers")

12 years, 4 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: bd71848faa16f3b546d2ba8ff72b17ff28543fac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd71848faa16f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 1 08:56:49 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Allow choices of ListChoice to be a function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5857a9a5640e8ad05cc87f7339bbd2dd6670d43d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5857a9a5640e8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 1 07:42:17 2012 +0200 Allow choices of ListChoice to be a function --- web/htdocs/valuespec.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3e71ef4..4394e70 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -972,7 +972,10 @@ class ListChoice(ValueSpec): # In case of overloaded functions with dynamic elements def load_elements(self): if self._choices != None: - self._elements = self._choices + if type(self._choices) == list: + self._elements = self._choices + else: + self._elements = self._choices() return if self._loaded_at != id(html):

12 years, 4 months

Check_MK Git: check_mk: New ValueSpec for ID

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b7fee695df13b43ff4bf8504d2e338c340e54df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7fee695df13b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 1 08:15:01 2012 +0200 New ValueSpec for ID --- web/htdocs/valuespec.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4394e70..a80f9ef 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -320,6 +320,14 @@ class TextAscii(ValueSpec): if not self._regex.match(value): raise MKUserError(varprefix, self.title() + ": " + self._regex_error) +# Internal ID as used in many places (for contact names, group name, +# an so on) +class ID(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._regex = re.compile('^[a-zA-Z_][-a-zA-Z0-9_]*$') + self._regex_error = _("An identifier must only consist of letters, digits, dash and underscore and it must start with a letter or underscore.") + class RegExp(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs)

12 years, 4 months

Check_MK Git: check_mk: WATO: more save resetting of config variables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fa02af81f3c6e0b41334d7b89bf16ba018de3ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fa02af81f3c6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 1 08:07:49 2012 +0200 WATO: more save resetting of config variables --- web/htdocs/wato.py | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ef18a6d..567e75c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5191,7 +5191,7 @@ def mode_globalvars(phase): varname = html.var("_varname") action = html.var("_action") if varname: - domain, valuespec, need_restart = g_configvars[varname] + domain, valuespec, need_restart, allow_reset = g_configvars[varname] def_value = default_values.get(varname, valuespec.canonical_value()) if action == "reset" and not isinstance(valuespec, Checkbox): @@ -5288,12 +5288,22 @@ def mode_edit_configvar(phase): return varname = html.var("varname") - domain, valuespec, need_restart = g_configvars[varname] + domain, valuespec, need_restart, allow_reset = g_configvars[varname] current_settings = load_configuration_settings() is_on_default = varname not in current_settings if phase == "action": if html.var("reset"): + if not isinstance(valuespec, Checkbox): + c = wato_confirm( + _("Resetting configuration variable"), + _("Do you really want to reset this configuration variable " + "back to its default value?")) + if c == False: + return "" + elif c == None: + return None + del current_settings[varname] msg = _("Resetted configuration variable %s to its default.") % varname else: @@ -5345,7 +5355,7 @@ def mode_edit_configvar(phase): forms.end() html.button("save", _("Save")) - if not is_on_default: + if allow_reset and not is_on_default: curvalue = current_settings[varname] html.button("reset", curvalue == defvalue and _("Remove explicit setting") or _("Reset to default")) html.hidden_fields() @@ -5355,9 +5365,9 @@ g_configvars = {} g_configvar_groups = {} # domain is one of "check_mk", "multisite" or "nagios" -def register_configvar(group, varname, valuespec, domain="check_mk", need_restart=False): +def register_configvar(group, varname, valuespec, domain="check_mk", need_restart=False, allow_reset=True): g_configvar_groups.setdefault(group, []).append((domain, varname, valuespec)) - g_configvars[varname] = domain, valuespec, need_restart + g_configvars[varname] = domain, valuespec, need_restart, allow_reset g_configvar_domains = { "check_mk" : { @@ -5416,7 +5426,7 @@ def load_configuration_vars(filename, settings): def save_configuration_settings(vars): per_domain = {} - for varname, (domain, valuespec, need_restart) in g_configvars.items(): + for varname, (domain, valuespec, need_restart, allow_reset) in g_configvars.items(): if varname not in vars: continue per_domain.setdefault(domain, {})[varname] = vars[varname]

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed "select all" button in hosts & folders for IE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66910da849de27ee78460475ca553f481ca45a27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66910da849de27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 1 08:46:17 2012 +0200 FIX: Fixed "select all" button in hosts & folders for IE --- ChangeLog | 4 ++++ web/htdocs/js/checkmk.js | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f0e2f5..8995898 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * Make heading in each page clickable -> reload page * FIX: Edit view: couldn't edit filter settings + WATO: + * IX: Fixed "select all" button in hosts & folders for IE + Core: * FIX: Fixed "make_utf is not defined" error when having custom timeperiods defined in WATO @@ -13,6 +16,7 @@ * AIX: New check aix_multipath: Supports checking native AIX multipathing from AIX 5.2 onward * Solaris: New check solaris_multipath: Supports checking native Solaris multipath from Solaris10 and up. * Solaris: The ZFS Zpool status check now looks more closely at the reported messages. (It's also tested to work on Linux now) + 1.2.0b5: Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b92519e..d3f631a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1101,7 +1101,7 @@ function toggle_all_rows(obj) { all_selected = false; else none_selected = false; - if (checkboxes[i].classList.contains('failed')) + if (checkboxes[i].classList && checkboxes[i].classList.contains('failed')) some_failed = true; }

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012