Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d4ba91ac81bff51e70be1c9d3d7fb3c437fb037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d4ba91ac81bff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 12:22:35 2017 +0200 5053 FIX NagVis: Updated to 1.9.3 Change-Id: I6c744dcd3037e2d51b2dfb2862ae943572c384e0 --- .werks/5053 | 10 ++++++++++ omd/packages/nagvis/Makefile | 2 +- omd/packages/nagvis/nagvis-1.9.2.tar.gz | Bin 1738364 -> 0 bytes omd/packages/nagvis/nagvis-1.9.3.tar.gz | Bin 0 -> 1738427 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5053 b/.werks/5053 new file mode 100644 index 0000000..b8c9053 --- /dev/null +++ b/.werks/5053 @@ -0,0 +1,10 @@ +Title: NagVis: Updated to 1.9.3 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503915712 +Class: fix + + diff --git a/omd/packages/nagvis/Makefile b/omd/packages/nagvis/Makefile index 7f6f8ef..ddf9d43 100644 --- a/omd/packages/nagvis/Makefile +++ b/omd/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.9.2 +VERSION = 1.9.3 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/nagvis/nagvis-1.9.2.tar.gz b/omd/packages/nagvis/nagvis-1.9.2.tar.gz deleted file mode 100644 index 9f84d40..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.2.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.3.tar.gz b/omd/packages/nagvis/nagvis-1.9.3.tar.gz new file mode 100644 index 0000000..8d3204a Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.3.tar.gz differ

6 years, 10 months

snmp_bulk_size: Changed minimum value to 1 instead of 10

by Lars Michelsen

Module: check_mk Branch: master Commit: ec3d6fdbd517c2ea3ce474168b45105e66664c61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec3d6fdbd517c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 11:52:18 2017 +0200 snmp_bulk_size: Changed minimum value to 1 instead of 10 Change-Id: I4b9e342c87d8610821fdee7cba34053029ec62fe --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9838a09..b4d6992 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2321,7 +2321,7 @@ register_rule(group, Integer( title = _("Bulk walk: Number of OIDs per bulk"), label = _("Number of OIDs to request per bulk: "), - minvalue = 10, + minvalue = 1, maxvalue = 100, default_value = 10, ),

6 years, 10 months

5052 FIX Views: Fixed possible encoding exception when cells contain special chars

by Lars Michelsen

Module: check_mk Branch: master Commit: 8163fa22792ba43299a59fe11dd87e0491fe6d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8163fa22792ba4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 11:36:07 2017 +0200 5052 FIX Views: Fixed possible encoding exception when cells contain special chars When doing a CSV export of a view that contains special characters it could happen that the CSV export is incomplete and the last cell contained HTML code reporting an exception (UnicodeEncodeError...). Change-Id: Ie9221fea978059315d33e7ef183570ef91a83fce --- .werks/5052 | 12 ++++++++++++ web/plugins/views/webservice.py | 14 ++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/5052 b/.werks/5052 new file mode 100644 index 0000000..1474029 --- /dev/null +++ b/.werks/5052 @@ -0,0 +1,12 @@ +Title: Views: Fixed possible encoding exception when cells contain special chars +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503912139 +Class: fix + +When doing a CSV export of a view that contains special characters it could happen +that the CSV export is incomplete and the last cell contained HTML code reporting +an exception (UnicodeEncodeError...). diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 6160eed..cfb35f5 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -128,6 +128,12 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp if export: output_csv_headers(view) + def format_for_csv(raw_data): + # raw_data can also be int, float + content = "%s" % raw_data + stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') + return stripped.encode("utf-8") + csv_separator = html.var("csv_separator", ";") first = True for cell in group_cells + cells: @@ -136,9 +142,7 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp else: html.write(csv_separator) content = cell.export_title() - # content can be int, float - stripped = html.strip_tags(str(content)).replace('\n', '').replace('"', '""') - html.write('"%s"' % stripped.encode("utf-8")) + html.write('"%s"' % format_for_csv(content)) for row in rows: html.write_text("\n") @@ -150,9 +154,7 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp html.write(csv_separator) joined_row = join_row(row, cell) tdclass, content = cell.render_content(joined_row) - # content can be int, float - stripped = html.strip_tags(str(content)).replace('\n', '').replace('"', '""') - html.write('"%s"' % stripped.encode("utf-8")) + html.write('"%s"' % format_for_csv(content)) multisite_layouts["csv_export"] = { "title" : _("CSV data export"),

6 years, 10 months

Revert "Revert "View editor: Prefix painter/ sorter choices with related info titles""

by Lars Michelsen

Module: check_mk Branch: master Commit: 396f873239620f9d5767029fef0100636da82052 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=396f873239620f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 10:52:31 2017 +0200 Revert "Revert "View editor: Prefix painter/sorter choices with related info titles"" This reverts commit bda8003b43c25657acd3a022423ffd80e5df9307. --- web/htdocs/views.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 03d8ef2..ab7822f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1215,7 +1215,7 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = [ (name, p["title"]) for name, p + choices = [ (name, get_painter_title_for_choices(p)) for name, p in sorters_of_datasource(ds_name).items() ], sorted = True, no_preselect = True, @@ -2428,13 +2428,20 @@ def allowed_for_datasource(collection, datasourcename): allowed = {} for name, item in collection.items(): - columns = get_painter_columns(item) - infos_needed = set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) + infos_needed = infos_needed_by_painter(item, add_columns) if len(infos_needed.difference(infos_available)) == 0: allowed[name] = item return allowed +def infos_needed_by_painter(painter, add_columns=None): + if add_columns is None: + add_columns = [] + + columns = get_painter_columns(painter) + return set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) + + # Returns either the valuespec of the painter parameters or None def get_painter_params_valuespec(painter): if "params" not in painter: @@ -2450,16 +2457,29 @@ def painter_choices(painters, add_params=False): choices = [] for name, painter in painters.items(): + title = get_painter_title_for_choices(painter) + # Add the optional valuespec for painter parameters if add_params and "params" in painter: vs_params = get_painter_params_valuespec(painter) - choices.append((name, painter["title"], vs_params)) + choices.append((name, title, vs_params)) else: - choices.append((name, painter["title"])) + choices.append((name, title)) return sorted(choices, key=lambda x: x[1]) +def get_painter_title_for_choices(painter): + info_title = "/".join([ visuals.infos[info_name]["title_plural"] for info_name + in sorted(infos_needed_by_painter(painter)) ]) + + # TODO: Cleanup the special case for sites. How? Add an info for it? + if painter["columns"] == ["site"]: + info_title = _("Site") + + return "%s: %s" % (info_title, painter["title"]) + + def painter_choices_with_params(painters): return painter_choices(painters, add_params=True)

6 years, 10 months

Fixed alert statistics view editing

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e308c9fd52b491fbb958ddb1e836949ae4dde7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e308c9fd52b49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 11:04:37 2017 +0200 Fixed alert statistics view editing Change-Id: I615f5c3cb085697b25240bda6ba3ac551bc32daa --- web/plugins/views/datasources.py | 2 +- web/plugins/views/painters.py | 20 ++++++++++---------- web/plugins/views/sorters.py | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 058358f..62d41e9 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -233,7 +233,7 @@ multisite_datasources["alert_stats"] = { "title" : _("Alert Statistics"), "table" : "log", "add_headers" : "Filter: class = 1\nStats: state = 0\nStats: state = 1\nStats: state = 2\nStats: state = 3\nStats: state != 0\n", - "add_columns" : [ "alerts_ok", "alerts_warn", "alerts_crit", "alerts_unknown", "alerts_problem" ], + "add_columns" : [ "log_alerts_ok", "log_alerts_warn", "log_alerts_crit", "log_alerts_unknown", "log_alerts_problem" ], "infos" : [ "log", "host", "service", "contact", "command" ], "keys" : [], "idkeys" : [ 'host_name', 'service_description' ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 3bbdd64..e0d39e3 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2483,36 +2483,36 @@ multisite_painters["log_state"] = { multisite_painters["alert_stats_ok"] = { "title" : _("Alert Statistics: Number of recoveries"), "short" : _("OK"), - "columns" : [ "alerts_ok" ], - "paint" : lambda row: ("", str(row["alerts_ok"])), + "columns" : [ "log_alerts_ok" ], + "paint" : lambda row: ("", str(row["log_alerts_ok"])), } multisite_painters["alert_stats_warn"] = { "title" : _("Alert Statistics: Number of warnings"), "short" : _("WARN"), - "columns" : [ "alerts_warn" ], - "paint" : lambda row: paint_svc_count(1, row["alerts_warn"]), + "columns" : [ "log_alerts_warn" ], + "paint" : lambda row: paint_svc_count(1, row["log_alerts_warn"]), } multisite_painters["alert_stats_crit"] = { "title" : _("Alert Statistics: Number of critical alerts"), "short" : _("CRIT"), - "columns" : [ "alerts_crit" ], - "paint" : lambda row: paint_svc_count(2, row["alerts_crit"]) + "columns" : [ "log_alerts_crit" ], + "paint" : lambda row: paint_svc_count(2, row["log_alerts_crit"]) } multisite_painters["alert_stats_unknown"] = { "title" : _("Alert Statistics: Number of unknown alerts"), "short" : _("UNKN"), - "columns" : [ "alerts_unknown" ], - "paint" : lambda row: paint_svc_count(3, row["alerts_unknown"]) + "columns" : [ "log_alerts_unknown" ], + "paint" : lambda row: paint_svc_count(3, row["log_alerts_unknown"]) } multisite_painters["alert_stats_problem"] = { "title" : _("Alert Statistics: Number of problem alerts"), "short" : _("PROB"), - "columns" : [ "alerts_problem" ], - "paint" : lambda row: paint_svc_count('s', row["alerts_problem"]) + "columns" : [ "log_alerts_problem" ], + "paint" : lambda row: paint_svc_count('s', row["log_alerts_problem"]) } # diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index b26bbc1..468cd28 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -382,11 +382,11 @@ def cmp_date(column, r1, r2): declare_1to1_sorter("log_date", cmp_date) # Alert statistics -declare_simple_sorter("alerts_ok", _("Number of recoveries"), "alerts_ok", cmp_simple_number) -declare_simple_sorter("alerts_warn", _("Number of warnings"), "alerts_warn", cmp_simple_number) -declare_simple_sorter("alerts_crit", _("Number of critical alerts"), "alerts_crit", cmp_simple_number) -declare_simple_sorter("alerts_unknown", _("Number of unknown alerts"), "alerts_unknown", cmp_simple_number) -declare_simple_sorter("alerts_problem", _("Number of problem alerts"), "alerts_problem", cmp_simple_number) +declare_simple_sorter("alerts_ok", _("Number of recoveries"), "log_alerts_ok", cmp_simple_number) +declare_simple_sorter("alerts_warn", _("Number of warnings"), "log_alerts_warn", cmp_simple_number) +declare_simple_sorter("alerts_crit", _("Number of critical alerts"), "log_alerts_crit", cmp_simple_number) +declare_simple_sorter("alerts_unknown", _("Number of unknown alerts"), "log_alerts_unknown", cmp_simple_number) +declare_simple_sorter("alerts_problem", _("Number of problem alerts"), "log_alerts_problem", cmp_simple_number) # Aggregations declare_simple_sorter("aggr_name", _("Aggregation name"), "aggr_name", cmp_simple_string)

6 years, 10 months

cmk -h does not need to load the checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b367652869df21e8a6c14d3ba110120af86318b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b367652869df2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 07:44:54 2017 +0200 cmk -h does not need to load the checks Change-Id: I03140acdb3044339a8901bb40b8ea72aee917961 --- cmk_base/modes/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index f2130cc..cc1554f 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1598,4 +1598,5 @@ modes.register(Mode( handler_function=mode_help, short_help="Print this help", needs_config=False, + needs_checks=False, ))

6 years, 10 months

Small speed up of test executions

by Lars Michelsen

Module: check_mk Branch: master Commit: b21a8ea9ebede3c804ffe0518ae89f8095b1218c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b21a8ea9ebede3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 08:00:18 2017 +0200 Small speed up of test executions Change-Id: I49a6dd97819ebc1e6232c938b4589960c8e4de5c --- tests/testlib/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d166b88..6579c2b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -558,15 +558,17 @@ class Site(object): # These things are needed to make the site basically being setup. So this # is checked during site initialization instead of a dedicated test. def verify_cmk(self): + # First test whether or not the Check_MK is working at all p = self.execute(["cmk", "--help"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) stdout = p.communicate()[0] assert p.returncode == 0, "Failed to execute 'cmk': %s" % stdout - p = self.execute(["cmk", "-U"], stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, close_fds=True) - stdout = p.communicate()[0] - assert p.returncode == 0, "Failed to execute 'cmk -U': %s" % stdout + # Then ensure the core configuration is up-to-date + #p = self.execute(["cmk", "-U"], stdout=subprocess.PIPE, + # stderr=subprocess.STDOUT, close_fds=True) + #stdout = p.communicate()[0] + #assert p.returncode == 0, "Failed to execute 'cmk -U': %s" % stdout def prepare_for_tests(self):

6 years, 10 months

Fixed broken (deprecated?) get-autochecks automation

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c6a968c30daf8917c3e514615ae9ab55621a281 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c6a968c30daf8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 07:15:23 2017 +0200 Fixed broken (deprecated?) get-autochecks automation Change-Id: If4561e3c3697a4e39c7b76e3f179acc8baea794b --- cmk_base/automations/check_mk.py | 3 ++- cmk_base/discovery.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 139ee35..16acced 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -172,6 +172,7 @@ class AutomationSetAutochecks(DiscoveryAutomation): automations.register(AutomationSetAutochecks()) +# TODO: Is this automation still needed? class AutomationGetAutochecks(Automation): cmd = "get-autochecks" needs_config = True @@ -181,7 +182,7 @@ class AutomationGetAutochecks(Automation): hostname = args[0] result = [] for ct, item, paramstring in discovery.parse_autochecks_file(hostname): - result.append((ct, item, eval(paramstring), paramstring)) + result.append((ct, item, discovery.resolve_paramstring(paramstring), paramstring)) return result diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index ff3bc79..8e0e142 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -1121,6 +1121,12 @@ def _get_cluster_services(hostname, use_caches, with_snmp_scan, on_error): return cluster_items +# Translates a parameter string (read from autochecks) to it's final value +# (according to the current configuration) +def resolve_paramstring(paramstring): + return eval(paramstring, checks.__dict__, checks.__dict__) + + # Get the list of service of a host or cluster and guess the current state of # all services if possible def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): @@ -1141,7 +1147,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): # apply check_parameters try: if type(paramstring) == str: - params = eval(paramstring, checks.__dict__, checks.__dict__) + params = resolve_paramstring(paramstring) else: params = paramstring except Exception: @@ -1230,7 +1236,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): perfdata = [] if check_source == "active": - params = eval(paramstring, checks.__dict__, checks.__dict__) + params = resolve_paramstring(paramstring) if check_source in [ "legacy", "active", "custom" ]: checkgroup = None

6 years, 10 months

Title of real time checks is now always unicode

by Lars Michelsen

Module: check_mk Branch: master Commit: cd2f29c1be291e03303082cd9c9692e1dadb1be9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd2f29c1be291e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 07:23:01 2017 +0200 Title of real time checks is now always unicode Change-Id: I4c2d208f598dad7d067f0304380da9a3aa08a0d2 --- cmk_base/automations/check_mk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 16acced..daaa0c4 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -854,6 +854,7 @@ class AutomationGetRealTimeChecks(Automation): rt_checks = [] for check_type, check in checks.check_info.items(): if check["handle_real_time_checks"]: + # TODO: Use cmk.man_pages module standard functions to read the title title = check_type try: manfile = manuals.get(check_type) @@ -863,7 +864,7 @@ class AutomationGetRealTimeChecks(Automation): if cmk.debug.enabled(): raise - rt_checks.append((check_type, "%s - %s" % (check_type, title))) + rt_checks.append((check_type, "%s - %s" % (check_type, title.decode("utf-8")))) return rt_checks

6 years, 10 months

Added some test for automation calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 68b449e53f13a0bf981102e623a685e989415187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68b449e53f13a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 08:02:06 2017 +0200 Added some test for automation calls Change-Id: Ic558aca551ba3326f5ce73a999c9514b1064edd9 --- tests/cmk_base/test_automations.py | 417 +++++++++++++++++++++++++++++++++++-- tests/testlib/__init__.py | 3 + 2 files changed, 403 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=68b449e53f…

6 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017