Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 4039434e7a4b57823c5f3f0c4a1ebf19ca5fcfa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4039434e7a4b57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 12:01:24 2017 +0100 Updated bug entries #2550 Change-Id: I44750f4f31cc0270636264ce6df88c049900c30e --- .bugs/2550 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2550 b/.bugs/2550 new file mode 100644 index 0000000..357de72 --- /dev/null +++ b/.bugs/2550 @@ -0,0 +1,13 @@ +Title: omd restore deletes historic data if backup was done with -N +Component: core +State: open +Date: 2017-01-24 11:59:55 +Targetversion: future +Class: bug + +If you create an <tt>omd backup</tt> without historic +data then and <tt>omd restore</tt> into an existing +site should keep the existing historic data - even if that is +outdated. + +Or shouldn't it?

7 years, 5 months

agent_ruckus_spot: fixed exception in command line generation

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f9581e9f1a53445608768bd1fc7a9ab8f09f56c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f9581e9f1a534… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 24 10:47:57 2017 +0100 agent_ruckus_spot: fixed exception in command line generation Change-Id: I07292bd60e8ad890b0951471d428eddb1cec2e3f --- checks/agent_ruckus_spot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/agent_ruckus_spot b/checks/agent_ruckus_spot index a9ea100..b184e25 100644 --- a/checks/agent_ruckus_spot +++ b/checks/agent_ruckus_spot @@ -34,7 +34,7 @@ def agent_ruckus_spot_arguments(params, hostname, ipaddress): args += " --venueid " + quote_shell_string(params["venueid"]) args += " --apikey " + quote_shell_string(params["api_key"]) if "cmk_agent" in params: - args += " --agent_port " + quote_shell_string(params["cmk_agent"]["port"]) + args += " --agent_port %s" % params["cmk_agent"]["port"] return args

7 years, 5 months

table: Fixed setting odd/even css classes correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 796c710e3a42c082dfe35fd7958908404c398b14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796c710e3a42c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 24 10:42:38 2017 +0100 table: Fixed setting odd/even css classes correctly Change-Id: Ie9e63ab3b73f8ff7cc1b74902110722a9020a4cb --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 387cdc2..6b3105a 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -297,7 +297,7 @@ def _write_table(table, rows, actions_enabled, actions_visible, search_term): continue odd = "even" if odd == "odd" else "odd" - html.open_tr(class_=["data", odd, state, css if css else None]) + html.open_tr(class_=["data", "odd%d" % state, css if css else None]) for cell_content, css_classes, colspan in row: html.open_td(class_=css_classes if css_classes else None, colspan=colspan if colspan else None) html.write(cell_content)

7 years, 5 months

preliminary workaround for 'Create specific rule for ..' exception

by Andreas Boesl

Module: check_mk Branch: master Commit: c95446bbc5301feb7093096e6f712d03edb11ae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c95446bbc5301f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 24 10:01:30 2017 +0100 preliminary workaround for 'Create specific rule for ..' exception Change-Id: I329185e486f92bcd879bd75a938362f615867d36 --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c6744a9..29d5b3c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12502,7 +12502,8 @@ class ModeEditRuleset(WatoMode): html.open_td() html.button("_new_host_rule", _("Create %s specific rule for: ") % ty) html.hidden_field("host", self._hostname) - html.hidden_field("item", mk_repr(self._item)) + if self._item: + html.hidden_field("item", mk_repr(self._item)) html.close_td() html.open_td(style="vertical-align:middle") html.write_text(label)

7 years, 5 months

4014 FIX Windows Agent / Eventlogs with vista_api: Fixed numerous bugs and memory leaks

by Andreas Boesl

Module: check_mk Branch: master Commit: d83b3af059fa6b4c9421c4fd71dae39f09534db8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d83b3af059fa6b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 24 09:36:12 2017 +0100 4014 FIX Windows Agent / Eventlogs with vista_api: Fixed numerous bugs and memory leaks The windows event log monitoring through the vista api had several memory leaks. Furthermore, some logical errors caused the loss of event log messages or the that messages were reported multiple times. Change-Id: Ia8870a78c25609a28d6fa18b5c701b7c0ce17261 --- .werks/4014 | 11 ++ ChangeLog | 1 + agents/windows/EventLogVista.cc | 134 ++++++++--------------- agents/windows/EventLogVista.h | 122 ++++++++++++++++++++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1327104 -> 1439232 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15506632 -> 17018273 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1327104 -> 1439232 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1304064 bytes agents/windows/check_mk_agent.msi | Bin 2899456 -> 3014144 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13407014 -> 13537258 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1304064 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/dynamic_func.h | 1 + agents/windows/install_agent-64.exe | Bin 585704 -> 615184 bytes agents/windows/install_agent.exe | Bin 582536 -> 583368 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionEventlog.cc | 9 +- agents/windows/types.h | 41 +++++++ 19 files changed, 225 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d83b3af059…

7 years, 5 months

lnx_cpuinfo: Fixed useless branch

by Lars Michelsen

Module: check_mk Branch: master Commit: ffc76d8c4f648bc2012f38978f691e955874429b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffc76d8c4f648b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jan 22 22:04:03 2017 +0100 lnx_cpuinfo: Fixed useless branch Change-Id: I9809459e1c39cd837cb1de228fec6f4e6dc1f4af --- inventory/lnx_cpuinfo | 2 -- 1 file changed, 2 deletions(-) diff --git a/inventory/lnx_cpuinfo b/inventory/lnx_cpuinfo index 1e605a7..c5274f9 100644 --- a/inventory/lnx_cpuinfo +++ b/inventory/lnx_cpuinfo @@ -64,8 +64,6 @@ def inv_lnx_cpuinfo(info): node["cores_per_cpu"] = int(value) elif varname == "siblings": node["threads_per_cpu"] = int(value) - elif varname == "mode name": - node["model"] = value elif varname == "vendor_id": node["vendor"] = { "GenuineIntel" : "intel",

7 years, 5 months

fixed winperf_if inventory plugin: 'ValueError: too many values to unpack'

by Simon Betz

Module: check_mk Branch: master Commit: 36e63da64a9c399a5b7651ecf0a39d862590b938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36e63da64a9c39… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 20 13:12:25 2017 +0100 fixed winperf_if inventory plugin: 'ValueError: too many values to unpack' Change-Id: Ia0a4d5bed633d939306987db7c9b30a476d78254 --- inventory/winperf_if | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/winperf_if b/inventory/winperf_if index 804ebe9..50471d9 100644 --- a/inventory/winperf_if +++ b/inventory/winperf_if @@ -27,7 +27,7 @@ # TODO unify with other if inventory plugins def inv_winperf_if(parsed, params): - perf, dhcp, nic_names, nic_index = parsed + agent_timestamp, perf, dhcp, nic_names, nic_index = parsed node = inv_tree_list("networking.interfaces:") usage_port_types = params.get("usage_port_types",

7 years, 5 months

4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 9aa419b52e839f688bb30958df353773454461d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa419b52e839f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 20 08:45:12 2017 +0100 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB Change-Id: Ic4d54c8e606068048e0b13660157c6bd40d5b2fe --- .werks/4293 | 9 +++++++++ ChangeLog | 1 + checks/wut_webtherm | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4293 b/.werks/4293 new file mode 100644 index 0000000..9f72e95 --- /dev/null +++ b/.werks/4293 @@ -0,0 +1,9 @@ +Title: wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1484898056 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3bea072..a449c77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 4175 didactum_sensors_analog.humidity: new check which monitors the humidity of Didactum devices supporting the DIDACTUM-SYSTEM-MIB * 4257 logwatch.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde * 4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses... + * 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 138660f..f366d34 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -100,7 +100,7 @@ check_info["wut_webtherm"] = { 'check_function' : check_wut_webtherm, 'service_description' : 'Temperature %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36'], [ + 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36', '37'], [ '1.2.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroSensorNo '1.3.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroTempValue '1.8.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroTempValuePkt

7 years, 5 months

CEE: Graph collections can now be added to reports

by Lars Michelsen

Module: check_mk Branch: master Commit: afc64b910b2e80499a190e8fbc0851f7009b6d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afc64b910b2e80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 19:47:22 2017 +0100 CEE: Graph collections can now be added to reports Change-Id: If1cca70228a48d006fdbc230cb1c6b11844e6ea1 --- web/htdocs/dashboard.py | 5 ++++- web/htdocs/htmllib.py | 13 +++++++++++++ web/htdocs/pagetypes.py | 1 - web/htdocs/visuals.py | 8 ++++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 39f71ca..a6340cd 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1267,10 +1267,13 @@ def ajax_dashlet_pos(): # | | # '----------------------------------------------------------------------' -def popup_list_dashboards(): +def popup_list_dashboards(add_type): if not config.user.may("general.edit_dashboards"): return [] + if add_type == "graph_collection": + return + load_dashboards() return [ (name, board["title"]) for (name, board) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b09a5ef..a5df3f2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2385,6 +2385,8 @@ class html(DeprecationWrapper): self.store_new_transids() + # TODO: Rename the status_icons because they are not only showing states. There are also actions. + # Something like footer icons or similar seems to be better def _write_status_icons(self): self.icon_button(self.makeuri([]), _("URL to this frame"), "frameurl", target="_top", cssclass="inline") @@ -2398,6 +2400,7 @@ class html(DeprecationWrapper): _("Export as CSV"), "download_csv", target="_top", cssclass="inline") + # TODO: This needs to be realized as plugin mechanism if self.myfile == "view": mode_name = self.var('mode') == "availability" and "availability" or "view" @@ -2414,6 +2417,16 @@ class html(DeprecationWrapper): 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}], url_vars=[("add_type", "view")]) + # TODO: This should be handled by pagetypes.py + elif self.myfile == "graph_collection": + + self.popup_trigger( + self.render_icon("menu", _("Add this graph collection to..."), + cssclass="iconbutton inline"), + 'add_visual', 'add_visual', data=["graph_collection", {}, {'name': self.var('name')}], + url_vars=[("add_type", "graph_collection")]) + + for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: tooltip, url = tooltip diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index eb6f35e..c591fb7 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -393,7 +393,6 @@ class PageRenderer(Base): return "" - #. # .--Overridable---------------------------------------------------------. # | ___ _ _ _ _ | diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index ea962b1..04c6617 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1467,10 +1467,14 @@ def ajax_popup_add(): if "popup_add_handler" in visual_type: module_name = visual_type["module_name"] visual_module = __import__(module_name) + handler = visual_module.__dict__[visual_type["popup_add_handler"]] - visuals = handler() + visuals = handler(add_type) + if not visuals: + continue + html.write('<li><span>%s %s:</span></li>' % (_('Add to'), visual_type["title"])) - for name, title in sorted(handler(), key=lambda x: x[1]): + for name, title in sorted(visuals, key=lambda x: x[1]): html.write('<li><a href="javascript:void(0)" ' 'onclick="add_to_visual(\'%s\', \'%s\')"><img src="images/icon_%s.png"> %s</a></li>' % (visual_type_name, name, visual_type_name.rstrip('s'), title))

7 years, 5 months

Bugfix (workaround): Ensured that value_to_text returns strings not HTML objects.

by Roland Halbig

Module: check_mk Branch: master Commit: 14566235324f143c564244012539352e340442f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14566235324f14… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 19 14:02:55 2017 +0100 Bugfix (workaround): Ensured that value_to_text returns strings not HTML objects. Change-Id: I11a29d567d9d7f9155c5e98623ccbb095bba215e --- web/htdocs/valuespec.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9581bef..0eb1931 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -653,7 +653,8 @@ class EmailAddress(TextAscii): if not value: return TextAscii.value_to_text(self, value) elif self._make_clickable: - return html.render_a(value, href="mailto:%s" % value) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + return "%s" % html.render_a( HTML(value) , href="mailto:%s" % value) else: return value @@ -985,7 +986,8 @@ class TextAreaUnicode(TextUnicode): def value_to_text(self, value): if self._monospaced: - return html.render_pre(value, class_="ve_textarea") + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + return "%s" % html.render_pre( HTML(value) , class_="ve_textarea") else: return html.attrencode(value).replace("\n", "<br>") @@ -1131,8 +1133,9 @@ class ListOfStrings(ValueSpec): return self._empty_text if self._vertical: - s = map(lambda v: html.render_tr(html.render_td(self._valuespec.value_to_text(v))), value) - return html.render_table(HTML().join(s)) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + s = map(lambda v: html.render_tr(html.render_td( HTML(self._valuespec.value_to_text(v)) )), value) + return "%s" % html.render_table(HTML().join(s)) else: return ", ".join([ self._valuespec.value_to_text(v) for v in value ]) @@ -1307,8 +1310,9 @@ class ListOf(ValueSpec): elif not value: return self._text_if_empty else: - s = map(lambda v: html.render_tr(html.render_td(self._valuespec.value_to_text(v))), value) - return html.render_table(HTML().join(s)) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + s = map(lambda v: html.render_tr(html.render_td( HTML(self._valuespec.value_to_text(v)) )), value) + return "%s" % html.render_table(HTML().join(s)) def get_indexes(self, varprefix): @@ -1430,9 +1434,10 @@ class ListOfMultiple(ValueSpec): table_content = HTML() for ident, val in value: vs = self._choice_dict[ident] + # TODO: This is a workaround for a bug. This function needs to return str objects right now. table_content += html.render_tr(html.render_td(vs.title())\ - + html.render_td(vs.value_to_text(val))) - return html.render_table(table_content) + + html.render_td( HTML(vs.value_to_text(val)) )) + return "%s" % html.render_table(table_content) def from_html_vars(self, varprefix): value = {} @@ -2041,7 +2046,8 @@ class ListChoice(ValueSpec): if self._render_orientation == "horizontal": return ", ".join(texts) else: - return html.render_table(html.render_tr(html.render_td(html.render_br().join(texts)))) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + return "%s" % html.render_table(html.render_tr(html.render_td(html.render_br().join( map(lambda x: HTML(x), texts) )))) #OLD: return "<table><tr><td>" + "<br>".join(texts) + "</td></tr></table>" def from_html_vars(self, varprefix): @@ -3509,7 +3515,8 @@ class Dictionary(ValueSpec): s = '' if oneline else HTML() for param, vs in elem: if param in value: - text = vs.value_to_text(value[param]) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + text = HTML(vs.value_to_text(value[param])) if oneline: if param != elem[0][0]: s += ", " @@ -3518,7 +3525,7 @@ class Dictionary(ValueSpec): s += html.render_tr(html.render_td("%s: " % vs.title()) + html.render_td(text)) if not oneline: s = html.render_table(s) - return s + return "%s" % s def from_html_vars(self, varprefix): value = {} @@ -4126,7 +4133,8 @@ class IconSelector(ValueSpec): return icon def value_to_text(self, value): - return self.render_icon(value) + # TODO: This is a workaround for a bug. This function needs to return str objects right now. + return "%s" % self.render_icon(value) def validate_datatype(self, value, varprefix): if value is not None and type(value) != str:

7 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017