Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6091 FIX Fixed possible UnicodeDecodeError with special characters in the start_url parameter

by Lars Michelsen

Module: check_mk Branch: master Commit: 857580ad6912f2f4ee3e8563e69099d6752cd580 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=857580ad6912f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 14:24:01 2018 +0200 6091 FIX Fixed possible UnicodeDecodeError with special characters in the start_url parameter Change-Id: If0025490de3266d87df723732e65a728df12f8e6 --- .werks/6091 | 11 +++++++++++ web/htdocs/main.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6091 b/.werks/6091 new file mode 100644 index 0000000..5bec975 --- /dev/null +++ b/.werks/6091 @@ -0,0 +1,11 @@ +Title: Fixed possible UnicodeDecodeError with special characters in the start_url parameter +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526300572 + + diff --git a/web/htdocs/main.py b/web/htdocs/main.py index c1a93d2..ab741ed 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -31,7 +31,7 @@ import re def page_index(): default_start_url = config.user.get_attribute("start_url") or config.start_url - start_url = html.var("start_url", default_start_url).strip() + start_url = html.var_utf8("start_url", default_start_url).strip() # Prevent redirecting to absolute URL which could be used to redirect # users to compromised pages.

6 years, 4 months

6090 FIX Download Agent: Fixed possible broken "Properties" link for hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 04e02a5e871a39709af330c543c1641f03e8705b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04e02a5e871a39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 11:52:34 2018 +0200 6090 FIX Download Agent: Fixed possible broken "Properties" link for hosts When navigating from "Monitoring Agents" page to the "Download agent of host *" page, the "Properties" context button may link to a wrong page resulting in an error message that the requested host does not exist. Change-Id: I6cd8df839c17dfc7005dc2369aa402ea6501676b --- .werks/6090 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6090 b/.werks/6090 new file mode 100644 index 0000000..28b23d9 --- /dev/null +++ b/.werks/6090 @@ -0,0 +1,13 @@ +Title: Download Agent: Fixed possible broken "Properties" link for hosts +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1526291461 + +When navigating from "Monitoring Agents" page to the "Download agent of host *" +page, the "Properties" context button may link to a wrong page resulting in +an error message that the requested host does not exist.

6 years, 4 months

updated crash report mail setting title and help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 980b238bebef3ff0e40d3e8a917c2dcbdabb14ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=980b238bebef3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 15:34:37 2018 +0200 updated crash report mail setting title and help text Change-Id: Ic18f86a95aaf4b31d7a37fc1c11f9ce640b3ade1 --- web/plugins/wato/check_mk_configuration.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 14b1efe..c9a41f2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -327,8 +327,10 @@ register_configvar(group, register_configvar(group, "crash_report_target", - TextAscii(title = _("Mail Address for Crash reports"), - help = _("This Address will be used as default receiver address for crash reports"), + TextAscii(title = _("Fallback mail address for crash reports"), + help = _("By default crash reports will be sent to our crash reporting server. In case " + "this fails for some reason, the crash reports can be sent by mail to the " + "address configured here."), size = 80, attrencode = True), domain = "multisite")

6 years, 4 months

Moved action-related stuff to separate module.

by Sven Panne

Module: check_mk Branch: master Commit: a75163d7fffa2fb6ae404fc4d35f429375da3f94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a75163d7fffa2f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 14:52:35 2018 +0200 Moved action-related stuff to separate module. Change-Id: I4b3129bfaaabd0e207b4d9c5bffaca7dc5132870 --- cmk/ec/actions.py | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cmk/ec/main.py | 412 ++--------------------------------------------------- 2 files changed, 427 insertions(+), 404 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a75163d7ff…

6 years, 4 months

Fixed imports.

by Sven Panne

Module: check_mk Branch: master Commit: dc67e10adb2ed0608f50af6bc67d589ea7a11fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc67e10adb2ed0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 15:05:46 2018 +0200 Fixed imports. Change-Id: Ie34c25524552d74b1d31a6546b643969fea08729 --- cmk/ec/actions.py | 29 ++++++++++++++++++++++------- cmk/ec/main.py | 25 +++++++++---------------- cmk/ec/snmp.py | 2 ++ 3 files changed, 33 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc67e10adb…

6 years, 4 months

Use hashlib instead of builtin hash function in DropdownChoice

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8bda0e931435ef59b15dcf8e76b8ee0926ec0aed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bda0e931435ef… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed May 9 14:33:01 2018 +0200 Use hashlib instead of builtin hash function in DropdownChoice Change-Id: I81c60cf4cee435ac381d7cdef4f57b98b32bd731 --- web/htdocs/valuespec.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3fdf752..886c442 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1673,9 +1673,9 @@ class DropdownChoice(ValueSpec): return options - @classmethod - def option_id(cls, val): - return "%s" % hash(repr(val)) + @staticmethod + def option_id(val): + return "%s" % hashlib.sha256(repr(val)).hexdigest() def validate_value(self, value, varprefix):

6 years, 4 months

Moved SNMP-related stuff to separate module.

by Sven Panne

Module: check_mk Branch: master Commit: a942b8b8660dd4b8f8f50a99527a45535d923afb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a942b8b8660dd4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 14:26:34 2018 +0200 Moved SNMP-related stuff to separate module. Change-Id: Ica5be63951410077978db6abb5190b91eff3c563 --- cmk/ec/main.py | 223 ++----------------------------------------------------- cmk/ec/snmp.py | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+), 218 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a942b8b866…

6 years, 4 months

Fixed integration test.

by Sven Panne

Module: check_mk Branch: master Commit: 027e27a825feebd18bf79699020d7712e539bd9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=027e27a825feeb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 14:21:32 2018 +0200 Fixed integration test. Change-Id: I8da3252506a0dfd861b18f6491351ce9e88494a8 --- cmk/ec/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 4e6f604..12ac471 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3416,7 +3416,7 @@ class StatusTable(object): return result_row def filter_row(self, query, row): - for column_name, _operator_name, predicate in query.filters: + for column_name, _operator_name, predicate, _argument in query.filters: if not predicate(row[query.table.column_indices[column_name]]): return None return row

6 years, 4 months

Fixed pylint issues.

by Sven Panne

Module: check_mk Branch: master Commit: b61db6ec596b99230de1ab0d9b5f55ad4d0421e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b61db6ec596b99… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 13:57:50 2018 +0200 Fixed pylint issues. Change-Id: I23d3aef139db03248346a4965be2652f15c8abcd --- cmk/ec/main.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 30d746c..4e6f604 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -959,7 +959,7 @@ def get_event_history_from_mongodb(settings, table_events, query, mongodb): # Construct the mongodb filtering specification. We could fetch all information # and do filtering on this data, but this would be way too inefficient. query = {} - for column_name, operator_name, _predicate in filters: + for column_name, operator_name, _predicate, argument in filters: if operator_name == '=': mongo_filter = argument @@ -1174,7 +1174,7 @@ def get_event_history_from_file(settings, table_history, query, logger): 'event_core_host', ] greptexts = [] - for column_name, operator_name, _predicate in filters: + for column_name, operator_name, _predicate, argument in filters: # Make sure that the greptexts are in the same order as in the # actual logfiles. They will be joined with ".*"! try: @@ -1209,7 +1209,7 @@ def get_event_history_from_file(settings, table_history, query, logger): if limit is not None and limit <= 0: break first_entry, last_entry = get_logfile_timespan(path) - for _column_name, _operator_name, predicate in time_filters: + for _column_name, _operator_name, predicate, _argument in time_filters: if predicate(first_entry): break if predicate(last_entry): @@ -3209,7 +3209,7 @@ class Query(object): class QueryGET(Query): - filter_operators = { + _filter_operators = { "=": (lambda a, b: a == b), ">": (lambda a, b: a > b), "<": (lambda a, b: a < b), @@ -3252,13 +3252,13 @@ class QueryGET(Query): self.requested_columns = argument.split(" ") elif header == "Filter": - column_name, operator_name, predicate = self._parse_filter(argument) + column_name, operator_name, predicate, argument = self._parse_filter(argument) # Needed for later optimization (check_mkevents) if column_name == "event_host" and operator_name == 'in': self.only_host = set(argument) - self.filters.append((column_name, operator_name, predicate)) + self.filters.append((column_name, operator_name, predicate, argument)) elif header == "Limit": self.limit = int(argument) @@ -3300,7 +3300,7 @@ class QueryGET(Query): if not operator_function: raise MKClientError("Unknown filter operator '%s'" % operator_name) - return (column, operator_name, lambda x: operator_function(x, argument)) + return (column, operator_name, lambda x: operator_function(x, argument), argument) def requested_column_indexes(self): indexes = [] @@ -3490,7 +3490,7 @@ class StatusTableHistory(StatusTable): self._config = config self._mongodb = mongodb self._table_events = table_events - self._loger = logger + self._logger = logger def _enumerate(self, query): if self._config['archive_mode'] == 'mongodb': @@ -4622,7 +4622,7 @@ def do_notify(event_server, logger, event, username=None, is_cancelling=False): if core_has_notifications_disabled(event, logger): return - context = create_notification_context(event_server, event, username, is_cancelling) + context = create_notification_context(event_server, event, username, is_cancelling, logger) if logger.is_verbose(): logger.verbose("Sending notification via Check_MK with the following context:")

6 years, 4 months

Nuked g_logger global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 86ed42b88f5b5631436de6c5016015d988162f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86ed42b88f5b56… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 09:19:00 2018 +0200 Nuked g_logger global variable. Change-Id: Idf72fe0650a152e73343e75d682e5b9a514f5502 --- cmk/ec/main.py | 298 +++++++++++------------ tests/integration/cmk/ec/test_mkeventd_status.py | 2 +- 2 files changed, 149 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=86ed42b88f…

6 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018