Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Remember history columns in History constructor.

by Sven Panne

Module: check_mk Branch: master Commit: 5e81cbd2639797ba490b823da9be2f972a116581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e81cbd2639797… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 13:19:08 2018 +0200 Remember history columns in History constructor. Change-Id: I79223798eb12bb600419e9ade15d2f631c78d148 --- cmk/ec/history.py | 47 ++++++++++++------------ cmk/ec/main.py | 4 +- tests/integration/cmk/ec/test_mkeventd_status.py | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/cmk/ec/history.py b/cmk/ec/history.py index 78e322e..fc2dce9 100644 --- a/cmk/ec/history.py +++ b/cmk/ec/history.py @@ -37,21 +37,23 @@ import cmk.render # TODO: As one can see clearly below, we should really have a class hierarchy here... class History(object): - def __init__(self, settings, config, logger, event_columns): + def __init__(self, settings, config, logger, event_columns, history_columns): super(History, self).__init__() self._settings = settings self._config = config self._logger = logger self._event_columns = event_columns + self._history_columns = history_columns self._lock_history = threading.Lock() self._mongodb = MongoDB() self.reload_configuration(config) def reload_configuration(self, config): - if config['archive_mode'] == 'mongodb': - _reload_configuration_mongodb(self, config) + self._config = config + if self._config['archive_mode'] == 'mongodb': + _reload_configuration_mongodb(self) else: - _reload_configuration_files(self, config) + _reload_configuration_files(self) def flush(self): if self._config['archive_mode'] == 'mongodb': @@ -65,11 +67,11 @@ class History(object): else: _add_files(self, active_history_period, event, what, who, addinfo) - def get(self, table_history, query): + def get(self, query): if self._config['archive_mode'] == 'mongodb': return _get_mongodb(self, query) else: - return _get_files(self, table_history, query) + return _get_files(self, query) def housekeeping(self): if self._config['archive_mode'] == 'mongodb': @@ -108,8 +110,7 @@ class MongoDB(object): self.db = None -def _reload_configuration_mongodb(history, config): - history._config = config +def _reload_configuration_mongodb(history): # Configure the auto deleting indexes in the DB _update_mongodb_indexes(history._settings, history._mongodb) _update_mongodb_history_lifetime(history._settings, history._config, history._mongodb) @@ -303,8 +304,8 @@ def _get_mongodb(history, query): # | Functions for logging the history of events | # '----------------------------------------------------------------------' -def _reload_configuration_files(history, config): - history._config = config +def _reload_configuration_files(history): + pass def _flush_files(history): @@ -415,7 +416,7 @@ def _expire_logfiles(settings, config, logger, lock_history, flush): logger.exception("Error expiring log files: %s" % e) -def _get_files(history, table_history, query): +def _get_files(history, query): filters, limit = query.filters, query.limit history_entries = [] if not history._settings.paths.history_dir.value.exists(): @@ -485,7 +486,7 @@ def _get_files(history, table_history, query): history._logger.info("Skipping logfile %s.log because of time filter" % ts) continue # skip this file - new_entries = _parse_history_file(table_history, path, query, greptexts, limit, history._logger) + new_entries = _parse_history_file(history, path, query, greptexts, limit, history._logger) history_entries += new_entries if limit is not None: limit -= len(new_entries) @@ -493,7 +494,7 @@ def _get_files(history, table_history, query): return history_entries -def _parse_history_file(table_history, path, query, greptexts, limit, logger): +def _parse_history_file(history, path, query, greptexts, limit, logger): entries = [] line_no = 0 # If we have greptexts we pre-filter the file using the extremely @@ -504,7 +505,7 @@ def _parse_history_file(table_history, path, query, greptexts, limit, logger): cmd += " | egrep -i -e %s" % cmk.ec.actions.quote_shell_string(".*".join(greptexts)) grep = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE) # nosec - headers = table_history.column_names + headers = [c[0] for c in history._history_columns] for line in grep.stdout: line_no += 1 @@ -515,7 +516,7 @@ def _parse_history_file(table_history, path, query, greptexts, limit, logger): try: parts = line.decode('utf-8').rstrip('\n').split('\t') - _convert_history_line(table_history, parts) + _convert_history_line(history, parts) values = [line_no] + parts if query.filter_row(values): entries.append(values) @@ -527,7 +528,7 @@ def _parse_history_file(table_history, path, query, greptexts, limit, logger): # Speed-critical function for converting string representation # of log line back to Python values -def _convert_history_line(table_history, values): +def _convert_history_line(history, values): # NOTE: history_line column is missing here, so indices are off by 1! :-P values[0] = float(values[0]) # history_time values[4] = int(values[4]) # event_id @@ -539,26 +540,26 @@ def _convert_history_line(table_history, values): values[15] = int(values[15]) # event_priority values[16] = int(values[16]) # event_facility values[18] = int(values[18]) # event_state - values[21] = _unsplit(values[21]) # event_match_groups + values[21] = _unsplit(values[21]) # event_match_groups num_values = len(values) if num_values <= 22: # event_contact_groups values.append(None) else: values[22] = _unsplit(values[22]) if num_values <= 23: # event_ipaddress - values.append(table_history.columns[24][1]) + values.append(history._history_columns[24][1]) if num_values <= 24: # event_orig_host - values.append(table_history.columns[25][1]) + values.append(history._history_columns[25][1]) if num_values <= 25: # event_contact_groups_precedence - values.append(table_history.columns[26][1]) + values.append(history._history_columns[26][1]) if num_values <= 26: # event_core_host - values.append(table_history.columns[27][1]) + values.append(history._history_columns[27][1]) if num_values <= 27: # event_host_in_downtime - values.append(table_history.columns[28][1]) + values.append(history._history_columns[28][1]) else: values[27] = values[27] == "1" if num_values <= 28: # event_match_groups_syslog_application - values.append(table_history.columns[29][1]) + values.append(history._history_columns[29][1]) else: values[28] = _unsplit(values[28]) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 6cca924..119adac 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2746,7 +2746,7 @@ class StatusTableHistory(StatusTable): self._table_events = table_events def _enumerate(self, query): - return self._history.get(self, query) + return self._history.get(query) class StatusTableRules(StatusTable): @@ -3948,7 +3948,7 @@ def main(): slave_status = default_slave_status_master() config = load_configuration(settings, logger, slave_status) - history = cmk.ec.history.History(settings, config, logger, StatusTableEvents.columns) + history = cmk.ec.history.History(settings, config, logger, StatusTableEvents.columns, StatusTableHistory.columns) pid_path = settings.paths.pid_file.value if pid_path.exists(): diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 8437863..6a8a2da 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -69,7 +69,7 @@ def config(settings, slave_status): @pytest.fixture(scope="function") def history(settings, config): - return cmk.ec.history.History(settings, config, logging.getLogger("cmk.mkeventd"), cmk.ec.main.StatusTableEvents.columns) + return cmk.ec.history.History(settings, config, logging.getLogger("cmk.mkeventd"), cmk.ec.main.StatusTableEvents.columns, cmk.ec.main.StatusTableHistory.columns) @pytest.fixture(scope="function")

6 years, 4 months

Removed dead parameters/members.

by Sven Panne

Module: check_mk Branch: master Commit: 7fb5605200b34efadc7f978bea0ba02e612ebf83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fb5605200b34e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 13:40:33 2018 +0200 Removed dead parameters/members. Change-Id: I414b2c079d8263db5d2c742be42a0e507781d49d --- cmk/ec/main.py | 29 ++++++++++++------------ tests/integration/cmk/ec/test_mkeventd_status.py | 4 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 119adac..1087ae0 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1298,7 +1298,7 @@ class EventServer(ECServerThread): } self._add_rule_contact_groups_to_event(rule, event) self.rewrite_event(rule, event, ()) - self._event_status.new_event(self._table_events, event) + self._event_status.new_event(event) self._history.add(self._active_history_period, event, "COUNTFAILED") cmk.ec.actions.event_has_opened(self._history, self.settings, self._config, self._logger, self, self._active_history_period, self._table_events, rule, event) if rule.get("autodelete"): @@ -1543,7 +1543,7 @@ class EventServer(ECServerThread): # count up. If the count reaches the limit, the event will # be opened and its rule actions performed. existing_event = \ - self._event_status.count_event(self, self._table_events, event, rule, count) + self._event_status.count_event(self, event, rule, count) if existing_event: if "delay" in rule: if self._config["debug_rules"]: @@ -1561,7 +1561,7 @@ class EventServer(ECServerThread): with self._lock_eventstatus: self._event_status.remove_event(existing_event) elif "expect" in rule: - self._event_status.count_expected_event(self, self._table_events, event) + self._event_status.count_expected_event(self, event) else: if "delay" in rule: if self._config["debug_rules"]: @@ -1583,7 +1583,7 @@ class EventServer(ECServerThread): # End of loop over rules. if self._config["archive_orphans"]: - self._event_status.archive_event(self._table_events, event) + self._event_status.archive_event(event) def _add_rule_contact_groups_to_event(self, rule, event): if rule.get("contact_groups") is None: @@ -2239,7 +2239,7 @@ class EventServer(ECServerThread): if self._handle_event_limit("by_rule", event): return False - self._event_status.new_event(self._table_events, event) + self._event_status.new_event(event) return True # The following actions can be configured: @@ -2291,7 +2291,7 @@ class EventServer(ECServerThread): if "overflow" in action: self._logger.info(" Creating overflow event") - self._event_status.new_event(self._table_events, overflow_event) + self._event_status.new_event(overflow_event) if "notify" in action: self._logger.info(" Creating overflow notification") @@ -2740,10 +2740,9 @@ class StatusTableHistory(StatusTable): ("history_addinfo", ""), ] + StatusTableEvents.columns - def __init__(self, history, table_events): + def __init__(self, history): super(StatusTableHistory, self).__init__() self._history = history - self._table_events = table_events def _enumerate(self, query): return self._history.get(query) @@ -2803,7 +2802,7 @@ class StatusServer(ECServerThread): self._reopen_sockets = False self.table_events = table_events # alias for reflection Kung Fu :-P - self.table_history = StatusTableHistory(history, table_events) + self.table_history = StatusTableHistory(history) self.table_rules = StatusTableRules(event_status) self.table_status = StatusTableStatus(event_server) self._perfcounters = perfcounters @@ -3041,7 +3040,7 @@ class StatusServer(ECServerThread): if len(arguments) != 2: raise MKClientError("Wrong number of arguments for DELETE") event_id, user = arguments - self._event_status.delete_event(self._table_events, int(event_id), user) + self._event_status.delete_event(int(event_id), user) def handle_command_update(self, arguments): event_id, user, acknowledged, comment, contact = arguments @@ -3392,7 +3391,7 @@ class EventStatus(object): self.num_existing_events_by_host[event["host"]] -= 1 self.num_existing_events_by_rule[event["rule_id"]] -= 1 - def new_event(self, table_events, event): + def new_event(self, event): self._perfcounters.count("events") event["id"] = self._next_event_id self._next_event_id += 1 @@ -3401,7 +3400,7 @@ class EventStatus(object): self._count_event_add(event) self._history.add(self._active_history_period, event, "NEW") - def archive_event(self, table_events, event): + def archive_event(self, event): self._perfcounters.count("events") event["id"] = self._next_event_id self._next_event_id += 1 @@ -3585,7 +3584,7 @@ class EventStatus(object): found.update(event) found.update(preserve) - def count_expected_event(self, event_server, table_events, event): + def count_expected_event(self, event_server, event): for ev in self._events: if ev["rule_id"] == event["rule_id"] and ev["phase"] == "counting": self.count_event_up(ev, event) @@ -3596,7 +3595,7 @@ class EventStatus(object): event["phase"] = "counting" event_server.new_event_respecting_limits(event) - def count_event(self, event_server, table_events, event, rule, count): + def count_event(self, event_server, event, rule, count): # Find previous occurrance of this event and acount for # one new occurrance. In case of negated count (expecting rules) # we do never modify events that are already in the state "open" @@ -3640,7 +3639,7 @@ class EventStatus(object): return False # do not do event action # locked with lock_eventstatus - def delete_event(self, table_events, event_id, user): + def delete_event(self, event_id, user): for nr, event in enumerate(self._events): if event["id"] == event_id: event["phase"] = "closed" diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 6a8a2da..53bc36a 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -112,9 +112,9 @@ def test_handle_client(status_server): assert "event_id" in response[0] -def test_mkevent_check_query_perf(config, event_status, status_server, table_events): +def test_mkevent_check_query_perf(config, event_status, status_server): for num in range(10000): - event_status.new_event(table_events, CMKEventConsole.new_event({ + event_status.new_event(CMKEventConsole.new_event({ "host": "heute-%d" % num, "text": "%s %s BLA BLUB DINGELING ABASD AD R#@A AR@AR A@ RA@R A@RARAR ARKNLA@RKA@LRKNA@KRLNA@RLKNA@äRLKA@RNKAL@R" \ " j:O#A@J$ KLA@J $L:A@J :AMW: RAMR@: RMA@:LRMA@ L:RMA@ :AL@R MA:L@RM A@:LRMA@ :RLMA@ R:LA@RMM@RL:MA@R: AM@" % \

6 years, 4 months

6087 FIX cups_queues: Fixed missing parameters if old format is used

by Simon Betz

Module: check_mk Branch: master Commit: 46dc3f3932d66355acdf14a0ad8947b5313139be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46dc3f3932d663… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 13:35:12 2018 +0200 6087 FIX cups_queues: Fixed missing parameters if old format is used Change-Id: Idcdc445cc25f8253567fed413221928674430b23 --- .werks/6087 | 11 +++++++++++ checks/cups_queues | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/6087 b/.werks/6087 new file mode 100644 index 0000000..1caa556 --- /dev/null +++ b/.werks/6087 @@ -0,0 +1,11 @@ +Title: cups_queues: Fixed missing parameters if old format is used +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526643172 + + diff --git a/checks/cups_queues b/checks/cups_queues index 7d0fbfe..ea8559a 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -99,8 +99,11 @@ def check_cups_queues(item, params, parsed): if item in parsed: data = parsed[item] if type(params) == tuple and len(params) == 4: - params = {"job_count" : (params[0], params[1]), - "job_age" : (params[2], params[3]), + params = {"job_count" : (params[0], params[1]), + "job_age" : (params[2], params[3]), + 'is_idle' : 0, + 'now_printing' : 0, + 'disabled_since' : 2, } if data["status_readable"] in params:

6 years, 4 months

6086 FIX oracle_processes: Handle Oracle specific error

by Simon Betz

Module: check_mk Branch: master Commit: 380ff748046f2dbcc0093eba85934655538d310c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=380ff748046f2d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 13:14:08 2018 +0200 6086 FIX oracle_processes: Handle Oracle specific error Change-Id: Iac269d3a47ba0b17038168707e8b0b84fbea827b --- .werks/6086 | 10 ++++++++++ checks/oracle_processes | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/6086 b/.werks/6086 new file mode 100644 index 0000000..617243a --- /dev/null +++ b/.werks/6086 @@ -0,0 +1,10 @@ +Title: oracle_processes: Handle Oracle specific error +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526642019 +Class: fix + + diff --git a/checks/oracle_processes b/checks/oracle_processes index 8bcceb5..cf7b4ea 100644 --- a/checks/oracle_processes +++ b/checks/oracle_processes @@ -37,11 +37,17 @@ factory_settings["oracle_processes_defaults"] = { } def inventory_oracle_processes(info): + return [ ( line[0], {} ) for line in info ] def check_oracle_processes(item, params, info): for line in info: if line[0] == item: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err processes_num = int(line[1]) processes_max = int(line[2]) @@ -75,4 +81,5 @@ check_info['oracle_processes'] = { "has_perfdata" : True, "default_levels_variable" : "oracle_processes_defaults", "group" : "oracle_processes", + "includes" : ["oracle.include"], }

6 years, 4 months

Unbreak event history table.

by Sven Panne

Module: check_mk Branch: master Commit: ae48ca7e16986490fec1a85d5fe5de87c33933a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae48ca7e169864… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 13:15:46 2018 +0200 Unbreak event history table. Change-Id: Ib7c2ed0f6b0a3af0a7ead3951b2756a23e0376fa --- 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 9c8fe1e..6cca924 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2746,7 +2746,7 @@ class StatusTableHistory(StatusTable): self._table_events = table_events def _enumerate(self, query): - self._history.get(self, query) + return self._history.get(self, query) class StatusTableRules(StatusTable):

6 years, 4 months

5928 FIX Provide option to deploy hyperv_vms_guestinfos plugin for Windows through Agent Bakery

by Jukka Aro

Module: check_mk Branch: master Commit: 7bcf21b14285d65478a599090b45d7a5517d083f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bcf21b14285d6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri May 18 12:03:45 2018 +0200 5928 FIX Provide option to deploy hyperv_vms_guestinfos plugin for Windows through Agent Bakery The Windows plugin hyperv_vms_guestinfos.ps1 was left without the option to deploy it with a baked Check_MK Windows agent. This is now fixed so that also this plugin can be deployed through Agent Bakery. Change-Id: I30d9e4162fb8a4377084489e98541277a8d32c09 --- .werks/5928 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5928 b/.werks/5928 new file mode 100644 index 0000000..99019541 --- /dev/null +++ b/.werks/5928 @@ -0,0 +1,14 @@ +Title: Provide option to deploy hyperv_vms_guestinfos plugin for Windows through Agent Bakery +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1526637427 +Class: fix + +The Windows plugin hyperv_vms_guestinfos.ps1 was left without the option to +deploy it with a baked Check_MK Windows agent. This is now fixed so that also +this plugin can be deployed through Agent Bakery. + +

6 years, 4 months

Moved filter_row to QueryGET class.

by Sven Panne

Module: check_mk Branch: master Commit: 680b75b4a2bf08c44d98ad7e44b5e0c647279b51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=680b75b4a2bf08… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 12:05:40 2018 +0200 Moved filter_row to QueryGET class. See http://wiki.c2.com/?FeatureEnvySmell Change-Id: I72826bd40fe607ccb48378456ae358768efdd0d9 --- cmk/ec/history.py | 2 +- cmk/ec/main.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmk/ec/history.py b/cmk/ec/history.py index 58869dd..78e322e 100644 --- a/cmk/ec/history.py +++ b/cmk/ec/history.py @@ -517,7 +517,7 @@ def _parse_history_file(table_history, path, query, greptexts, limit, logger): parts = line.decode('utf-8').rstrip('\n').split('\t') _convert_history_line(table_history, parts) values = [line_no] + parts - if table_history.filter_row(query, values): + if query.filter_row(values): entries.append(values) except Exception as e: logger.exception("Invalid line '%s' in history file %s: %s" % (line, path, e)) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 033acf5..9c8fe1e 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2571,6 +2571,12 @@ class QueryGET(Query): return indexes + def filter_row(self, row): + for column_name, _operator_name, predicate, _argument in self.filters: + if not predicate(row[self.table.column_indices[column_name]]): + return None + return row + class QueryREPLICATE(Query): pass @@ -2650,7 +2656,7 @@ class StatusTable(object): # Apply filters # TODO: History filtering is done in history load code. Check for improvements if query.filters and query.table_name != "history": - match = self.filter_row(query, row) + match = query.filter_row(row) if not match: continue @@ -2671,12 +2677,6 @@ class StatusTable(object): result_row.append(row[index]) return result_row - def filter_row(self, query, row): - for column_name, _operator_name, predicate, _argument in query.filters: - if not predicate(row[query.table.column_indices[column_name]]): - return None - return row - class StatusTableEvents(StatusTable): prefix = "event"

6 years, 4 months

6085 FIX innovaphone_licenses: Do not discover if no data is sent by special agent

by Simon Betz

Module: check_mk Branch: master Commit: fc16cd5abfdbfa8d7759117fe0747a3b01b6dcea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc16cd5abfdbfa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 12:59:18 2018 +0200 6085 FIX innovaphone_licenses: Do not discover if no data is sent by special agent Change-Id: I228d2964055efbe76a1162d52eb12667834c9ad6 --- .werks/6085 | 10 ++++++++++ checks/innovaphone_licenses | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6085 b/.werks/6085 new file mode 100644 index 0000000..7ad1407 --- /dev/null +++ b/.werks/6085 @@ -0,0 +1,10 @@ +Title: innovaphone_licenses: Do not discover if no data is sent by special agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526641125 +Class: fix + + diff --git a/checks/innovaphone_licenses b/checks/innovaphone_licenses index 888f11c..cc81c52 100644 --- a/checks/innovaphone_licenses +++ b/checks/innovaphone_licenses @@ -29,10 +29,13 @@ innovaphone_licenses_default_levels = ( 90.0, 95.0 ) def inventory_innovaphone_licenses(info): - return [ ( None, 'innovaphone_licenses_default_levels') ] + if info: + return [ ( None, 'innovaphone_licenses_default_levels') ] def check_innovaphone_licenses(_no_item, params, info): + if not info: + return total, used = map(savefloat, info[0]) perc_used = (100.0 * used) / total warn, crit = params

6 years, 4 months

6084 FIX apc_rackpdu_power: Do not discover services if device information is missing

by Simon Betz

Module: check_mk Branch: master Commit: 16ffc872cc1173d8f2423ae9b3165fa832b92d2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16ffc872cc1173… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 11:52:28 2018 +0200 6084 FIX apc_rackpdu_power: Do not discover services if device information is missing Change-Id: Ibd9027c18e60f5bd83b8435e8dd0f1c9c5d117c9 --- .werks/6084 | 10 ++++++++++ checks/apc_rackpdu_power | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6084 b/.werks/6084 new file mode 100644 index 0000000..1b485b6 --- /dev/null +++ b/.werks/6084 @@ -0,0 +1,10 @@ +Title: apc_rackpdu_power: Do not discover services if device information is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526637125 +Class: fix + + diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index 7ea0368..81feb80 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -99,7 +99,8 @@ check_info["apc_rackpdu_power"] = { '2', # PowerNet-MIB::rPDULoadStatusLoad '3', # PowerNet-MIB::rPDULoadStatusLoadState ])], - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp")\ + and oid(".1.3.6.1.4.1.318.1.1.12.1.*"), 'group' : 'el_inphase', 'includes' : [ 'elphase.include' ], }

6 years, 4 months

Remember event columns in History constructor.

by Sven Panne

Module: check_mk Branch: master Commit: 21603bed384cb1418de46e44608644840642e2a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21603bed384cb1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 11:52:17 2018 +0200 Remember event columns in History constructor. Change-Id: I2f6e6bb4a7cf2a939f32d4b9a5b2aaf24321750b --- cmk/ec/actions.py | 4 +-- cmk/ec/history.py | 19 +++++----- cmk/ec/main.py | 44 ++++++++++++------------ tests/integration/cmk/ec/test_mkeventd_status.py | 2 +- 4 files changed, 35 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=21603bed38…

6 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
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