Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64329 discussions

Check_MK Git: check_mk: FIX: Edit view: could not edit filter settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3df61a777d233880e63cfb4e53200737ba31b8f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df61a777d2338… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 21:21:33 2012 +0200 FIX: Edit view: could not edit filter settings --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d277058..9cdee8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page + * FIX: Edit view: couldn't edit filter settings Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 695a2ee..b92519e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -294,13 +294,18 @@ function filter_activation(oSelect) oDiv.setAttribute("className", "filtersetting " + usage); oDiv.setAttribute("class", "filtersetting " + usage); + // If the filter is not in state hard or show, disable filter + // input var disabled = usage != "hard" && usage != "show"; - var oNode; - for (var i in oDiv.childNodes) { - oNode = oDiv.childNodes[i]; - if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { - oNode.disabled = disabled; + var oFloatFilter = oSelect.nextSibling; + if (oFloatFilter) { + for (var i in oFloatFilter.childNodes) { + oNode = oFloatFilter.childNodes[i]; + if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { + oNode.disabled = disabled; + } } + oFloatFilter = null; } p = null;

12 years, 4 months

Check_MK Git: check_mk: Styling: color of Livestatus headers in debug mode black

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d14841c3e05d62b657c00be7c772b047677354c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d14841c3e05d62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 22:44:37 2012 +0200 Styling: color of Livestatus headers in debug mode black --- web/htdocs/check_mk.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8cc0988..a533478 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -221,6 +221,7 @@ div.livestatus.message { left: 10px; font-size: 8pt; z-index: 20; + color: black; } /*-------------------------------------------------------------------------.

12 years, 4 months

Check_MK Git: check_mk: Generlize concept of configuration domains ( for mkeventd)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e95a3a710da63b239d4fef0d2cc79e821b1cb0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e95a3a710da63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 15:21:06 2012 +0200 Generlize concept of configuration domains (for mkeventd) --- web/htdocs/wato.py | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0cbf419..17b07fc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5350,6 +5350,19 @@ def register_configvar(group, varname, valuespec, domain="check_mk", need_restar g_configvar_groups.setdefault(group, []).append((domain, varname, valuespec)) g_configvars[varname] = domain, valuespec, need_restart +g_configvar_domains = { + "check_mk" : { + "configdir" : root_dir, + }, + "multisite" : { + "configdir" : multisite_dir, + }, +} + +def register_configvar_domain(domain, configdir): + g_configvar_domains[domain] = { + "configdir" : configdir, + } # Persistenz: Speicherung der Werte # - WATO speichert seine Variablen für main.mk in conf.d/wato/global.mk @@ -5369,8 +5382,8 @@ def register_configvar(group, varname, valuespec, domain="check_mk", need_restar def load_configuration_settings(): settings = {} - load_configuration_vars(multisite_dir + "global.mk", settings) - load_configuration_vars(root_dir + "global.mk", settings) + for domain, domain_info in g_configvar_domains.items(): + load_configuration_vars(domain_info["configdir"] + "global.mk", settings) return settings @@ -5397,10 +5410,10 @@ def save_configuration_settings(vars): continue per_domain.setdefault(domain, {})[varname] = vars[varname] - make_nagios_directory(root_dir) - save_configuration_vars(per_domain.get("check_mk", {}), root_dir + "global.mk") - make_nagios_directory(multisite_dir) - save_configuration_vars(per_domain.get("multisite", {}), multisite_dir + "global.mk") + for domain, domain_info in g_configvar_domains.items(): + dir = domain_info["configdir"] + make_nagios_directory(dir) + save_configuration_vars(per_domain.get(domain, {}), dir + "global.mk") def save_configuration_vars(vars, filename): out = create_user_file(filename, 'w')

12 years, 4 months

Check_MK Git: check_mk: Added icon buttons for top and bottom

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19a795076a9d98127bb0dacbc8c84c090524aebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19a795076a9d98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 09:47:29 2012 +0200 Added icon buttons for top and bottom --- web/htdocs/images/button_bottom_hi.png | Bin 0 -> 2594 bytes web/htdocs/images/button_bottom_lo.png | Bin 0 -> 3102 bytes web/htdocs/images/button_top_hi.png | Bin 0 -> 2531 bytes web/htdocs/images/button_top_lo.png | Bin 0 -> 2963 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_bottom_hi.png b/web/htdocs/images/button_bottom_hi.png new file mode 100644 index 0000000..0030078 Binary files /dev/null and b/web/htdocs/images/button_bottom_hi.png differ diff --git a/web/htdocs/images/button_bottom_lo.png b/web/htdocs/images/button_bottom_lo.png new file mode 100644 index 0000000..fab3d34 Binary files /dev/null and b/web/htdocs/images/button_bottom_lo.png differ diff --git a/web/htdocs/images/button_top_hi.png b/web/htdocs/images/button_top_hi.png new file mode 100644 index 0000000..adffe9f Binary files /dev/null and b/web/htdocs/images/button_top_hi.png differ diff --git a/web/htdocs/images/button_top_lo.png b/web/htdocs/images/button_top_lo.png new file mode 100644 index 0000000..fb43a06 Binary files /dev/null and b/web/htdocs/images/button_top_lo.png differ

12 years, 4 months

Check_MK Git: check_mk: Removed the word Nagios from user output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 100e2087b54e28f145af44a4d8f6d645f910dc90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=100e2087b54e28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 16:01:55 2012 +0200 Removed the word Nagios from user output --- web/htdocs/views.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5635f3e..6fec2c6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2077,15 +2077,15 @@ def do_actions(view, what, action_rows, backurl): count = 0 for row in action_rows: - nagios_commands, title, executor = core_command(what, row) - for command in nagios_commands: + core_commands, title, executor = core_command(what, row) + for command in core_commands: if type(command) == unicode: command = command.encode("utf-8") executor(command, row["site"]) count += 1 if command: - message = _("Successfully sent %d commands to Nagios.") % count + message = _("Successfully sent %d commands.") % count if config.debug: message += _("The last one was: <pre>%s</pre>") % command if html.output_format == "html": # sorry for this hack

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0760

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78bca86cc4339e7d29d68af1d1d7d1bd112ea8d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78bca86cc4339e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 16:17:35 2012 +0200 Updated bug entries #0760 --- .bugs/760 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/760 b/.bugs/760 new file mode 100644 index 0000000..8896902 --- /dev/null +++ b/.bugs/760 @@ -0,0 +1,10 @@ +Title: View checkboxes: Request-URI Too Large +Component: multisite +State: open +Date: 2012-05-28 16:16:51 +Targetversion: 1.2.0 +Class: bug + +If you select too many checkboxes in a Multisite view +and execute a command, then you will get a +"Request-URI Too Large".

12 years, 4 months

Check_MK Git: check_mk: ValueSpec Dictionary: new rendering function, fix focus code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fbaa0c2412a2c42aa6ef5b68ca6a237c551ba8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fbaa0c2412a2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 11:04:28 2012 +0200 ValueSpec Dictionary: new rendering function, fix focus code --- web/htdocs/valuespec.py | 36 +++++++++++++++++++++++++++++++++--- web/htdocs/wato.py | 12 +++++++++--- web/plugins/sidebar/wato.py | 4 +++- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 62ee869..5e3e858 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1,4 +1,4 @@ - +#!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time, re, sre_constants, urlparse +import math, os, time, re, sre_constants, urlparse, forms from lib import * # Abstract base class of all value declaration classes. @@ -1613,8 +1613,15 @@ class Dictionary(ValueSpec): self._optional_keys = kwargs.get("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() def render_input(self, varprefix, value): + if self._render == "form": + self.render_input_form(varprefix, value) + else: + self.render_input_normal(varprefix, value) + + def render_input_normal(self, varprefix, value): html.write("<table class=dictionary>") for param, vs in self._elements: html.write("<tr><td class=dictleft>") @@ -1646,8 +1653,31 @@ class Dictionary(ValueSpec): html.write("</div></td></tr>") html.write("</table>") + def render_input_form(self, varprefix, value): + forms.header(self.title()) + for param, vs in self._elements: + div_id = varprefix + "_d_" + param + vp = varprefix + "_p_" + param + if self._optional_keys and param not in self._required_keys: + visible = html.get_checkbox(vp + "_USE") + if visible == None: + visible = param in value + onclick = "valuespec_toggle_option(this, %r)" % div_id + checkbox_code = '<input type=checkbox name="%s" %s onclick="%s">' % ( + vp + "_USE", visible and "CHECKED" or "", onclick) + forms.section(vs.title(), checkbox=checkbox_code) + else: + visible = True + forms.section(vs.title()) + + html.write('<div id="%s" style="display: %s">' % ( + div_id, not visible and "none" or "")) + html.help(vs.help()) + vs.render_input(vp, value.get(param, vs.default_value())) + html.write("</div>") + def set_focus(self, varprefix): - self._elements[0][1].set_focus(varprefix + self._elements[0][0]) + self._elements[0][1].set_focus(varprefix + "_p_" + self._elements[0][0]) def canonical_value(self): return dict([ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7bd373f..e4aa2ce 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -256,7 +256,9 @@ def page_handler(): # he needs an explicit access permission for doing changes: if config.may("wato.seeall"): for pname in modeperms: - config.need_permission("wato." + pname) + if '.' not in pname: + pname = "wato." + pname + config.need_permission(pname) result = modefunc("action") if type(result) == tuple: @@ -287,7 +289,9 @@ def page_handler(): # Check general permissions for the new mode if not config.may("wato.seeall"): for pname in modeperms: - config.need_permission("wato." + pname) + if '.' not in pname: + pname = "wato." + pname + config.need_permission(pname) except MKUserError, e: action_message = e.message @@ -5136,7 +5140,9 @@ def mode_main(phase): def render_main_menu(some_modules, columns = 2): html.write('<div class="mainmenu">') for nr, (mode_or_url, title, icon, permission, help) in enumerate(some_modules): - if not config.may("wato." + permission) and not config.may("wato.seeall"): + if "." not in permission: + permission = "wato." + permission + if not config.may(permission) and not config.may("wato.seeall"): continue if '?' in mode_or_url or '/' in mode_or_url: diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 47c69ed..be085a2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -43,7 +43,9 @@ def render_wato(): iconlink(_("Main Menu"), "wato.py", "home") for mode, title, icon, permission, help in wato.modules: - if config.may("wato." + permission) or config.may("wato.seeall"): + if "." not in permission: + permission = "wato." + permission + if config.may(permission) or config.may("wato.seeall"): iconlink(title, "wato.py?mode=%s" % mode, icon) num_pending = wato.api.num_pending_changes()

12 years, 4 months

Check_MK Git: check_mk: Fix handling with optional keys in ValueSpec Dict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3600a1ba9bc80a974b076e06caf6f7d9a71ed045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3600a1ba9bc80a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 12:50:31 2012 +0200 Fix handling with optional keys in ValueSpec Dict --- web/htdocs/valuespec.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1a5c77d..cde37d2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1620,8 +1620,19 @@ class Dictionary(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] - self._optional_keys = kwargs.get("optional_keys", True) - self._required_keys = kwargs.get("required_keys", []) + if "optional_keys" in kwargs: + ok = kwargs["optional_keys"] + if type(ok) == list: + self._required_keys = \ + [ e[0] for e in self._elements if e[0] not in ok ] + self._optional_keys = True + elif ok: + self._optional_keys = True + else: + self._optional_keys = False + else: + self._optional_keys = False + 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()

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0759

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ac621f8310702ab9081b232c30e1fb7e1da2310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ac621f8310702… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 16:16:24 2012 +0200 Updated bug entries #0759 --- .bugs/759 | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/.bugs/759 b/.bugs/759 new file mode 100644 index 0000000..bd1c060 --- /dev/null +++ b/.bugs/759 @@ -0,0 +1,22 @@ +Title: Checkbox handling in views sometimes broken +Component: multisite +State: open +Date: 2012-05-28 16:13:51 +Targetversion: 1.2.0 +Class: bug + +The handling of the checkboxes in the views still has +bad control flows. The following will trigger a bug: + +1. Open a view where the checkboxes are currently off +2. Turn on the checkboxes +3. Check one of the checkboxes +4. Open the command tab and select a command +5. Do *not* confirm the command but press "No" + +Now try to turn *off* the checkboxes. This is not +working! + +Furthermore: If you now uncheck the one single +checkbox and again issue a command: it will still +think this box is checked.

12 years, 4 months

Check_MK Git: check_mk: ValuSpec Dict: allow grouping into headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45ac0456c1c9aae04b60e6db1b44a77eb936660c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45ac0456c1c9aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 09:37:17 2012 +0200 ValuSpec Dict: allow grouping into headers --- web/htdocs/valuespec.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d00b6ff..12635c5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1634,10 +1634,11 @@ class Dictionary(ValueSpec): else: self._optional_keys = False else: - self._optional_keys = False + 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") def render_input(self, varprefix, value): if self._render == "form": @@ -1678,8 +1679,18 @@ class Dictionary(ValueSpec): html.write("</table>") def render_input_form(self, varprefix, value): - forms.header(self.title()) + if self._headers: + for header, sections in self._headers: + self.render_input_form_header(varprefix, value, header, sections) + else: + self.render_input_form_header(varprefix, value, self.title(), None) + + def render_input_form_header(self, varprefix, value, title, sections): + forms.header(title) for param, vs in self._elements: + if sections and param not in sections: + continue + div_id = varprefix + "_d_" + param vp = varprefix + "_p_" + param if self._optional_keys and param not in self._required_keys:

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