Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

Check_MK Git: check_mk: FIX: Fixed problem with complaining empty ListOf() valuespecs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cd0f1149784f5fb829b0029581cffd508b8fb96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cd0f1149784f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 15:32:35 2012 +0200 FIX: Fixed problem with complaining empty ListOf() valuespecs --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 7 +++++-- web/htdocs/valuespec.py | 7 +++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6a68c3..3b703ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice + WATO + * FIX: Fixed problem with complaining empty ListOf() valuespecs + 1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cc5a93a..abbec9a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -303,9 +303,12 @@ class html: self.write('<br>'.join(self.user_errors.values())) self.write('</div>\n') - def hidden_field(self, var, value): + def hidden_field(self, var, value, id = None, add_var = False): if value != None: - self.write("<input type=hidden name=%s value=\"%s\">" % (var, attrencode(value))) + id = id and ' id="%s"' % id or '' + self.write("<input type=hidden name=%s value=\"%s\"%s>" % (var, attrencode(value), id)) + if add_var: + self.add_form_var(var) # Beware: call this method just before end_form(). It will # add all current non-underscored HTML variables as hiddedn diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0ed7ab5..54bd2ae 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -631,8 +631,11 @@ class ListOf(ValueSpec): if html.has_var("%s_count" % varprefix): value = self.from_html_vars(varprefix) - html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % - (varprefix, len(value), varprefix)) + html.hidden_field('%s_count' % varprefix, + str(len(value)), + id = '%s_count' % varprefix, + add_var = True + ) # Render reference element for cloning html.write('<table style="display:none" id="%s_prototype">' % varprefix)

12 years

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: 4c35273fc129ba500a6d698d0410c321f38a9946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c35273fc129ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 16:30:33 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: .bugs/761 ---

12 years

Check_MK Git: check_mk: Updated bug entries #0773

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e2bb973558eec577680eff5d05013b16459c105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e2bb973558eec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 15:21:06 2012 +0200 Updated bug entries #0773 --- .bugs/773 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/773 b/.bugs/773 index 4456cd4..270158c 100644 --- a/.bugs/773 +++ b/.bugs/773 @@ -1,10 +1,13 @@ Title: Available snapins: layout of WATO.Quickaccess garbled Component: multisite -State: open +Class: nastiness +State: done Date: 2012-06-14 15:18:42 Targetversion: 1.2.0 -Class: nastiness The changes button overlaps with the icons. But only in the add snapin dialog. Some style seems to be missing here... + +2012-09-24 14:08:20: changed state open -> done +Fixed by Lars.

12 years

Check_MK Git: check_mk: Updated bug entries #0761, #0723

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4143f9de93d4a0a878197cd80a4d54acbce6d63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4143f9de93d4a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 14:07:18 2012 +0200 Updated bug entries #0761, #0723 --- .bugs/723 | 7 +++++-- .bugs/761 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/723 b/.bugs/723 index eecd7ef..d98a119 100644 --- a/.bugs/723 +++ b/.bugs/723 @@ -1,12 +1,15 @@ Title: Simulation mode overrides usewalk_hosts Component: core -State: open +Class: nastiness +State: wontfix Date: 2012-08-16 12:55:42 Targetversion: 1.2.0 -Class: nastiness If you have some hosts defined as usewalk hosts so that they'll check based on their already recorded snmpwalks and then enable simulation_mode, it breaks usewalk for some reason. The result is that the snmp devices are checked against 127.0.0.1. This is a big problem if you simulate a customer site. + +2012-09-24 14:06:03: changed state open -> wontfix +Thats the way we want it to be. diff --git a/.bugs/761 b/.bugs/761 index c3c2287..0302f87 100644 --- a/.bugs/761 +++ b/.bugs/761 @@ -1,11 +1,14 @@ Title: ValueSpec ListOf breaks during user input error Component: multisite -State: open +Class: bug +State: done Date: 2012-05-30 10:23:56 Targetversion: 1.2.0 -Class: bug When an element of a ListOf() raises a user validation error then the total ListOf() seems to fall back to its original value - for example I've added a value and then changed its position to top and then saved. + +2012-09-24 14:07:12: changed state open -> done +Repaired.

12 years

Check_MK Git: check_mk: ValueSpec Dict: new horizontal layout possible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08dd7535c575fcbcdd530d03936b8583fef47e29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08dd7535c575fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 13:56:33 2012 +0200 ValueSpec Dict: new horizontal layout possible --- web/htdocs/htmllib.py | 5 +++- web/htdocs/valuespec.py | 63 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cc5a93a..ca5ae2e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -642,7 +642,10 @@ class html: # Check if the current form is currently filled in (i.e. we display # the form a second time while showing value typed in at the first # time and complaining about invalid user input) - def form_filled_in(self): + def form_filled_in(self, form_name = None): + if form_name == None: + form_name = self.form_name + return self.has_var("filled_in") and ( self.form_name == None or \ self.form_name in self.list_var("filled_in")) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8fce87b..cb1495f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1297,18 +1297,25 @@ class AbsoluteDate(ValueSpec): if self._label: html.write("%s " % self._label) - html.write('<table class=vs_date>') if self._show_titles: + html.write('<table class=vs_date>') html.write('<tr><th>%s</th><th>%s</th><th>%s</th></tr>' % ( _("Year"), _("Month"), _("Day"))) - html.write('<tr><td>') + html.write('<tr><td>') year, month, day = self.split_date(value) html.number_input(varprefix + "_year", year, size=4) - html.write('</td><td>') + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") html.number_input(varprefix + "_month", month, size=2) - html.write('</td><td>') + if self._show_titles: + html.write('</td><td>') + else: + html.write(" ") html.number_input(varprefix + "_day", day, size=2) - html.write('</td></tr></table>') + if self._show_titles: + html.write('</td></tr></table>') def set_focus(self, varprefix): html.set_focus(varprefix + "_year") @@ -1760,12 +1767,14 @@ class Dictionary(ValueSpec): if self._render == "form": self.render_input_form(varprefix, value) else: - self.render_input_normal(varprefix, value) + self.render_input_normal(varprefix, value, self._render == "oneline") - def render_input_normal(self, varprefix, value): - html.write("<table class=dictionary>") + def render_input_normal(self, varprefix, value, oneline = False): + if not oneline: + html.write("<table class=dictionary>") for param, vs in self._elements: - html.write('<tr><td class=dictleft>') + if not oneline: + html.write('<tr><td class=dictleft>') div_id = varprefix + "_d_" + param vp = varprefix + "_p_" + param if self._optional_keys and param not in self._required_keys: @@ -1779,22 +1788,29 @@ class Dictionary(ValueSpec): visible = True if vs.title(): html.write(" %s" % vs.title()) + if oneline: + html.write(": ") if self._columns == 2: if vs.title(): html.write(':') html.help(vs.help()) - html.write('</td><td class=dictright>') + if not oneline: + html.write('</td><td class=dictright>') else: - html.write("<br>") + if not oneline: + html.write("<br>") html.write('<div class=dictelement id="%s" style="display: %s">' % ( - div_id, not visible and "none" or "")) + div_id, not visible and "none" or (oneline and "inline-block" or ""))) if self._columns == 1: html.help(vs.help()) vs.render_input(vp, value.get(param, vs.default_value())) - html.write("</div></td></tr>") - html.write("</table>") + html.write("</div>") + if not oneline: + html.write("</td></tr>") + if not oneline: + html.write("</table>") def render_input_form(self, varprefix, value): if self._headers: @@ -1849,14 +1865,27 @@ class Dictionary(ValueSpec): return def_val def value_to_text(self, value): + oneline = self._render == "oneline" if not value: return self._empty_text - s = '<table>' + + if not oneline: + s = '<table>' + else: + s = "" for param, vs in self._elements: if param in value: - s += "<tr><td>%s</td><td>%s</td></tr>" % (vs.title(), vs.value_to_text(value[param])) - return s + '</table>' + text = vs.value_to_text(value[param]) + if oneline: + if param != self._elements[0][0]: + s += ", " + s += "%s: %s" % (vs.title(), text) + else: + s += "<tr><td>%s</td><td>%s</td></tr>" % (vs.title(), text) + if not oneline: + s += '</table>' + return s def from_html_vars(self, varprefix): value = {}

12 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: f9729e8ab3c86146bda2a234a660d54ad8353e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9729e8ab3c861… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 24 13:56:40 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Fixed reged handling in check_http

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04eaaa97ddc98bc7e2c095033158ec74affe977d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04eaaa97ddc98b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 12:02:53 2012 +0200 Fixed reged handling in check_http --- checks/check_http | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/check_http b/checks/check_http index 46bfbb5..9a3f31c 100644 --- a/checks/check_http +++ b/checks/check_http @@ -84,9 +84,11 @@ def check_http_arguments(params): args += ' -s %s' % quote_shell_string(settings["expect_string"]) if "expect_regex" in settings: - args += ' -r %s' % quote_shell_string(settings['expect_regex'][0]) if settings['expect_regex'][1]: args += ' -R' + else: + args += ' -r' + args += ' %s' % quote_shell_string(settings['expect_regex'][0]) if settings['expect_regex'][2]: args += ' --invert-regex'

12 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: 0ec0d7a83c4cedc5bc514a99b36f44f43e3ccd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec0d7a83c4ced… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 24 12:03:02 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Fixed missing sign

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b10577949beb0a9ae57fb8e9caa12dde4963cc49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b10577949beb0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:56:34 2012 +0200 Fixed missing sign --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20c81a4..129299c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.1i1 +1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and "comment" are allowed. Options are kept in an optional dict at the

12 years

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: 42c1ef80253e3d5212c467d0a41a6c24cb5d2201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c1ef80253e3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 11:54:15 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits