Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6062 FIX checkpoint_ha_status: Workaround devices reporting wrong state information

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fb81e6ddb02b291c985afac6db3972f3d8f0f6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fb81e6ddb02b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 12:00:33 2018 +0200 6062 FIX checkpoint_ha_status: Workaround devices reporting wrong state information Some devices report a state of "Active\n" instead of "Active" which was not handled by the check. The state could not be determined correctly. Change-Id: Ia5aeba84366a6c18ff588f1eafcc12d64486b350 --- .werks/6062 | 12 ++++++++++++ checks/checkpoint_ha_status | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/6062 b/.werks/6062 new file mode 100644 index 0000000..e96f9d5 --- /dev/null +++ b/.werks/6062 @@ -0,0 +1,12 @@ +Title: checkpoint_ha_status: Workaround devices reporting wrong state information +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525859977 + +Some devices report a state of "Active\n" instead of "Active" which was not +handled by the check. The state could not be determined correctly. diff --git a/checks/checkpoint_ha_status b/checks/checkpoint_ha_status index 48e26d0..511c1ec 100644 --- a/checks/checkpoint_ha_status +++ b/checks/checkpoint_ha_status @@ -44,6 +44,9 @@ def inventory_checkpoint_ha_status(info): def check_checkpoint_ha_status(_no_item, _no_params, info): installed, major, minor, started, state, block_state, stat_code, stat_long = info[0] + # Some devices have a trailing "\n" in the state field. Drop it. + state = state.rstrip() + if installed == "0": yield 2, "Not installed" else:

6 years, 4 months

6071 FIX emcvnx_sp_util: Fixed UnboundLocalError 'busy_ticks'

by Simon Betz

referenced before assignment Message-ID: <5af2c6be.a6U4uLUAn+cHNtdN%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: ffd04c3508a0df6c264b7d5b2ea1279f0529897a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd04c3508a0df… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 11:59:51 2018 +0200 6071 FIX emcvnx_sp_util: Fixed UnboundLocalError 'busy_ticks' referenced before assignment Change-Id: Ie584caa9f14773b578ab8c868b4188936b36ba85 --- .werks/6071 | 10 ++++++++++ checks/emcvnx_sp_util | 29 +++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.werks/6071 b/.werks/6071 new file mode 100644 index 0000000..37cca4d --- /dev/null +++ b/.werks/6071 @@ -0,0 +1,10 @@ +Title: emcvnx_sp_util: Fixed UnboundLocalError 'busy_ticks' referenced before assignment +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525859964 +Class: fix + + diff --git a/checks/emcvnx_sp_util b/checks/emcvnx_sp_util index 46aac52..ed85a29 100644 --- a/checks/emcvnx_sp_util +++ b/checks/emcvnx_sp_util @@ -32,25 +32,29 @@ emcvnx_sp_util_default_levels = (50.0, 60.0) -def inventory_emcvnx_sp_util(info): - if info: +def parse_emcvnx_sp_util(info): + parsed = {} + for line in info: + if len(line) == 2 and "busy" in line[0]: + parsed.setdefault("busy", float(line[1])) + elif len(line) == 2 and "idle" in line[0]: + parsed.setdefault("idle", float(line[1])) + return parsed + + +def inventory_emcvnx_sp_util(parsed): + if "idle" in parsed and "busy" in parsed: return [ (None, "emcvnx_sp_util_default_levels") ] -def check_emcvnx_sp_util(item, params, info): - if not info: +def check_emcvnx_sp_util(item, params, parsed): + if not ("idle" in parsed and "busy" in parsed): return - for line in info: - if len(line) == 2 and "busy" in line[0]: - busy_ticks = float(line[1]) - elif len(line) == 2 and "idle" in line[0]: - idle_ticks = float(line[1]) - now = time.time() warn, crit = params - busy_ticks_rate = get_rate("emcvnx_sp_util.busy_ticks", now, busy_ticks ) - idle_ticks_rate = get_rate("emcvnx_sp_util.idle_ticks", now, idle_ticks ) + busy_ticks_rate = get_rate("emcvnx_sp_util.busy_ticks", now, parsed["busy"]) + idle_ticks_rate = get_rate("emcvnx_sp_util.idle_ticks", now, parsed["idle"]) if busy_ticks_rate + idle_ticks_rate == 0: sp_util = 0 else: @@ -70,6 +74,7 @@ def check_emcvnx_sp_util(item, params, info): check_info['emcvnx_sp_util'] = { + "parse_function" : parse_emcvnx_sp_util, "inventory_function" : inventory_emcvnx_sp_util, "check_function" : check_emcvnx_sp_util, "service_description" : "Storage Processor Utilization",

6 years, 4 months

6061 FIX Real time checks: Improved log messages in case of invalid messages

by Lars Michelsen

Module: check_mk Branch: master Commit: b4ff4ce7bab082d2078ba474fad1f7c4817a1167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4ff4ce7bab082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 11:54:35 2018 +0200 6061 FIX Real time checks: Improved log messages in case of invalid messages The error messages now contain the name of the related host. This makes it easier to find host related problems during debugging. Change-Id: I4cd9a4c78f3abd8fc90a81c9362c9d7ebf36b6a0 --- .werks/6061 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6061 b/.werks/6061 new file mode 100644 index 0000000..57c2530 --- /dev/null +++ b/.werks/6061 @@ -0,0 +1,12 @@ +Title: Real time checks: Improved log messages in case of invalid messages +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525859624 + +The error messages now contain the name of the related host. +This makes it easier to find host related problems during debugging.

6 years, 4 months

Synched test with latest EC changes.

by Sven Panne

Module: check_mk Branch: master Commit: e670af63fa00349c620b42286a4611b95464d2ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e670af63fa0034… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 11:43:32 2018 +0200 Synched test with latest EC changes. Change-Id: I085d607bba5e99def4360837de926be9cc1ddca8 --- tests/integration/cmk/ec/test_mkeventd_status.py | 26 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index aa709bb..e472e26 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -51,8 +51,13 @@ def slave_status(): @pytest.fixture(scope="function") -def config(settings, slave_status): - return cmk.ec.main.load_configuration(settings, slave_status) +def mongodb(): + return cmk.ec.main.MongoDB() + + +(a)pytest.fixture(scope="function") +def config(settings, slave_status, mongodb): + return cmk.ec.main.load_configuration(settings, slave_status, mongodb) @pytest.fixture(scope="function") @@ -61,8 +66,13 @@ def perfcounters(): @pytest.fixture(scope="function") -def event_status(settings, config, perfcounters): - return cmk.ec.main.EventStatus(settings, config, perfcounters) +def active_history_period(): + return cmk.ec.main.ActiveHistoryPeriod() + + +(a)pytest.fixture(scope="function") +def event_status(settings, config, perfcounters, mongodb, active_history_period): + return cmk.ec.main.EventStatus(settings, config, perfcounters, mongodb, active_history_period) @pytest.fixture(scope="function") @@ -71,13 +81,13 @@ def table_events(event_status): @pytest.fixture(scope="function") -def event_server(settings, config, slave_status, perfcounters, event_status, table_events): - return cmk.ec.main.EventServer(settings, config, slave_status, perfcounters, event_status, table_events) +def event_server(settings, config, slave_status, perfcounters, mongodb, active_history_period, event_status, table_events): + return cmk.ec.main.EventServer(settings, config, slave_status, perfcounters, mongodb, active_history_period, event_status, table_events) @pytest.fixture(scope="function") -def status_server(settings, config, slave_status, perfcounters, event_status, event_server, table_events): - return cmk.ec.main.StatusServer(settings, config, slave_status, perfcounters, event_status, event_server, table_events, threading.Event()) +def status_server(settings, config, slave_status, perfcounters, mongodb, active_history_period, event_status, event_server, table_events): + return cmk.ec.main.StatusServer(settings, config, slave_status, perfcounters, mongodb, active_history_period, event_status, event_server, table_events, threading.Event()) def test_handle_client(status_server):

6 years, 4 months

Nuked active_history_period global.

by Sven Panne

Module: check_mk Branch: master Commit: d1f0bafd40ef0d04f70e35d2987ea430c896746e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1f0bafd40ef0d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 11:14:27 2018 +0200 Nuked active_history_period global. Change-Id: I2dd9062569d6f19599b4edfeab0f838574f0cd64 --- cmk/ec/main.py | 105 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d1f0bafd40…

6 years, 4 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 02377b4426fb919d40b412e0bf8f4520d7d1c57f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02377b4426fb91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 08:59:13 2018 +0200 Removed dead code. Change-Id: I548b8f77382331ab5ef8ad9d9ed225b5de7fe0a2 --- cmk/ec/main.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0522cf9..a51188b 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3136,7 +3136,6 @@ class Queries(object): class Query(object): _allowed_formats = set(["python", "plain", "json"]) - _allowed_headers = set(["OutputFormat", "Filter", "Columns", "Limit"]) @staticmethod def make(status_server, raw_query): @@ -3204,11 +3203,6 @@ class QueryGET(Query): header, argument = line.rstrip("\n").split(":", 1) argument = argument.lstrip(" ") - # TODO: Be compatible with livestatus: Only log the issue to the log - #if header not in self._allowed_headers: - # raise MKClientError("Invalid header: \"%s\" (allowed are %s)" % - # ", ".join(self._allowed_headers)) - if header == "OutputFormat": if argument not in self._allowed_formats: raise MKClientError("Invalid output format \"%s\" "

6 years, 4 months

Do not log stack traces for client errors.

by Sven Panne

Module: check_mk Branch: master Commit: 61e969435943719d5b71dca7b84e9e4fe0fb4951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61e96943594371… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 09:22:55 2018 +0200 Do not log stack traces for client errors. Change-Id: I9d978fff40cf275a0c637dd5b2296e85ad12550e --- cmk/ec/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 8c0a512..df74d36 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3632,7 +3632,12 @@ class StatusServer(ECServerThread): self._perfcounters.count_time("request", duration) except Exception as e: - self.logger.exception("Error handling client %s: %s" % (addr_info, e)) + msg = "Error handling client %s: %s" % (addr_info, e) + # Do not log a stack trace for client errors, they are not *our* fault. + if isinstance(e, MKClientError): + self.logger.error(msg) + else: + self.logger.exception(msg) if client_socket: client_socket.close() client_socket = None

6 years, 4 months

Move the 2 parts of a MongoDB connection into a new class.

by Sven Panne

Module: check_mk Branch: master Commit: e6ee1015e221b3cfe42d9498ba1173eda0417655 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ee1015e221b3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 09:35:46 2018 +0200 Move the 2 parts of a MongoDB connection into a new class. Change-Id: Ic1af495cf7491656c88bd616d4b79bf57d2e1b62 --- cmk/ec/main.py | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index df74d36..f094e21 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -827,8 +827,15 @@ try: except ImportError: Connection = None -g_mongo_conn = None -g_mongo_db = None + +class MongoDB(object): + def __init__(self): + super(MongoDB, self).__init__() + self.connection = None + self.db = None + + +g_mongo = MongoDB() def mongodb_local_connection_opts(settings): @@ -843,19 +850,18 @@ def mongodb_local_connection_opts(settings): def connect_mongodb(settings): - global g_mongo_conn, g_mongo_db if Connection is None: raise Exception('Could not initialize MongoDB (Python-Modules are missing)') - g_mongo_conn = Connection(*mongodb_local_connection_opts(settings)) - g_mongo_db = g_mongo_conn.__getitem__(os.environ['OMD_SITE']) + g_mongo.connection = Connection(*mongodb_local_connection_opts(settings)) + g_mongo.db = g_mongo.connection.__getitem__(os.environ['OMD_SITE']) def flush_event_history_mongodb(): - g_mongo_db.ec_archive.drop() + g_mongo.db.ec_archive.drop() def get_mongodb_max_history_age(): - result = g_mongo_db.ec_archive.index_information() + result = g_mongo.db.ec_archive.index_information() if 'dt_-1' not in result or 'expireAfterSeconds' not in result['dt_-1']: return -1 else: @@ -863,28 +869,28 @@ def get_mongodb_max_history_age(): def update_mongodb_indexes(settings): - if not g_mongo_conn: + if not g_mongo.connection: connect_mongodb(settings) - result = g_mongo_db.ec_archive.index_information() + result = g_mongo.db.ec_archive.index_information() if 'time_-1' not in result: - g_mongo_db.ec_archive.ensure_index([('time', DESCENDING)]) + g_mongo.db.ec_archive.ensure_index([('time', DESCENDING)]) def update_mongodb_history_lifetime(settings, config): - if not g_mongo_conn: + if not g_mongo.connection: connect_mongodb(settings) if get_mongodb_max_history_age() == config['history_lifetime'] * 86400: return # do not update already correct index try: - g_mongo_db.ec_archive.drop_index("dt_-1") + g_mongo.db.ec_archive.drop_index("dt_-1") except OperationFailure: pass # Ignore not existing index # Delete messages after x days - g_mongo_db.ec_archive.ensure_index( + g_mongo.db.ec_archive.ensure_index( [('dt', DESCENDING)], expireAfterSeconds=config['history_lifetime'] * 86400, unique=False @@ -892,7 +898,7 @@ def update_mongodb_history_lifetime(settings, config): def mongodb_next_id(name, first_id=0): - ret = g_mongo_db.counters.find_and_modify( + ret = g_mongo.db.counters.find_and_modify( query={'_id': name}, update={'$inc': {'seq': 1}}, new=True @@ -900,7 +906,7 @@ def mongodb_next_id(name, first_id=0): if not ret: # Initialize the index! - g_mongo_db.counters.insert({ + g_mongo.db.counters.insert({ '_id': name, 'seq': first_id }) @@ -910,14 +916,14 @@ def mongodb_next_id(name, first_id=0): def log_event_history_to_mongodb(settings, event, what, who, addinfo): - if not g_mongo_conn: + if not g_mongo.connection: connect_mongodb(settings) # We converted _id to be an auto incrementing integer. This makes the unique # index compatible to history_line of the file (which is handled as integer) # within mkeventd. It might be better to use the ObjectId() of MongoDB, but # for the first step, we use the integer index for simplicity now = time.time() - g_mongo_db.ec_archive.insert({ + g_mongo.db.ec_archive.insert({ '_id': mongodb_next_id('ec_archive_id'), 'dt': datetime.datetime.fromtimestamp(now), 'time': now, @@ -933,7 +939,7 @@ def get_event_history_from_mongodb(settings, table_events, query): history_entries = [] - if not g_mongo_conn: + if not g_mongo.connection: connect_mongodb(settings) # Construct the mongodb filtering specification. We could fetch all information @@ -972,7 +978,7 @@ def get_event_history_from_mongodb(settings, table_events, query): else: raise Exception('Filter %s not implemented for MongoDB' % filter_name) - result = g_mongo_db.ec_archive.find(query).sort('time', -1) + result = g_mongo.db.ec_archive.find(query).sort('time', -1) # Might be used for debugging / profiling #file(cmk.paths.omd_root + '/var/log/check_mk/ec_history_debug.log', 'a').write(

6 years, 4 months

Simplified checks and fixed message.

by Sven Panne

Module: check_mk Branch: master Commit: 20480b186c727219fe1e78f2f00201cf7ad5714e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20480b186c7272… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 09:11:58 2018 +0200 Simplified checks and fixed message. Change-Id: I81ae6aa58075ae29b9b4415a7dc886e0cc672469 --- cmk/ec/main.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index d76eb0c..8c0a512 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3135,8 +3135,6 @@ class Queries(object): class Query(object): - _allowed_formats = set(["python", "plain", "json"]) - @staticmethod def make(status_server, raw_query): parts = raw_query[0].split(None, 1) @@ -3197,9 +3195,8 @@ class QueryGET(Query): argument = argument.lstrip(" ") if header == "OutputFormat": - if argument not in self._allowed_formats: - raise MKClientError("Invalid output format \"%s\" " - "(allowed are: %s)" % ", ".join(self._allowed_formats)) + if argument not in ["python", "plain", "json"]: + raise MKClientError("Invalid output format \"%s\" (allowed are: python, plain, json)" % argument) self.output_format = argument

6 years, 4 months

Move error handling where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: fbe98be1ec50fdacf9f2b3dd5ffddb846f57942a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbe98be1ec50fd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 09:06:18 2018 +0200 Move error handling where it belongs. Change-Id: I63dd079a744ad1fc86a1595572dc9e17b73426bc --- cmk/ec/main.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a51188b..d76eb0c 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3175,8 +3175,6 @@ class Query(object): class QueryGET(Query): - _allowed_tables = set(["events", "history", "rules", "status"]) - def _from_raw_query(self, status_server): super(QueryGET, self)._from_raw_query(status_server) self._parse_table(status_server) @@ -3184,11 +3182,6 @@ class QueryGET(Query): def _parse_table(self, status_server): self.table_name = self.method_arg - - if self.table_name not in self._allowed_tables: - raise MKClientError("Invalid table: %s (allowed are: %s)" % - (self.table_name, ", ".join(self._allowed_tables))) - self.table = status_server.table(self.table_name) def _parse_header_lines(self): @@ -3524,7 +3517,15 @@ class StatusServer(ECServerThread): self.open_tcp_socket() def table(self, name): - return getattr(self, "table_%s" % name) + if name == "events": + return self.table_events + if name == "history": + return self.table_history + if name == "rules": + return self.table_rules + if name == "status": + return self.table_status + raise MKClientError("Invalid table: %s (allowed are: events, history, rules, status)" % name) def open_unix_socket(self): path = self.settings.paths.unix_socket.value

6 years, 4 months

← Newer
1
...
24
25
26
27
28
29
30
...
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