Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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, 1 month

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: d8d8bad39ab7b84a153cdf4fbc7a31f752d53a9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8d8bad39ab7b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:22:48 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Table snapshots: fix HTML tag order

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 821c571c46e63808c14cf24144bd7d10583b94d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=821c571c46e638… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 21:48:30 2012 +0200 Table snapshots: fix HTML tag order --- 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 36a1a98..0cbf419 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4987,8 +4987,8 @@ def mode_snapshot(phase): if len(snapshots) == 0: html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") else: - html.write('<table class=data>') html.write('<h3>' + _("Snapshots") + '</h3>') + html.write('<table class=data>') html.write("<tr>") html.write("<th>%s</th>" % _("Actions")) html.write("<th>%s</th>" % _("Filename"))

12 years, 1 month

Check_MK Git: check_mk: new ValueSpec MonitoringState removes reduntant code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c05b8ed51cab545d6946d70db554ffc3cae5669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c05b8ed51cab5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 12:35:46 2012 +0200 new ValueSpec MonitoringState removes reduntant code --- web/htdocs/valuespec.py | 10 ++++++++++ web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 21 +++++---------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5e3e858..1a5c77d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -772,6 +772,16 @@ class DropdownChoice(ValueSpec): ", ".join([v for (v,t) in self._choices])) +# Special conveniance variant for monitoring states +class MonitoringState(DropdownChoice): + def __init__(self, **kwargs): + choices = [ ( 0, _("OK")), + ( 1, _("WARN")), + ( 2, _("CRIT")), + ( 3, _("UNKNOWN")) ] + kwargs.setdefault("default_value", 0) + DropdownChoice.__init__(self, choices=choices, **kwargs) + # A Dropdown choice where the elements are ValueSpecs. # The currently selected ValueSpec will be displayed. # The text representations of the ValueSpecs will be used as texts. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4aa2ce..36a1a98 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9944,7 +9944,7 @@ def mode_edit_rule(phase): forms.section("") for posneg, img in [ ("positive", "yes"), ("negative", "no")]: val = img == "yes" - html.write('<img align=top src="images/rule_%s.png"> ' % img) + html.write('<img class=ruleyesno align=top src="images/rule_%s.png"> ' % img) html.radiobutton("value", img, value == val, _("Make the outcome of the ruleset <b>%s</b><br>") % posneg) # Conditions diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d06f2fa..bcaadcf 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1176,16 +1176,10 @@ checkgroups.append(( ( "auto", _("auto") ), ( "unknown", _("unknown (old agent)") ), ]), - DropdownChoice( + MonitoringState( title = _("Resulting state"), - default_value = 0, - choices = [ - ( 0, _("OK")), - ( 1, _("WARN")), - ( 2, _("CRIT")), - ( 3, _("UNKNWON")), - ]), - ], + ), + ], default_value = ( "running", "auto", 0)), title = _("Services states"), help = _("You can specify a separate monitoring state for each possible " @@ -1193,15 +1187,10 @@ checkgroups.append(( "this parameter, then only running/auto will be assumed to be OK."), )), ( "else", - DropdownChoice( + MonitoringState( title = _("State if no entry matches"), default_value = 2, - choices = [ - ( 0, _("OK")), - ( 1, _("WARN")), - ( 2, _("CRIT")), - ( 3, _("UNKNWON")), - ]), + ), ),] ), TextAscii(

12 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012