Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Introduce classes for syslog priorites/facilities.

by Sven Panne

Module: check_mk Branch: master Commit: b0030cf4dcdd1ffaff590703a53231b4dd746f7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0030cf4dcdd1f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 11:14:43 2018 +0200 Introduce classes for syslog priorites/facilities. Added facilities 12-15 on the way, RFC 5424 mentions them. Change-Id: I5c51f2a76c0a2bfe418d7411e96bf96a4971f3eb --- cmk/ec/main.py | 96 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 24 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index e0e9bc4..a5f54cf 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -73,26 +73,75 @@ import cmk.render import livestatus import cmk.regex -# .--Declarations--------------------------------------------------------. -# | ____ _ _ _ | -# | | _ \ ___ ___| | __ _ _ __ __ _| |_(_) ___ _ __ ___ | -# | | | | |/ _ \/ __| |/ _` | '__/ _` | __| |/ _ \| '_ \/ __| | -# | | |_| | __/ (__| | (_| | | | (_| | |_| | (_) | | | \__ \ | -# | |____/ \___|\___|_|\__,_|_| \__,_|\__|_|\___/|_| |_|___/ | -# | | -# +----------------------------------------------------------------------+ -# | Global declarations and defaults settings | -# '----------------------------------------------------------------------' -# Basic settings, can be changed with configuration file (at -# least I hope so) +class SyslogPriority(object): + NAMES = { + 0: "emerg", + 1: "alert", + 2: "crit", + 3: "err", + 4:"warning", + 5: "notice", + 6: "info", + 7: "debug", + } + + def __init__(self, value): + super(SyslogPriority, self).__init__() + self.value = int(value) + + def __repr__(self): + return "SyslogPriority(%d)" % self.value + + def __str__(self): + try: + return self.NAMES[self.value] + except KeyError: + return "(unknown priority %d)" % self.value + + +class SyslogFacility(object): + NAMES = { + 0: 'kern', + 1: 'user', + 2: 'mail', + 3: 'daemon', + 4: 'auth', + 5: 'syslog', + 6: 'lpr', + 7: 'news', + 8: 'uucp', + 9: 'cron', + 10: 'authpriv', + 11: 'ftp', + 12: "ntp", + 13: "logaudit", + 14: "logalert", + 15: "clock", + 16: 'local0', + 17: 'local1', + 18: 'local2', + 19: 'local3', + 20: 'local4', + 21: 'local5', + 22: 'local6', + 23: 'local7', + 31: 'snmptrap', # HACK! + } + + def __init__(self, value): + super(SyslogFacility, self).__init__() + self.value = int(value) + + def __repr__(self): + return "SyslogFacility(%d)" % self.value + + def __str__(self): + try: + return self.NAMES[self.value] + except KeyError: + return "(unknown facility %d)" % self.value -syslog_priorities = ["emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"] -syslog_facilities = ["kern", "user", "mail", "daemon", "auth", "syslog", "lpr", "news", - "uucp", "cron", "authpriv", "ftp", - "(unused 12)", "(unused 13)", "(unused 13)", "(unused 14)", - "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", - None, None, None, None, None, None, None, "snmptrap"] grepping_filters = [ 'event_text', @@ -2108,13 +2157,12 @@ class EventServer(ECServerThread): if self._config["rule_optimizer"]: self._logger.info("Rule hash: %d rules - %d hashed, %d unspecific" % (len(self._rules), len(self._rules) - count_unspecific, count_unspecific)) - for facility in xrange(32): + for facility in range(23) + [31]: if facility in self._rule_hash: stats = [] for prio, entries in self._rule_hash[facility].iteritems(): - stats.append("%s(%d)" % (syslog_priorities[prio], len(entries))) - if syslog_facilities[facility]: - self._logger.info(" %-12s: %s" % (syslog_facilities[facility], " ".join(stats))) + stats.append("%s(%d)" % (SyslogPriority(prio), len(entries))) + self._logger.info(" %-12s: %s" % (SyslogFacility(facility), " ".join(stats))) def hash_rule(self, rule): # Construct rule hash for faster execution. @@ -2160,7 +2208,7 @@ class EventServer(ECServerThread): entries.reverse() for count, (facility, priority) in entries[:20]: self._logger.info(" %s/%s - %d (%.2f%%)" % ( - syslog_facilities[facility], syslog_priorities[priority], count, + SyslogFacility(facility), SyslogPriority(priority), count, (100.0 * count / float(total_count)))) def process_line(self, line, address): @@ -2211,7 +2259,7 @@ class EventServer(ECServerThread): if self._config["log_rulehits"]: self._logger.info("Rule '%s/%s' hit by message %s/%s - '%s'." % ( rule["pack"], rule["id"], - syslog_facilities[event["facility"]], syslog_priorities[event["priority"]], + SyslogFacility(event["facility"]), SyslogPriority(event["priority"]), event["text"])) if rule.get("drop"):

6 years, 4 months

Simplify predicate handling for filters.

by Sven Panne

Module: check_mk Branch: master Commit: 5fe3b320354447968868314148299ff127d586f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fe3b320354447… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 12:31:00 2018 +0200 Simplify predicate handling for filters. Change-Id: I67078ec38765c0979307bd9d03e97002ff4a5ece --- cmk/ec/main.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index bfcb7b4..a080583 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -972,7 +972,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, _operator_function, argument in filters: + for column_name, operator_name, _predicate in filters: if operator_name == '=': mongo_filter = argument @@ -1187,7 +1187,7 @@ def get_event_history_from_file(settings, table_history, query, logger): 'event_core_host', ] greptexts = [] - for column_name, operator_name, _operator_function, argument in filters: + for column_name, operator_name, _predicate in filters: # Make sure that the greptexts are in the same order as in the # actual logfiles. They will be joined with ".*"! try: @@ -1222,10 +1222,10 @@ 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, operator_function, argument in time_filters: - if operator_function(first_entry, argument): + for _column_name, _operator_name, predicate in time_filters: + if predicate(first_entry): break - if operator_function(last_entry, argument): + if predicate(last_entry): break else: # If no filter matches but we *have* filters @@ -3253,13 +3253,13 @@ class QueryGET(Query): self.requested_columns = argument.split(" ") elif header == "Filter": - column_name, operator_name, operator_function, argument = self._parse_filter(argument) + column_name, operator_name, predicate = 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, operator_function, argument)) + self.filters.append((column_name, operator_name, predicate)) elif header == "Limit": self.limit = int(argument) @@ -3301,7 +3301,7 @@ class QueryGET(Query): if not operator_function: raise MKClientError("Unknown filter operator '%s'" % operator_name) - return (column, operator_name, operator_function, argument) + return (column, operator_name, lambda x: operator_function(x, argument)) def requested_column_indexes(self): indexes = [] @@ -3417,8 +3417,8 @@ class StatusTable(object): return result_row def filter_row(self, query, row): - for column_name, _operator_name, operator_function, argument in query.filters: - if not operator_function(row[query.table.column_indices[column_name]], argument): + for column_name, _operator_name, predicate in query.filters: + if not predicate(row[query.table.column_indices[column_name]]): return None return row

6 years, 4 months

Do not compare lambdas, it's a bit fragile...

by Sven Panne

Module: check_mk Branch: master Commit: c8ef14a9e8ad4c984fafb0c7182b0b6760a2e5d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ef14a9e8ad4c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 12:13:45 2018 +0200 Do not compare lambdas, it's a bit fragile... Some renamings for uniformity on the way. Change-Id: I6d9935e8e3dc4d1349dd80c193c9dbb21e306214 --- cmk/ec/main.py | 88 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 78f3c28..bfcb7b4 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -972,38 +972,38 @@ 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 filter_name, opfunc, args in filters: - - if opfunc == filter_operators['=']: - mongo_filter = args - elif opfunc == filter_operators['>']: - mongo_filter = {'$gt': args} - elif opfunc == filter_operators['<']: - mongo_filter = {'$lt': args} - elif opfunc == filter_operators['>=']: - mongo_filter = {'$gte': args} - elif opfunc == filter_operators['<=']: - mongo_filter = {'$lte': args} - elif opfunc == filter_operators['~']: # case sensitive regex, find pattern in string - mongo_filter = {'$regex': args, '$options': ''} - elif opfunc == filter_operators['=~']: # case insensitive, match whole string - mongo_filter = {'$regex': args, '$options': 'mi'} - elif opfunc == filter_operators['~~']: # case insensitive regex, find pattern in string - mongo_filter = {'$regex': args, '$options': 'i'} - elif opfunc == filter_operators['in']: - mongo_filter = {'$in': args} + for column_name, operator_name, _operator_function, argument in filters: + + if operator_name == '=': + mongo_filter = argument + elif operator_name == '>': + mongo_filter = {'$gt': argument} + elif operator_name == '<': + mongo_filter = {'$lt': argument} + elif operator_name == '>=': + mongo_filter = {'$gte': argument} + elif operator_name == '<=': + mongo_filter = {'$lte': argument} + elif operator_name == '~': # case sensitive regex, find pattern in string + mongo_filter = {'$regex': argument, '$options': ''} + elif operator_name == '=~': # case insensitive, match whole string + mongo_filter = {'$regex': argument, '$options': 'mi'} + elif operator_name == '~~': # case insensitive regex, find pattern in string + mongo_filter = {'$regex': argument, '$options': 'i'} + elif operator_name == 'in': + mongo_filter = {'$in': argument} else: - raise Exception('Filter operator of filter %s not implemented for MongoDB archive' % filter_name) + raise Exception('Filter operator of filter %s not implemented for MongoDB archive' % column_name) - if filter_name[:6] == 'event_': - query['event.' + filter_name[6:]] = mongo_filter - elif filter_name[:8] == 'history_': - key = filter_name[8:] + if column_name[:6] == 'event_': + query['event.' + column_name[6:]] = mongo_filter + elif column_name[:8] == 'history_': + key = column_name[8:] if key == 'line': key = '_id' query[key] = mongo_filter else: - raise Exception('Filter %s not implemented for MongoDB' % filter_name) + raise Exception('Filter %s not implemented for MongoDB' % column_name) result = mongodb.db.ec_archive.find(query).sort('time', -1) @@ -1187,13 +1187,13 @@ def get_event_history_from_file(settings, table_history, query, logger): 'event_core_host', ] greptexts = [] - for filter_name, opfunc, args in filters: + for column_name, operator_name, _operator_function, argument in filters: # Make sure that the greptexts are in the same order as in the # actual logfiles. They will be joined with ".*"! try: - nr = grepping_filters.index(filter_name) - if opfunc in [filter_operators['='], filter_operators['~~']]: - greptexts.append((nr, args)) + nr = grepping_filters.index(column_name) + if operator_name in ['=' '~~']: + greptexts.append((nr, argument)) except Exception: pass @@ -1222,10 +1222,10 @@ 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 _unused_name, opfunc, argument in time_filters: - if opfunc(first_entry, argument): + for _column_name, _operator_name, operator_function, argument in time_filters: + if operator_function(first_entry, argument): break - if opfunc(last_entry, argument): + if operator_function(last_entry, argument): break else: # If no filter matches but we *have* filters @@ -3253,13 +3253,13 @@ class QueryGET(Query): self.requested_columns = argument.split(" ") elif header == "Filter": - name, opfunc, argument = self._parse_filter(argument) + column_name, operator_name, operator_function, argument = self._parse_filter(argument) # Needed for later optimization (check_mkevents) - if name == "event_host" and opfunc == filter_operators['in']: + if column_name == "event_host" and operator_name == 'in': self.only_host = set(argument) - self.filters.append((name, opfunc, argument)) + self.filters.append((column_name, operator_name, operator_function, argument)) elif header == "Limit": self.limit = int(argument) @@ -3278,7 +3278,7 @@ class QueryGET(Query): parts = textspec.split(None, 2) if len(parts) == 2: parts.append("") - column, operator, argument = parts + column, operator_name, argument = parts try: convert = self.table.column_types[column] @@ -3292,16 +3292,16 @@ class QueryGET(Query): # when the filter contains non ascii characters! # Fix this by making the default values unicode and skip unicode conversion # here (for performance reasons) because argument is already unicode. - if operator == 'in': + if operator_name == 'in': argument = map(convert, argument.split()) else: argument = convert(argument) - opfunc = filter_operators.get(operator) - if not opfunc: - raise MKClientError("Unknown filter operator '%s'" % operator) + operator_function = filter_operators.get(operator_name) + if not operator_function: + raise MKClientError("Unknown filter operator '%s'" % operator_name) - return (column, opfunc, argument) + return (column, operator_name, operator_function, argument) def requested_column_indexes(self): indexes = [] @@ -3417,8 +3417,8 @@ class StatusTable(object): return result_row def filter_row(self, query, row): - for column, opfunc, argument in query.filters: - if not opfunc(row[query.table.column_indices[column]], argument): + for column_name, _operator_name, operator_function, argument in query.filters: + if not operator_function(row[query.table.column_indices[column_name]], argument): return None return row

6 years, 4 months

Move filter_operators to smaller scope.

by Sven Panne

Module: check_mk Branch: master Commit: b0966808891507e8d5110d1bd90ad8aaccd4d025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0966808891507… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 12:32:31 2018 +0200 Move filter_operators to smaller scope. Change-Id: I705d20b02b929529261eb71176cd4ab89ce95576 --- cmk/ec/main.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a080583..30d746c 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -247,19 +247,6 @@ def convert_history_line(values): values[28] = unsplit(values[28]) -filter_operators = { - "=": (lambda a, b: a == b), - ">": (lambda a, b: a > b), - "<": (lambda a, b: a < b), - ">=": (lambda a, b: a >= b), - "<=": (lambda a, b: a <= b), - "~": (lambda a, b: cmk.regex.regex(b).search(a)), - "=~": (lambda a, b: a.lower() == b.lower()), - "~~": (lambda a, b: cmk.regex.regex(b.lower()).search(a.lower())), - "in": (lambda a, b: a in b), -} - - #. # .--Helper functions----------------------------------------------------. # | _ _ _ | @@ -3222,6 +3209,18 @@ class Query(object): class QueryGET(Query): + filter_operators = { + "=": (lambda a, b: a == b), + ">": (lambda a, b: a > b), + "<": (lambda a, b: a < b), + ">=": (lambda a, b: a >= b), + "<=": (lambda a, b: a <= b), + "~": (lambda a, b: cmk.regex.regex(b).search(a)), + "=~": (lambda a, b: a.lower() == b.lower()), + "~~": (lambda a, b: cmk.regex.regex(b.lower()).search(a.lower())), + "in": (lambda a, b: a in b), + } + def _from_raw_query(self, status_server): super(QueryGET, self)._from_raw_query(status_server) self._parse_table(status_server) @@ -3297,7 +3296,7 @@ class QueryGET(Query): else: argument = convert(argument) - operator_function = filter_operators.get(operator_name) + operator_function = self._filter_operators.get(operator_name) if not operator_function: raise MKClientError("Unknown filter operator '%s'" % operator_name)

6 years, 4 months

Moved grep filter table to a smaller scope.

by Sven Panne

Module: check_mk Branch: master Commit: d90da4c38b4841a6a6d936893f4f45d35ae3a5df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90da4c38b4841… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 14 11:17:57 2018 +0200 Moved grep filter table to a smaller scope. Change-Id: Ic9f9d3d4d474fc6ef8fd92b6d6d5ff1535c8abef --- cmk/ec/main.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a5f54cf..78f3c28 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -143,20 +143,6 @@ class SyslogFacility(object): return "(unknown facility %d)" % self.value -grepping_filters = [ - 'event_text', - 'event_comment', - 'event_host', - 'event_host_regex', - 'event_contact', - 'event_application', - 'event_rule_id', - 'event_owner', - 'event_ipaddress', - 'event_core_host', -] - - # Alas, we often have no clue about the actual encoding, so we have to guess: # Initially we assume UTF-8, but fall back to latin-1 if it didn't work. def decode_from_bytes(string_as_bytes): @@ -1188,6 +1174,18 @@ def get_event_history_from_file(settings, table_history, query, logger): # Optimization: use grep in order to reduce amount # of read lines based on some frequently used filters. + grepping_filters = [ + 'event_text', + 'event_comment', + 'event_host', + 'event_host_regex', + 'event_contact', + 'event_application', + 'event_rule_id', + 'event_owner', + 'event_ipaddress', + 'event_core_host', + ] greptexts = [] for filter_name, opfunc, args in filters: # Make sure that the greptexts are in the same order as in the

6 years, 4 months

6089 FIX Download agent page: Only link to rule sets in case the user is permitted to access it

by Lars Michelsen

Module: check_mk Branch: master Commit: 6815c92475f22b706a629500b78c8b09bd558ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6815c92475f22b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 11:35:24 2018 +0200 6089 FIX Download agent page: Only link to rule sets in case the user is permitted to access it Change-Id: If58e0fc19f61aa6f3fc7f68f0d5b58a2c8d15fa8 --- .werks/6089 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6089 b/.werks/6089 new file mode 100644 index 0000000..bf0c7f9 --- /dev/null +++ b/.werks/6089 @@ -0,0 +1,11 @@ +Title: Download agent page: Only link to rule sets in case the user is permitted to access it +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1526290491 + +

6 years, 4 months

Updated werk 6065

by Lars Michelsen

Module: check_mk Branch: master Commit: 2430f1229c6d2775d05f391cfd72c782cffe10d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2430f1229c6d27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:18:06 2018 +0200 Updated werk 6065 Change-Id: I93cb922aada487f8f2512a8030e8a761cd2a1f14 --- .werks/6065 | 2 +- checks/logwatch | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.werks/6065 b/.werks/6065 index b5c30d3..8c0e280 100644 --- a/.werks/6065 +++ b/.werks/6065 @@ -1,4 +1,4 @@ -Title: fileinfo.groups: Fixed broken discovery "Invalid output from webservice (malformed string)" +Title: fileinfo.groups logwatch.groups: Fixed broken discovery "Invalid output from webservice (malformed string)" Level: 1 Component: checks Class: fix diff --git a/checks/logwatch b/checks/logwatch index e32dfe8..02a824a 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -419,7 +419,8 @@ def logwatch_groups_of_logfile(group_patterns, filename): found_these_groups.setdefault(this_group_name, set()) found_these_groups[this_group_name].add(this_pattern) - return found_these_groups + # Convert pattern containers to lists (sets are not possible in autochecks) + return dict([ (k, list(v)) for k, v in found_these_groups.items() ]) def inventory_logwatch_groups(info):

6 years, 4 months

6066 FIX 389directory: Use "member" as group member attribute by default

by Lars Michelsen

Module: check_mk Branch: master Commit: f97d1667c8c9466c4853d1d6ed6fdc3762df1f95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f97d1667c8c946… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:08:20 2018 +0200 6066 FIX 389directory: Use "member" as group member attribute by default Change-Id: I9ec9acea2e73cecacb37c495a71a3e26179d2a63 --- .werks/6066 | 11 +++++++++++ web/plugins/userdb/ldap.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6066 b/.werks/6066 new file mode 100644 index 0000000..648591a --- /dev/null +++ b/.werks/6066 @@ -0,0 +1,11 @@ +Title: 389directory: Use "member" as group member attribute by default +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526285260 + + diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 67cf571..4b0075f 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -88,7 +88,7 @@ ldap_attr_map = { 'user_id': 'uid', 'pw_changed': 'krbPasswordExpiration', # group attributes - 'member': 'uniquemember', + 'member': 'member', }, }

6 years, 4 months

6067 FIX diskstat: Fixed error complaining about unknown diskstat_diskless_pattern

by Lars Michelsen

Module: check_mk Branch: master Commit: e261fd0812349ddae13a33583c6970db15776659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e261fd0812349d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:32:33 2018 +0200 6067 FIX diskstat: Fixed error complaining about unknown diskstat_diskless_pattern Change-Id: I042551ce3eb0e68c3d0f36961fb760282e884782 --- .werks/6067 | 11 +++++++++++ checks/diskstat | 3 --- checks/diskstat.include | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/6067 b/.werks/6067 new file mode 100644 index 0000000..a8170c8 --- /dev/null +++ b/.werks/6067 @@ -0,0 +1,11 @@ +Title: diskstat: Fixed error complaining about unknown diskstat_diskless_pattern +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526286734 + + diff --git a/checks/diskstat b/checks/diskstat index b2edbe7..95c70a6 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -102,9 +102,6 @@ # parsed = timestamp, disks -diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") - - def parse_diskstat(info): timestamp_str, proc_diskstat, name_info = diskstat_extract_name_info(info) timestamp = int(timestamp_str) diff --git a/checks/diskstat.include b/checks/diskstat.include index 619b13d..53c9aa8 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -43,6 +43,9 @@ diskstat_inventory = [] # ( [ 'summary', 'physical', 'lvm', 'vxvm' ], ALL_HOSTS ), # ] +diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") + + def inventory_diskstat_generic(parsed): # Skip over on empty data if not parsed:

6 years, 4 months

6068 FIX Fixed misleading "Last user synchronization ran into an exception : User synchronization" message

by Lars Michelsen

Module: check_mk Branch: master Commit: 84ce8aa0967f5e20f062803691b86c3e3b060c60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84ce8aa0967f5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:55:54 2018 +0200 6068 FIX Fixed misleading "Last user synchronization ran into an exception: User synchronization" message When opening the Users page of the configuration an error message "Last user synchronization ran into an exception: User synchronization" could be shown since 1.5.0b2. Even when no LDAP connection is configured. This error message has been fixed. Change-Id: I3d6d5ba18239078404b3bf1bef88f13778ae024a --- .werks/6068 | 12 ++++++++++++ web/htdocs/userdb.py | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/6068 b/.werks/6068 new file mode 100644 index 0000000..56a245a --- /dev/null +++ b/.werks/6068 @@ -0,0 +1,12 @@ +Title: Fixed misleading "Last user synchronization ran into an exception: User synchronization" message +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526288040 + +When opening the Users page of the configuration an error message "Last user synchronization ran into an exception: User synchronization" +could be shown since 1.5.0b2. Even when no LDAP connection is configured. This error message has been fixed. diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index edd4005..15de15c 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1378,3 +1378,4 @@ class UserSyncBackgroundJob(gui_background_job.GUIBackgroundJob): job_interface.send_progress_update(_("Finalizing synchronization")) general_userdb_job() + return True

6 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
...
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