Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Valuespec: Cascading dropdown now able to work with choice function

by Andreas Boesl

Module: check_mk Branch: master Commit: ce6fa948a24b2c8c2e2cbaddd818f128d3814188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce6fa948a24b2c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 21 13:22:35 2013 +0100 Valuespec: Cascading dropdown now able to work with choice function --- ChangeLog | 1 + web/htdocs/valuespec.py | 54 +++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 675abba..208e8c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ WATO: * Configuration of datasource programs via dedicated rules * New editor for Business Intelligence rules + * Valuespec: CascadingDropdown now able to process choice values from functions 1.2.2b4: Core: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 76921d2..9b519ce 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -940,34 +940,48 @@ class MonitoringState(DropdownChoice): class CascadingDropdown(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._choices = [] - for entry in kwargs["choices"]: - if len(entry) == 2: # plain entry with no sub-valuespec - entry = entry + (None,) # normlize to three entries - self._choices.append(entry) + + if type(kwargs["choices"]) == list: + self._choices = [] + for entry in kwargs["choices"]: + if len(entry) == 2: # plain entry with no sub-valuespec + entry = entry + (None,) # normlize to three entries + self._choices.append(entry) + else: + self._choices = kwargs["choices"] # function + self._separator = kwargs.get("separator", ", ") self._html_separator = kwargs.get("html_separator", "<br>") self._sorted = kwargs.get("sorted", True) + def choices(self): + if type(self._choices) == list: + return self._choices + else: + return self._choices() + def canonical_value(self): - if self._choices[0][2]: - return (self._choices[0][0], self._choices[0][2].canonical_value()) + choices = self.choices() + if choices[0][2]: + return (choices[0][0], choices[0][2].canonical_value()) else: - return self._choices[0][0] + return choices[0][0] def default_value(self): try: return self._default_value except: - if self._choices[0][2]: - return (self._choices[0][0], self._choices[0][2].default_value()) + choices = self.choices() + if choices[0][2]: + return (choices[0][0], choices[0][2].default_value()) else: - return self._choices[0][0] + return choices[0][0] def render_input(self, varprefix, value): def_val = '0' options = [] - for nr, (val, title, vs) in enumerate(self._choices): + choices = self.choices() + for nr, (val, title, vs) in enumerate(choices): options.append((str(nr), title)) # Determine the default value for the select, so the # the dropdown pre-selects the line corresponding with value. @@ -979,7 +993,7 @@ class CascadingDropdown(ValueSpec): def_val = str(nr) vp = varprefix + "_sel" - onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices)) + onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(choices)) if self._sorted: html.select(vp, options, def_val, onchange=onchange) else: @@ -992,7 +1006,7 @@ class CascadingDropdown(ValueSpec): cur_val = html.var(vp) html.write(self._html_separator) - for nr, (val, title, vs) in enumerate(self._choices): + for nr, (val, title, vs) in enumerate(choices): if vs: vp = varprefix + "_%d" % nr # Form already submitted once (and probably in complain state) @@ -1016,7 +1030,8 @@ class CascadingDropdown(ValueSpec): html.write('</span>') def value_to_text(self, value): - for val, title, vs in self._choices: + choices = self.choices() + for val, title, vs in choices: if (vs and value[0] == val) or \ (value == val): if not vs: @@ -1027,17 +1042,19 @@ class CascadingDropdown(ValueSpec): return "" # Nothing selected? Should never happen def from_html_vars(self, varprefix): + choices = self.choices() try: sel = int(html.var(varprefix + "_sel")) except: sel = 0 - val, title, vs = self._choices[sel] + val, title, vs = choices[sel] if vs: val = (val, vs.from_html_vars(varprefix + "_%d" % sel)) return val def validate_datatype(self, value, varprefix): - for nr, (val, title, vs) in enumerate(self._choices): + choices = self.choices() + for nr, (val, title, vs) in enumerate(choices): if value == val or ( type(value) == tuple and value[0] == val): if vs: @@ -1048,7 +1065,8 @@ class CascadingDropdown(ValueSpec): raise MKUserError(_("Value %r is not allowed here.") % value) def validate_value(self, value, varprefix): - for nr, (val, title, vs) in enumerate(self._choices): + choices = self.choices() + for nr, (val, title, vs) in enumerate(choices): if value == val or ( type(value) == tuple and value[0] == val): if vs:

11 years, 6 months

Check_MK Git: check_mk: FIX: stop doing snapin refreshes after they have been removed

by Mathias Kettner

Module: check_mk Branch: master Commit: e479724e670e64fb6048f464e3ecd09615538cbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e479724e670e64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 11:16:34 2013 +0100 FIX: stop doing snapin refreshes after they have been removed --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7598ac5..675abba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * FIX: Fixed wrong localization right after a user changed its language * FIX: Improved handling of error messages in bulk inventory * FIX: fixed focus bug in transform valuespec class + * FIX: stop doing snapin refreshes after they have been removed BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index dee1f28..6e70150 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -546,6 +546,15 @@ function removeSnapin(id, code) { var myparent = container.parentNode; myparent.removeChild(container); + // remove this snapin from the refresh list, if it is contained + for (var i in refresh_snapins) { + var name = refresh_snapins[i][0]; + if (id == "snapin_" + name) { + refresh_snapins.splice(i, 1); + break; + } + } + // reload main frame if it is just displaying the "add snapin" page var href = escape(parent.frames[1].location); if (href.indexOf("sidebar_add_snapin.py") > -1) @@ -642,7 +651,7 @@ function sidebar_scheduler() { var name = refresh_snapins[i][0]; var refresh = refresh_snapins[i][1]; var url = "sidebar_snapin.py?name=" + name; - if(refresh_snapins[i][2] != '') + if (refresh_snapins[i][2] != '') url = refresh_snapins[i][2]; if (timestamp % refresh == 0) {

11 years, 6 months

Check_MK Git: check_mk: FIX: fix style of mouse pointer over BI boxes

by Mathias Kettner

Module: check_mk Branch: master Commit: e7758f876e34ce6efa0a4d135375609df25f2ce8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7758f876e34ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 11:01:29 2013 +0100 FIX: fix style of mouse pointer over BI boxes --- ChangeLog | 3 ++- web/htdocs/bi.css | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a69fca..7598ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,10 +35,10 @@ * FIX: WATO configuration of filesystem trends: it's hours, not days! * FIX: mysql: fixed crash on computing IO information * FIX: diskstat: fix local variable 'ios_per_sec' referenced before assignment + * FIX: multipath: ignore warning messages in agent due to invalid multipath.conf * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups - * FIX: multipath: ignore warning messages in agent due to invalid multipath.conf Multisite: * FIX: Fixed problem with error during localization scanning @@ -50,6 +50,7 @@ * FIX: fixed invalid links to hosts and services in BI tree view * FIX: fix exception in top/down and bottom/up views * FIX: fix styling of top/down and bottom/up views (borders, padding) + * FIX: fix style of mouse pointer over BI boxes * Make titles of non-leaf tree nodes klickable WATO: diff --git a/web/htdocs/bi.css b/web/htdocs/bi.css index 473ecb1..89ca387 100644 --- a/web/htdocs/bi.css +++ b/web/htdocs/bi.css @@ -136,6 +136,7 @@ td.aggrtree_box { border-style: solid; margin: 0px 0px 0px 0px; padding: 1px 3px; + cursor: pointer; } .bibox_box.open.noleaf { box-shadow: inset 0.5px 0.5px 3px #444;

11 years, 6 months

Check_MK Git: check_mk: New configuration variable contactgroup_members

by Mathias Kettner

Module: check_mk Branch: master Commit: e7652b819f346d17e057b936d3b01e1c11e50d33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7652b819f346d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 10:55:48 2013 +0100 New configuration variable contactgroup_members --- ChangeLog | 1 + modules/check_mk.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d0445c..3a69fca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ 1.2.2b4: Core: * FIX: Fix output of cmk -D: datasource programs were missing + * New configuration variable contactgroup_members Checks & Agents: * FIX: smart - not trying to parse unhandled lines to prevent errors diff --git a/modules/check_mk.py b/modules/check_mk.py index fa427bd..395a858 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -289,6 +289,7 @@ parents = [] define_hostgroups = None define_servicegroups = None define_contactgroups = None +contactgroup_members = {} contacts = {} timeperiods = {} # needed for WATO clusters = {} @@ -2044,8 +2045,11 @@ def create_nagios_config_contactgroups(outfile): alias = name outfile.write("\ndefine contactgroup {\n" " contactgroup_name\t\t%s\n" - " alias\t\t\t\t%s\n" - "}\n" % (name, make_utf8(alias))) + " alias\t\t\t\t%s\n" % (name, make_utf8(alias))) + members = contactgroup_members.get(name) + if members: + outfile.write(" members\t\t\t%s\n" % ",".join(members)) + outfile.write("}\n") def create_nagios_config_commands(outfile):

11 years, 6 months

Check_MK Git: check_mk: Wiki Snapin: use foldable containers

by Mathias Kettner

Module: check_mk Branch: master Commit: 2020652042e0b29f81a3dee24bac4fe95b4b3417 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2020652042e0b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 10:42:16 2013 +0100 Wiki Snapin: use foldable containers --- doc/treasures/wiki_snapin.py | 60 ++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 28 deletions(-) diff --git a/doc/treasures/wiki_snapin.py b/doc/treasures/wiki_snapin.py index b65111b..e9c070e 100644 --- a/doc/treasures/wiki_snapin.py +++ b/doc/treasures/wiki_snapin.py @@ -38,19 +38,24 @@ def render_wiki(): start_ul = True ul_started = False try: + title = None for line in file(filename).readlines(): line = line.strip() if line == "": if ul_started == True: - html.write("</ul>") + html.end_foldable_container() start_ul = True ul_started = False + elif line.endswith(":"): + title = line[:-1] elif line == "----": - html.write("<hr>") + pass + # html.write("<br>") elif line.startswith("*"): if start_ul == True: - html.write("<ul>") + if title: + html.begin_foldable_container("wikisnapin", title, True, title, indent=True) start_ul = False ul_started = True @@ -67,9 +72,7 @@ def render_wiki(): if link.startswith("http://") or link.startswith("https://"): - html.write('<li>') simplelink(name, link, "_blank") - html.write('</li>') else: erg = name.split(':') if len(erg) > 0: @@ -99,27 +102,28 @@ def render_wiki(): html.text_input("search", "", id="wikisearch_input", ) html.end_form() - -sidebar_snapins["wiki"] = { - "title" : _("Wiki"), - "description" : _("Shows the Wiki Navigation of the OMD Site"), - "render" : render_wiki, - "allowed" : [ "admin", "user", "guest" ], - "styles" : """ - input#wikisearch_input { - margin-top: 3px; - width: 222px; - } - #snapin_container_wiki hr { - margin: 2px; - margin-bottom: 2.5px; +if defaults.omd_root: + sidebar_snapins["wiki"] = { + "title" : _("Wiki"), + "description" : _("Shows the Wiki Navigation of the OMD Site"), + "render" : render_wiki, + "allowed" : [ "admin", "user", "guest" ], + "styles" : """ + #snapin_container_wiki div.content { + font-weight: bold; + color: white; + } + input#wikisearch_input { + margin-top: 3px; + width: 222px; + } + #snapin_container_wiki hr { + margin: 5px 2px; + } + #snapin_container_wiki ul { + margin: 1px; + } + + """ } - #snapin_container_wiki ul { - margin: 1px; - } - - """ - - -} - +

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 12f686af4a61fa7b1566f76f7f9bf54428504ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12f686af4a61fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 20 15:26:09 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: FIX: multipath: ignore warning messages in agent due to invalid multipath.conf

by Mathias Kettner

Module: check_mk Branch: master Commit: 3ffaecd934c133c88f2c10663382fb06799bbc97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ffaecd934c133… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 20 15:25:51 2013 +0100 FIX: multipath: ignore warning messages in agent due to invalid multipath.conf --- ChangeLog | 1 + checks/multipath | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7c1632..1d0445c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups + * FIX: multipath: ignore warning messages in agent due to invalid multipath.conf Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/checks/multipath b/checks/multipath index c95514d..4ae6cdd 100644 --- a/checks/multipath +++ b/checks/multipath @@ -156,6 +156,10 @@ def parse_multipath_output(info, only_uuid = None): group = {} numpaths = None for line in info: + # Ignore error messages due to invalid multipath.conf + if line[0] == "multipath.conf": + continue + # newer agent also output the device mapper table. # ignore those lines for now. if line[0] == "dm":

11 years, 6 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 3510f355856e5b46b4b9ba11f467ae31c920e598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3510f355856e5b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 20 14:55:36 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: transform valuespec: using self. _back function on default and canonical value

by Andreas Boesl

Module: check_mk Branch: master Commit: 69c26ac3c1f3e18aea5b40ba0291701b271268c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c26ac3c1f3e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 20 14:56:19 2013 +0100 transform valuespec: using self._back function on default and canonical 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 beac6c8..76921d2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2175,10 +2175,10 @@ class Transform(ValueSpec): self._valuespec.set_focus(*args) def canonical_value(self): - return self._valuespec.canonical_value() + return self._back(self._valuespec.canonical_value()) def default_value(self): - return self._valuespec.default_value() + return self._back(self._valuespec.default_value()) def value_to_text(self, value): return self._valuespec.value_to_text(self.forth(value))

11 years, 6 months

Check_MK Git: check_mk: WATO: finally explained match value in register_rule

by Andreas Boesl

Module: check_mk Branch: master Commit: 72b0db743638938a2d6317de4b9b2daa0eaaa160 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72b0db74363893… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 20 14:55:32 2013 +0100 WATO: finally explained match value in register_rule --- 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 a599191..27a3b7e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10727,7 +10727,7 @@ def register_rule(group, varname, valuespec = None, title = None, "itemname" : itemname, # e.g. "mount point" "itemhelp" : itemhelp, # a description of the item, only rarely used "itemenum" : itemenum, # possible fixed values for items - "match" : match, + "match" : match, # used by WATO rule analyzer (green and grey balls) "title" : title or valuespec.title(), "help" : help or valuespec.help(), "optional" : optional, # rule may be None (like only_hosts)

11 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013