Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 70375948814403b7d84ba082212c851f2b144748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70375948814403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 14:02:15 2017 +0100 Removed needless getter Change-Id: If3b99d245df5f3aada893bd785ac959942ad4a79 --- web/htdocs/watolib.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5576ee2..331cdd5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6538,10 +6538,6 @@ class Rule(object): self._initialize() - def get_value(self): - return self.value - - def clone(self): cloned = Rule(self.folder, self.ruleset) cloned.from_config(self._format_rule())

7 years, 5 months

livestatus: Fixed exception in case no timeout was set

by Lars Michelsen

Module: check_mk Branch: master Commit: 6301927d1c9bd2e5d4508f2a479f137536aee022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6301927d1c9bd2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 19:23:48 2017 +0100 livestatus: Fixed exception in case no timeout was set Change-Id: I378c19333dc8339133dce104897d09b40a80213d --- livestatus/api/python/livestatus.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index afcf0dc..45f521a 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -344,15 +344,19 @@ class BaseConnection: else: raise MKLivestatusQueryError("%s: %s" % (code, data.strip())) - # In case of an IO error or the other side having - # closed the socket do a reconnect and try again, but - # only once except (MKLivestatusSocketClosed, IOError), e: + # In case of an IO error or the other side having + # closed the socket do a reconnect and try again self.disconnect() now = time.time() if query and (not timeout_at or timeout_at > now): if timeout_at == None: - timeout_at = now + self.timeout + # Try until timeout reached in case there was a timeout configured. + # Otherwise only retry once. + timeout_at = now + if self.timeout: + timeout_at += self.timeout + time.sleep(0.1) self.connect() self.send_query(query, add_headers)

7 years, 5 months

4281 FIX Fixed piggyback hosts with spaces in names leading to crashes

by Lars Michelsen

Module: check_mk Branch: master Commit: 49be7d681456d644d1c1c8d1b19de49f734d6f78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49be7d681456d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 10:31:23 2017 +0100 4281 FIX Fixed piggyback hosts with spaces in names leading to crashes It was possible for agent plugins / special agents to create piggyback hosts with spaces in their names which lead to crashes of Check_MK check helpers when trying to check these hosts. These spaces will now automatically be replaced by underscores to workaround this issue. In case you want to have another replacement logic, you can use the piggyback translation ruleset to override the default behaviour. Change-Id: I8c0ff0e93bef3323f9b181dc41585c35c4a3f84b --- .werks/4281 | 15 +++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/4281 b/.werks/4281 new file mode 100644 index 0000000..2455c30 --- /dev/null +++ b/.werks/4281 @@ -0,0 +1,15 @@ +Title: Fixed piggyback hosts with spaces in names leading to crashes +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i4 +Date: 1484818031 +Class: fix + +It was possible for agent plugins / special agents to create piggyback hosts +with spaces in their names which lead to crashes of Check_MK check helpers +when trying to check these hosts. + +These spaces will now automatically be replaced by underscores to workaround +this issue. In case you want to have another replacement logic, you can use +the piggyback translation ruleset to override the default behaviour. diff --git a/ChangeLog b/ChangeLog index a72ea66..7dc1287 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.4.0i4: Core & Setup: * 4269 FIX: Verifying unexpected keys in check_info while loading checks... + * 4281 FIX: Fixed piggyback hosts with spaces in names leading to crashes... Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b68e266..9fc1546 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -899,6 +899,14 @@ def parse_info(lines, hostname): host = translate_piggyback_host(hostname, host) if host == hostname: host = None # unpiggybacked "normal" host + + # Protect Check_MK against unallowed host names. Normally source scripts + # like agent plugins should care about cleaning their provided host names + # up, but we need to be sure here to prevent bugs in Check_MK code. + # a) Replace spaces by underscores + if host: + host = host.replace(" ", "_") + elif host: # processing data for an other host piggybacked.setdefault(host, []).append(line)

7 years, 5 months

4282 FIX Fixed rendering of perfometers when no RRDs exist yet

by Lars Michelsen

Module: check_mk Branch: master Commit: 91863d731949897eb4a57e10d0f89ec6278a9783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91863d73194989… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 13:20:39 2017 +0100 4282 FIX Fixed rendering of perfometers when no RRDs exist yet Change-Id: I537066504552b04792a7d615900e38b8a3bc0e18 --- .werks/4282 | 9 +++++++++ ChangeLog | 1 + web/htdocs/status.css | 4 ++++ web/plugins/views/perfometer.py | 16 ++++++++++------ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/4282 b/.werks/4282 new file mode 100644 index 0000000..2699006 --- /dev/null +++ b/.werks/4282 @@ -0,0 +1,9 @@ +Title: Fixed rendering of perfometers when no RRDs exist yet +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1484828434 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7dc1287..3bea072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 4228 FIX: Context links to HW/SW inventory views are only shown when useful * 4280 FIX: Interactive login is now denied for automation users... * 4307 FIX: Fixed wrong filters in Eventviews linked by Tactical Overview + * 4282 FIX: Fixed rendering of perfometers when no RRDs exist yet WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/status.css b/web/htdocs/status.css index cc27855..f293de4 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -194,6 +194,10 @@ td.perfometer > a { position: relative; } +td.perfometer > a.disabled { + cursor: auto; +} + td.perfometer div.content { width: 120px; z-index: 20; diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 5b5c26b..1c340f8 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -162,9 +162,9 @@ def paint_perfometer(row): raise return "perfometer", ("invalid data: %s" % e) - content = '<div class=content>%s</div>' % h - content += '<div class=title>%s</div>' % title - content += '<img class=glass src="images/perfometer-bg.png">' + content = html.render_div(HTML(h), class_=["content"]) \ + + html.render_div(title, class_=["title"]) \ + + html.render_img(src="images/perfometer-bg.png", class_=["glass"]) # pnpgraph_present: -1 means unknown (path not configured), 0: no, 1: yes if display_options.enabled(display_options.X) \ @@ -173,10 +173,14 @@ def paint_perfometer(row): url = new_graphing_url(row, "service") else: url = pnp_url(row, "service") - return "perfometer" + stale_css, ('<a href="%s" title="%s">%s</a>' % \ - (url, title, content)) + disabled = False else: - return "perfometer" + stale_css, content + url = "javascript:void(0)" + disabled = True + + return "perfometer" + stale_css, \ + html.render_a(content=content, href=url, title=title, + class_=["disabled" if disabled else None]) #.

7 years, 5 months

4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses

by Andreas Boesl

Module: check_mk Branch: master Commit: f52d9312effa90b510747d48c3236258faee698c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f52d9312effa90… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 19 13:07:20 2017 +0100 4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses This check reports the number of unique inside and outside MACs addresses. You can configure upper and lower levels for the inside as well as the outside area. Change-Id: I0dcf234255bfa7d805dadfe1216ef20cced0e3f8 --- .werks/4013 | 10 +++++ ChangeLog | 1 + agents/special/agent_ruckus_spot | 65 +++++++++++++++++++++++---------- checks/agent_ruckus_spot | 2 + checks/ruckus_spot_ap | 19 +++++----- web/plugins/metrics/check_mk.py | 13 +++++++ web/plugins/wato/check_parameters.py | 62 ++++++++++++++++++++++++++++++- web/plugins/wato/datasource_programs.py | 17 ++++++++- 8 files changed, 159 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f52d9312ef…

7 years, 5 months

Bugfix: Fixed printer performeter return value.

by Roland Halbig

Module: check_mk Branch: master Commit: 9940591b3a67b7297dd10d3956726ff564745cab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9940591b3a67b7… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 19 11:38:26 2017 +0100 Bugfix: Fixed printer performeter return value. Change-Id: I610abda0aabf9e8503fa421e368df14749389cfe --- web/plugins/perfometer/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 3a2b08e..7ccd96c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -642,7 +642,7 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): st = min(2, row['service_state']) color = colors[st] - return "<font color=\"%s\">%.0f%%</font>" % (fg_color, left), perfometer_linear(left, color) + return "%.0f%%" % left, perfometer_linear(left, color) perfometers["check_mk-printer_supply"] = perfometer_check_mk_printer_supply perfometers["check_mk-printer_supply_ricoh"] = perfometer_check_mk_printer_supply

7 years, 5 months

Bugfix: sorting of the 'service problems' table has been fixed.

by Roland Halbig

Module: check_mk Branch: master Commit: 9b75b1ecb4a06539be258fce1a175f4d8bbc515c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b75b1ecb4a065… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 19 11:10:19 2017 +0100 Bugfix: sorting of the 'service problems' table has been fixed. Change-Id: I79d099c3389061f1b94ebfef96fa155ead137601 --- web/htdocs/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index de23118..4cd56fd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -676,8 +676,8 @@ class Cell(object): params.append(('display_options', display_options.title_options)) classes += [ "sort", get_primary_sorter_order(self._view, self.painter_name()) ] - onclick = ' onclick="location.href=\'%s\'"' % html.makeuri(params, 'sort') - title = ' title="%s"' % (_('Sort by %s') % self.title()) + onclick = "location.href=\'%s\'" % html.makeuri(params, 'sort') + title = _('Sort by %s') % self.title() if is_last_column_header: classes.append("last_col")

7 years, 5 months

fixed pylint 'fix', which broke the entire quicksearch..

by Andreas Boesl

Module: check_mk Branch: master Commit: d936cfa566d080f1ebc8ff92851ca60e2be7a739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d936cfa566d080… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 18 16:12:30 2017 +0100 fixed pylint 'fix', which broke the entire quicksearch.. Change-Id: I7e7ef5ea0ac549c1285d622f183ab540f5141a02 --- web/plugins/sidebar/search.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index a228daf..531593e 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -136,9 +136,9 @@ sidebar_snapins["search"] = { class QuicksearchMatchPlugin(object): - def __init__(self, livestatus_tables): + def __init__(self, livestatus_tables, filter_shortname): + self._filter_shortname = filter_shortname self._livestatus_tables = livestatus_tables - self._filter_shortname = None super(QuicksearchMatchPlugin, self).__init__() @@ -188,9 +188,9 @@ class QuicksearchMatchPlugin(object): class GroupMatchPlugin(QuicksearchMatchPlugin): def __init__(self, group_type = None, filter_shortname = None): + super(GroupMatchPlugin, self).__init__(["%sgroups" % group_type, "%ss" % group_type, "services"], + filter_shortname) self._group_type = group_type - self._filter_shortname = filter_shortname - super(GroupMatchPlugin, self).__init__(["%sgroups" % self._group_type, "%ss" % self._group_type, "services"]) def get_livestatus_columns(self, livestatus_table): @@ -254,8 +254,7 @@ class GroupMatchPlugin(QuicksearchMatchPlugin): class ServiceMatchPlugin(QuicksearchMatchPlugin): def __init__(self): - self._filter_shortname = "s" - super(ServiceMatchPlugin, self).__init__(["services"]) + super(ServiceMatchPlugin, self).__init__(["services"], "s") def get_livestatus_columns(self, livestatus_table): @@ -289,9 +288,8 @@ class ServiceMatchPlugin(QuicksearchMatchPlugin): class HostMatchPlugin(QuicksearchMatchPlugin): def __init__(self, livestatus_field = None, filter_shortname = None): + super(HostMatchPlugin, self).__init__(["hosts", "services"], filter_shortname) self._livestatus_field = livestatus_field # address, name or alias - self._filter_shortname = filter_shortname - super(HostMatchPlugin, self).__init__(["hosts", "services"]) def _get_real_fieldname(self, livestatus_table): @@ -358,8 +356,7 @@ class HostMatchPlugin(QuicksearchMatchPlugin): class HosttagMatchPlugin(QuicksearchMatchPlugin): def __init__(self): - self._filter_shortname = "tg" - super(HosttagMatchPlugin, self).__init__(["hosts", "services"]) + super(HosttagMatchPlugin, self).__init__(["hosts", "services"], "tg") def _get_hosttag_dict(self):

7 years, 5 months

Fixed ownership of precompiled werks.

by Sven Panne

Module: check_mk Branch: master Commit: e26cdea4651d08a184e683de87f238a3c7ef51fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e26cdea4651d08… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 18 16:11:38 2017 +0100 Fixed ownership of precompiled werks. Change-Id: I2e5497576f485a8385f143177e35e8d000d06d8d --- .werks/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/.f12 b/.werks/.f12 index a02f4b9..88fa005 100644 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -3,4 +3,4 @@ SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo mkdir -p /omd/sites/$SITE/share/check_mk/werks/ make -C .. precompile-werks -sudo install -m 640 -g $SITE -o $SITE werks /omd/sites/$SITE/share/check_mk/werks/werks +sudo install -m 644 -g $SITE -o $SITE werks /omd/sites/$SITE/share/check_mk/werks/werks

7 years, 5 months

4307 FIX Fixed wrong filters in Eventviews linked by Tactical Overview

by Manfred

Module: check_mk Branch: master Commit: af9cf63c3b5d9fe253e94c8b15bcf482e0998bd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af9cf63c3b5d9f… Author: Manfred <mb(a)mathias-kettner.de> Date: Wed Jan 18 15:09:38 2017 +0100 4307 FIX Fixed wrong filters in Eventviews linked by Tactical Overview --- .werks/4307 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/4307 b/.werks/4307 new file mode 100644 index 0000000..bfe00e6 --- /dev/null +++ b/.werks/4307 @@ -0,0 +1,10 @@ +Title: Fixed wrong filters in Eventviews linked by Tactical Overview +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1484748386 + + diff --git a/ChangeLog b/ChangeLog index bbe59da..dc18506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 4226 FIX: Custom inventory painters are now correctly loaded when declared with inventory_displayhints * 4228 FIX: Context links to HW/SW inventory views are only shown when useful * 4280 FIX: Interactive login is now denied for automation users... + * 4307 FIX: Fixed wrong filters in Eventviews linked by Tactical Overview WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b3155f0..03a012d 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -710,11 +710,17 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): ], "handled" : [ ("view_name", "ec_events"), - ("event_phase_ack", "on"), + ("event_state_1", "on",), + ("event_state_2", "on",), + ("event_state_3", "on",), + ], "unhandled" : [ ("view_name", "ec_events"), ("event_phase_open", "on"), + ("event_state_1", "on",), + ("event_state_2", "on",), + ("event_state_3", "on",), ], "stale" : None, },

7 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
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