Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

First try to add some unit test like mkeventd test

by Lars Michelsen

Module: check_mk Branch: master Commit: 7281142be4d4382769f47652130868bbf8588068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7281142be4d438… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 10:05:16 2017 +0200 First try to add some unit test like mkeventd test Change-Id: I615545e33a28f395c3cd7cf1d14e9428728230cc --- tests/mkeventd/test_mkeventd_status.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index 1d0fff5..c18e1dd 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -3,6 +3,7 @@ import pytest import time +import ast from testlib import web, ec, cmk_path # @@ -17,24 +18,42 @@ def test_mkeventd_unit(): def test_handle_client(monkeypatch): - class FakeSocket(object): + class FakeQueries(object): def __init__(self, sock): + self._sent = False pass def __iter__(self): return self def next(self): + if self._sent: + raise StopIteration() + + self._sent = True return ["GET events"] + + class FakeSocket(object): + def sendall(self, data): + if data == "\n": + return + response = ast.literal_eval(data) + assert type(response) == list + assert len(response) == 1 + assert "event_id" in response[0] + def close(self): pass - monkeypatch.setattr(mkeventd, "Queries", FakeSocket) + + monkeypatch.setattr(mkeventd, "Queries", FakeQueries) monkeypatch.setattr(mkeventd.StatusServer, "open_sockets", lambda x: None) - status = mkeventd.StatusServer() - print status.handle_client(None, True, "127.0.0.1") + mkeventd.g_status_server = mkeventd.StatusServer() + mkeventd.g_event_status = mkeventd.EventStatus() + + mkeventd.g_status_server.handle_client(FakeSocket(), True, "127.0.0.1") #

6 years, 9 months

EC: Status server do not open sockets in constructor anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d423e0bd771db0582de02dc1a1b4ed09df61cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d423e0bd771db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 11:18:37 2017 +0200 EC: Status server do not open sockets in constructor anymore Change-Id: I9165851b4476fd3002e7d2cd59192d4b048c7e13 --- bin/mkeventd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index abcfcbe..c64d962 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3081,12 +3081,12 @@ class EventServer(object): class StatusServer(object): def __init__(self): + super(StatusServer, self).__init__() self._socket = None self._tcp_socket = None self._reopen_sockets = False self._should_terminate = False self.logger = logger.getChild("StatusServer") - self.open_sockets() def open_sockets(self): @@ -4888,6 +4888,7 @@ if __name__ == "__main__": g_perfcounters = Perfcounters() g_event_status = EventStatus() g_status_server = StatusServer() + g_status_server.open_sockets() g_event_server = EventServer() g_event_status.load_status()

6 years, 9 months

5212 FIX check_mkevents: Improved performance

by Lars Michelsen

Module: check_mk Branch: master Commit: c4d1a4fd6122436fbc7c30f3f4b65f30678000be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4d1a4fd612243… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 11:41:59 2017 +0200 5212 FIX check_mkevents: Improved performance The performance of the check check_mkevents has been improved. This check is used when you configure the WATO rule "Check event state in Event Console". Change-Id: Ib8b5d24b5528f69c4c1df4df51ba9cf4ec77d32e --- .werks/5212 | 11 +++++++++++ active_checks/check_mkevents.cc | 14 +++++--------- bin/mkeventd | 16 +++++++++++----- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.werks/5212 b/.werks/5212 new file mode 100644 index 0000000..3a3e882 --- /dev/null +++ b/.werks/5212 @@ -0,0 +1,11 @@ +Title: check_mkevents: Improved performance +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506505155 +Class: fix + +The performance of the check check_mkevents has been improved. This +check is used when you configure the WATO rule "Check event state in Event Console". diff --git a/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc index e4986ef..3155fad 100644 --- a/active_checks/check_mkevents.cc +++ b/active_checks/check_mkevents.cc @@ -97,15 +97,12 @@ void usage() { " HOST may be a hostname, and IP address or hostname/IP-address."); } -string prepare_hostname_regex(const char *s) { +string prepare_host_match_list(const char *s) { const char *scan = s; string result; while (*scan != 0) { - if (strchr(R"([](){}^$.*+?|\)", *scan) != nullptr) { - result += R"(\)"; - result += *scan; - } else if (*scan == '/') { - result += "|"; + if (*scan == '/') { + result += " "; } else { result += *scan; } @@ -228,9 +225,8 @@ int main(int argc, char **argv) { string query_message; query_message += "GET events\nFilter: event_host "; if (strchr(host, '/') != nullptr) { - query_message += "~~ ^("; - query_message += prepare_hostname_regex(host); - query_message += ")$"; + query_message += "in "; + query_message += prepare_host_match_list(host); } else { query_message += "=~ "; query_message += host; diff --git a/bin/mkeventd b/bin/mkeventd index c64d962..9d8449c 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3474,9 +3474,11 @@ class StatusServer(object): argument = argument.strip() if header == "Filter": name, opfunc, argument = self.parse_filter(argument, columns) - # Needed for later optimization - if name == "event_host" and opfunc == filter_operators['=']: - only_host = argument + + # Needed for later optimization (check_mkevents) + if name == "event_host" and opfunc == filter_operators['in']: + only_host = set(argument) + filters.append((name, opfunc, argument)) elif header == "Limit": limit = int(argument) @@ -4042,14 +4044,18 @@ class EventStatus(object): def get_events(self, only_host = None): result = [] for event in self._events: - # A small optimization for check_mkevents - if only_host and event["host"] != only_host: + # Optimize filters that are set by the check_mkevents active check. Since users + # may have a lot of those checks running, it is a good idea to optimize this. + if only_host and event["host"] not in only_host: continue + event_line = [] for col_name, col_default in event_columns: without_prefix = col_name[6:] # drop event_ event_line.append(event.get(without_prefix, col_default)) + result.append(event_line) + return [ e[0] for e in event_columns ], result

6 years, 9 months

EC: Removed odd VerboseLock() and lock debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: ffff545c9e9b1045d669107023b9c3fca0e8776b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffff545c9e9b10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 07:19:16 2017 +0200 EC: Removed odd VerboseLock() and lock debugging When we need that lock debugging again, we extend the regular locking with logging functionality. Change-Id: Id97c87a8a558a72beacf7c459beadb8acaaeab56 --- bin/mkeventd | 38 ++++++---------------------------- tests/mkeventd/test_mkeventd_status.py | 21 +++++++++++++++++++ 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 05776d0..abcfcbe 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -75,7 +75,6 @@ logger = cmk.log.get_logger("mkeventd") # Defaults for command line modifiable options (TODO: Encapsulate this somehow) opt_verbose = 0 opt_debug = False -opt_debug_locking = False opt_foreground = False opt_profile = {} opt_syslog = False @@ -405,24 +404,6 @@ def replace_groups(text, origtext, groups): return text -# Class for debugging locking. Beware: This does not really -# implement a true locking! It's just for detecting deadlocks! -class VerboseLock(object): - def __init__(self, name): - self._depth = 0 - self._name = name - self.logger = logger.getChild("VerboseLock(%s)" % name) - - def __enter__(self): - self._depth += 1 - self.logger.debug("%d -> %d" % (self._depth-1, self._depth)) - return self - - def __exit__(self, type, value, tb): - self._depth -= 1 - self.logger.debug("%d -> %d" % (self._depth+1, self._depth)) - - class MKSignalException(Exception): def __init__(self, signum): Exception.__init__(self, "Got signal %d" % signum) @@ -4810,12 +4791,17 @@ The following paths are used by the Event Console: # | Main entry and option parsing | # '----------------------------------------------------------------------' +# Create locks for global data structures +lock_eventstatus = thread.allocate_lock() +lock_configuration = thread.allocate_lock() +lock_logging = thread.allocate_lock() + if __name__ == "__main__": os.unsetenv("LANG") short_options = "hvVg" long_options = [ "help", "version", "verbose", "debug", "foreground", - "profile-status", "profile-event", "debug-locking", + "profile-status", "profile-event", "syslog", "syslog-fd=", "syslog-tcp", "syslog-tcp-fd=", "snmptrap", "snmptrap-fd=" ] try: @@ -4827,8 +4813,6 @@ if __name__ == "__main__": opt_verbose += 1 elif o in [ '-d', '--debug' ]: opt_debug = True - elif o in [ '--debug-locking' ]: - opt_debug_locking = True elif o in [ '-g', '--foreground' ]: opt_foreground = True elif o == '--syslog': @@ -4900,16 +4884,6 @@ if __name__ == "__main__": make_parentdirs(g_logfile_path) make_parentdirs(g_state_dir + "/state") - # Create locks for global data structures - if opt_debug_locking: - lock_eventstatus = VerboseLock("eventstatus") - lock_configuration = VerboseLock("configuration") - lock_logging = VerboseLock("logging") - else: - lock_eventstatus = thread.allocate_lock() - lock_configuration = thread.allocate_lock() - lock_logging = thread.allocate_lock() - # First do all things that might fail, before daemonizing g_perfcounters = Perfcounters() g_event_status = EventStatus() diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index 1be1766..1d0fff5 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -16,6 +16,27 @@ def test_mkeventd_unit(): assert mkeventd +def test_handle_client(monkeypatch): + class FakeSocket(object): + def __init__(self, sock): + pass + + def __iter__(self): + return self + + def next(self): + return ["GET events"] + + def close(self): + pass + + monkeypatch.setattr(mkeventd, "Queries", FakeSocket) + monkeypatch.setattr(mkeventd.StatusServer, "open_sockets", lambda x: None) + status = mkeventd.StatusServer() + + print status.handle_client(None, True, "127.0.0.1") + + # # INTEGRATION TESTS #

6 years, 9 months

Fix notification cancelling for a subset of notification contacts

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 59f9e0e87c6346a23e24f01bb6b5576da702acf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f9e0e87c6346… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Sep 22 15:08:25 2017 +0200 Fix notification cancelling for a subset of notification contacts Change-Id: Id47b6c13992417715213edeee302b2331e1b242f --- cmk_base/notify.py | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index bfe4073..2f0ed09 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -413,8 +413,8 @@ def notify_rulebased(raw_context, analyse=False): # cannot cancel this notification via his personal notification rules. # Example: # notifications = { - # ( (aa, hh, ll), "email" ) : ( False, [], None ), - # ( (hh,), "sms" ) : ( True, [ "0171737337", "bar", { + # ( frozenset({"aa", "hh", "ll"}), "email" ) : ( False, [], None ), + # ( frozenset({"hh"}), "sms" ) : ( True, [ "0171737337", "bar", { # 'groupby': 'host', 'interval': 60} ] ), # } @@ -448,13 +448,31 @@ def notify_rulebased(raw_context, analyse=False): key = contacts, plugin if plugin_parameters is None: # cancelling - if key in notifications: - locked, plugin_parameters, bulk = notifications[key] + # notifications.keys() produces a copy of the keys. This copy + # is used to either delete a notification or to modify the + # notification contacts of an existing notification. + # For Python 3 list(notifications.keys()) would be necessary. + for notify_key in notifications.keys(): + notify_contacts, notify_plugin = notify_key + + overlap = notify_contacts.intersection(contacts) + if plugin != notify_plugin or not overlap: + continue + + locked, plugin_parameters, bulk = notifications[notify_key] + if locked and "contact" in rule: notify_log(" - cannot cancel notification of %s via %s: it is locked" % (contactstxt, plugintxt)) - else: - notify_log(" - cancelling notification of %s via %s" % (contactstxt, plugintxt)) + continue + + notify_log(" - cancelling notification of %s via %s" % (", ".join(overlap), plugintxt)) + + remaining = notify_contacts.difference(contacts) + if not remaining: del notifications[key] + else: + new_key = remaining, plugin + notifications[new_key] = notifications.pop(notify_key) elif contacts: if key in notifications: locked = notifications[key][0] @@ -601,7 +619,7 @@ def rbn_fake_email_contact(email): def rbn_add_contact_information(plugin_context, contacts): # TODO tb: Make contacts a reliable type. Righ now contacts can be - # a list of dicts or a list of strings. + # a list of dicts or a frozenset of strings. contact_dicts = [] keys = {"name", "alias", "email", "pager"} @@ -794,7 +812,7 @@ def rbn_rule_contacts(rule, context): all_enabled.append(contactname) - return tuple(all_enabled) # has to be hashable + return frozenset(all_enabled) # has to be hashable def rbn_match_contact_macros(rule, contactname, contact):

6 years, 9 months

mkeventd can now be imported as module (for testing)

by Lars Michelsen

Module: check_mk Branch: master Commit: ce3e5ef7b6466dbe5d188186070c60dfc8a26827 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce3e5ef7b6466d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 16:31:52 2017 +0200 mkeventd can now be imported as module (for testing) Change-Id: I0994b8889bd990cfe9b6e8eb3c882f727be60705 --- bin/mkeventd | 319 +++++++++++++++++---------------- tests/mkeventd/test_mkeventd_status.py | 17 +- 2 files changed, 177 insertions(+), 159 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ce3e5ef7b6…

6 years, 9 months

5117 esx_vsphere_vm.devices: Check mounted devices in order to monitor HA functionality

by Simon Betz

Module: check_mk Branch: master Commit: dea0e5d9ac0f9b99129179e56893d1a5f7cea504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea0e5d9ac0f9b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 24 12:18:27 2017 +0200 5117 esx_vsphere_vm.devices: Check mounted devices in order to monitor HA functionality If devices of typ VirtualCdrom, VirtualFloppy are mounted, the HA functionality of the ESX system is not guaranteed any more. Change-Id: Ie7709767820abd78b130e90f238d48bcda68cb5a --- .werks/5117 | 11 +++++++++ agents/special/agent_vsphere | 37 +++++++++++++++++++++------ checkman/esx_vsphere_vm.devices | 14 +++++++++++ checks/esx_vsphere_vm | 55 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 109 insertions(+), 8 deletions(-) diff --git a/.werks/5117 b/.werks/5117 new file mode 100644 index 0000000..fbee863 --- /dev/null +++ b/.werks/5117 @@ -0,0 +1,11 @@ +Title: esx_vsphere_vm.devices: Check mounted devices in order to monitor HA functionality +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503569745 +Class: feature + +If devices of the type VirtualCdrom, VirtualFloppy are mounted, +the HA functionality of the ESX system is not guaranteed any more. diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 8bfdc88..cebc547 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1013,6 +1013,15 @@ if opt_tracefile: sys.stderr.write("Path for tracefile %s does not exist" % opt_tracefile) sys.stderr.flush() + +# Create a search pattern for the get_pattern function +# create_search_pattern(["label", "summary", "startConnected", "allowGuestControl", "connected", "status"]) +def create_search_pattern(tokens): + pattern_elements = [] + for token in tokens: + pattern_elements.append("<%(token)s>(.*?)</%(token)s>" % {"token": token}) + return ".*?".join(pattern_elements) + def get_pattern(pattern, line): if not line: return [] @@ -1533,15 +1542,30 @@ if not error: vm_data = dict(get_pattern("<name>(.*?)</name><val.*?>(.*?)</val>", entry)) if opt_skip_placeholder_vm and is_placeholder_vm(vm_data.get("config.hardware.device")): continue - else: - # we don't need this in the agent output - if vm_data.get("config.hardware.device"): - del vm_data["config.hardware.device"] + if "runtime.host" in vm_data: vm_data["runtime.host"] = hostsystems.get(vm_data["runtime.host"], vm_data["runtime.host"]) vm_esx_host.setdefault(vm_data["runtime.host"], []).append(vm_data["name"]) + + def eval_virtual_device(info): + response = [] + virtual_devices = get_pattern("<VirtualDevice (.*?)</VirtualDevice>", info) + show_fields = ["label", "summary", "startConnected", "allowGuestControl", "connected", "status"] + search_pattern = create_search_pattern(show_fields) + for virtual_device in virtual_devices: + type_info = get_pattern("type=\"(.*?)\"", virtual_device) + device_info = get_pattern(search_pattern, virtual_device) + if device_info: + response.append("virtualDeviceType %s|%s" % + (type_info[0], + "|".join(map(lambda x: "%s %s" % x, zip(show_fields, device_info[0])))) + ) + + return "@@".join(response) + + def eval_snapshot_list(info): response = [] snapshot_info = get_pattern("<name>(.*?)</name>.*?<id>(.*?)</id><createTime>(.*?)</createTime><state>(.*?)</state>", info) @@ -1576,6 +1600,7 @@ if not error: transform_functions = { "snapshot.rootSnapshotList" : eval_snapshot_list, "config.datastoreUrl" : eval_datastores, + "config.hardware.device" : eval_virtual_device, } for key, transform in transform_functions.items(): if key in vm_data: @@ -1592,9 +1617,7 @@ if not error: if data.get("name"): output("<<<<%s>>>>" % convert_hostname(key)) output("<<<esx_vsphere_vm>>>") - entries = list(data.items()) - entries.sort() - for entry in entries: + for entry in sorted(data.items()): output("%s %s" % entry) diff --git a/checkman/esx_vsphere_vm.devices b/checkman/esx_vsphere_vm.devices new file mode 100644 index 0000000..f1df008 --- /dev/null +++ b/checkman/esx_vsphere_vm.devices @@ -0,0 +1,14 @@ +title: Virtual Machine under ESX: Mounted devices +agents: vsphere +catalog: os/kernel +license: GPL +distribution: check_mk +description: + For a virtual machine running on ESX this check reviews the + mounted devices in order to monitor HA functionality. + + Considered devices are of the type VirtualCdrom or VirtualFloppy. + If such device is connected, the check goes WARN, otherwise OK. + +inventory: + On each VM one check is generated. diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index d5492b5..efd3d13 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # TODO: name the next new subcheck "esx_vsphere_vm" and introduce a parse function def esx_vsphere_vm_convert(info): data = {} @@ -32,9 +33,9 @@ def esx_vsphere_vm_convert(info): if line[0] == "config.template" and line[1] == "true": return {} data[line[0]] = line[1:] - return data + # .--Memory--------------------------------------------------------------. # | __ __ | # | | \/ | ___ _ __ ___ ___ _ __ _ _ | @@ -453,3 +454,55 @@ check_info['esx_vsphere_vm.snapshots'] = { "group" : "vm_snapshots", "has_perfdata" : True, } + + +#. +# .--VM devices----------------------------------------------------------. +# | __ ____ __ _ _ | +# | \ \ / / \/ | __| | _____ _(_) ___ ___ ___ | +# | \ \ / /| |\/| | / _` |/ _ \ \ / / |/ __/ _ \/ __| | +# | \ V / | | | | | (_| | __/\ V /| | (_| __/\__ \ | +# | \_/ |_| |_| \__,_|\___| \_/ |_|\___\___||___/ | +# | | +# '----------------------------------------------------------------------' + + +def parse_esx_vsphere_vm_mounted_devices(info): + data = esx_vsphere_vm_convert(info).get("config.hardware.device", []) + parsed = {} + for device_data in " ".join(data).split("@@"): + device_attrs = {} + for entry in device_data.split("|"): + k, v = entry.split(" ", 1) + device_attrs.setdefault(k, v) + device_name = device_attrs["label"] + del device_attrs["label"] + parsed.setdefault(device_name, device_attrs) + return parsed + + +def inventory_esx_vsphere_vm_mounted_devices(info): + if parse_esx_vsphere_vm_mounted_devices(info): + return [(None, None)] + + +def check_esx_vsphere_vm_mounted_devices(item, params, info): + device_types = ['VirtualCdrom', 'VirtualFloppy'] + mounted_devices = [] + for device_name, attrs in parse_esx_vsphere_vm_mounted_devices(info).iteritems(): + if attrs['virtualDeviceType'] in device_types and \ + attrs['connected'] == 'true': + mounted_devices.append(device_name) + + if mounted_devices: + return 1, "HA functionality not guaranteed, Mounted devices: %s" % \ + ", ".join(mounted_devices) + else: + return 0, "HA functionality guaranteed" + + +check_info['esx_vsphere_vm.mounted_devices'] = { + "inventory_function" : inventory_esx_vsphere_vm_mounted_devices, + "check_function" : check_esx_vsphere_vm_mounted_devices, + "service_description" : "ESX Mounted Devices", +}

6 years, 9 months

EC: Removed various now useless command line options

by Lars Michelsen

Module: check_mk Branch: master Commit: b6202da21f913d3cfe7727dbc8f16e34b770b82b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6202da21f913d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 16:05:42 2017 +0200 EC: Removed various now useless command line options Since the EC is used only in OMD environments we removed the command line options to customize the paths from the mkeventd. Change-Id: Ia6b0bd1858e5be9b2301f6eef96c9aabd1b14c97 --- bin/mkeventd | 90 ++++++++++++++++-------------------------------------------- 1 file changed, 23 insertions(+), 67 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 763c969..220ffdb 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -51,6 +51,7 @@ import json import cmk import cmk.log +import cmk.paths import cmk.defines as defines import cmk.daemon import cmk.event_console @@ -71,6 +72,16 @@ logger = cmk.log.get_logger("mkeventd") # | Global declarations and defaults settings | # '----------------------------------------------------------------------' +# Set default values for options (TODO: Move to smaller scopes) +g_socket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/status" +g_eventsocket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/eventsocket" +g_pipe_path = cmk.paths.omd_root + "/tmp/run/mkeventd/events" +g_pid_file = cmk.paths.omd_root + "/tmp/run/mkeventd/pid" +g_logfile_path = cmk.paths.omd_root + "/var/log/mkeventd.log" +g_state_dir = cmk.paths.omd_root + "/var/mkeventd" +g_compiled_mibs_dir = cmk.paths.omd_root + "/local/share/check_mk/compiled_mibs" + + # Basic settings, can be changed with configuration file (at # least I hope so) @@ -713,7 +724,7 @@ g_mongo_db = None def mongodb_local_connection_opts(): ip, port = None, None - for l in file('%s/etc/mongodb.conf' % os.environ['OMD_ROOT']): + for l in file('%s/etc/mongodb.conf' % cmk.paths.omd_root): if l.startswith('bind_ip'): ip = l.split('=')[1].strip() elif l.startswith('port'): @@ -843,7 +854,7 @@ def get_event_history_from_mongodb(filters, limit): result = g_mongo_db.ec_archive.find(query).sort('time', -1) # Might be used for debugging / profiling - #file(os.environ['OMD_ROOT'] + '/var/log/check_mk/ec_history_debug.log', 'a').write(pprint.pformat(filters) + '\n' + pprint.pformat(result.explain()) + '\n') + #file(cmk.paths.omd_root + '/var/log/check_mk/ec_history_debug.log', 'a').write(pprint.pformat(filters) + '\n' + pprint.pformat(result.explain()) + '\n') if limit: result = result.limit(limit + 1) @@ -1434,7 +1445,7 @@ class EventServer(object): def run(self): if opt_profile.get("event"): import cProfile - profilefile = omd_root + "/var/mkeventd/event.profile" + profilefile = cmk.paths.omd_root + "/var/mkeventd/event.profile" self.logger.info("Writing profile of event thread to %s." % profilefile) try: cProfile.run("g_event_server.run_loop()", profilefile) @@ -3153,7 +3164,7 @@ class StatusServer(object): try: if opt_profile.get("status"): import cProfile - profilefile = omd_root + "/var/mkeventd/status.profile" + profilefile = cmk.paths.omd_root + "/var/mkeventd/status.profile" self.logger.info("Writing profile of status thread to %s." % profilefile) cProfile.run("g_status_server.serve()", profilefile) file(profilefile + ".py", "w").write("#!/usr/bin/env python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) @@ -4666,13 +4677,13 @@ def load_configuration(): global g_config, g_last_config_reload g_config = cmk.event_console.default_config() - main_file = os.path.join(g_config_dir, "mkeventd.mk") + main_file = os.path.join(cmk.paths.default_config_dir, "mkeventd.mk") if not os.path.exists(main_file): bail_out("Main configuration file %s missing." % main_file) config_files = ( os.path.join(dirpath, filename) - for dirpath, _dirnames, filenames in os.walk(os.path.join(g_config_dir, "mkeventd.d")) + for dirpath, _dirnames, filenames in os.walk(os.path.join(cmk.paths.default_config_dir, "mkeventd.d")) for filename in filenames if filename.endswith(".mk") ) @@ -4752,27 +4763,18 @@ def usage(): -g, --foreground Do not daemonize, run in foreground --debug Enable debug mode (let exceptions through) --debug-locking Debug locking and unlocking (thread communication) - -C, --configdir Path to directory where mkevent.mk lives - -S, --socket P Path to unix socket for querying status - -E, --eventsocket P Path to unix socket for receiving events (optional) - -P, --pipe P Path to pipe for receiving events --syslog Enable builtin UDP syslog server --syslog-fd FD Do not open UDP port 514, but inherit it via this FD --syslog-tcp Enable builtin TCP syslog server --syslog-tcp-fd FD Do not open TCP port 514, but inherit it via this FD --snmptrap Enable builtin snmptrap server --snmptrap-fd FD Do not open UDP port 162, but inherit it via this FD - --statedir D Path to directory for saving status - --logdir D Path to directory where mkeventd.log is created - -p, --pidfile Path to PID file --profile-status Create Python profile for status thread """) - if os.getenv("OMD_ROOT"): - sys.stdout.write("""You are running OMD, which is generally a good idea. -The following defaults are set: + sys.stdout.write(""" +The following paths are used by the Event Console: - Config dir: %(g_config_dir)s Unix socket: %(g_socket_path)s Event socket: %(g_eventsocket_path)s Event Pipe: %(g_pipe_path)s @@ -4782,9 +4784,6 @@ The following defaults are set: """ % globals()) - else: - sys.stdout.write("You are not running OMD, please specify -S and -P.\n") - #. # .--Main----------------------------------------------------------------. @@ -4798,8 +4797,6 @@ The following defaults are set: # | Main entry and option parsing | # '----------------------------------------------------------------------' -os.unsetenv("LANG") - opt_verbose = 0 opt_debug = False opt_debug_locking = False @@ -4812,31 +4809,10 @@ opt_syslog_tcp_fd = None opt_snmptrap = False opt_snmptrap_fd = None -# Set default values for options -omd_root = os.getenv("OMD_ROOT") -if omd_root: - g_config_dir = omd_root + "/etc/check_mk" - g_socket_path = omd_root + "/tmp/run/mkeventd/status" - g_eventsocket_path = omd_root + "/tmp/run/mkeventd/eventsocket" - g_pipe_path = omd_root + "/tmp/run/mkeventd/events" - g_pid_file = omd_root + "/tmp/run/mkeventd/pid" - g_logfile_path = omd_root + "/var/log/mkeventd.log" - g_state_dir = omd_root + "/var/mkeventd" - g_compiled_mibs_dir = omd_root + "/local/share/check_mk/compiled_mibs" -else: - g_config_dir = "/etc/check_mk" - g_socket_path = None - g_eventsocket_path = None - g_pipe_path = None - g_pid_file = "/var/run/mkeventd.pid" - g_logfile_path = "/var/log/mkeventd.log" - g_state_dir = "/var/lib/mkeventd" - g_compiled_mibs_dir = "/var/lib/mkeventd/compiled_mibs" - - -short_options = "hvVgS:P:p:C:E:" -long_options = [ "help", "version", "verbose", "debug", "foreground", "socket=", "eventsocket=", "pipe=", - "pidfile=", "statedir=", "configdir=", "logdir=", "profile-status", "profile-event", "debug-locking", + +short_options = "hvVg" +long_options = [ "help", "version", "verbose", "debug", "foreground", + "profile-status", "profile-event", "debug-locking", "syslog", "syslog-fd=", "syslog-tcp", "syslog-tcp-fd=", "snmptrap", "snmptrap-fd=" ] try: @@ -4852,12 +4828,6 @@ try: opt_debug_locking = True elif o in [ '-g', '--foreground' ]: opt_foreground = True - elif o in [ '-S', '--socket' ]: - g_socket_path = a - elif o in [ '-E', '--eventsocket' ]: - g_eventsocket_path = a - elif o in [ '-P', '--pipe' ]: - g_pipe_path = a elif o == '--syslog': opt_syslog = True elif o == '--syslog-fd': @@ -4870,14 +4840,6 @@ try: opt_snmptrap = True elif o == '--snmptrap-fd': opt_snmptrap_fd = int(a) - elif o in [ '-p', '--pidfile' ]: - g_pid_file = a - elif o in [ '-C', '--configdir' ]: - g_config_dir = a - elif o == '--logdir': - g_logfile_path = a + "/mkeventd.log" - elif o in [ '--statedir' ]: - g_state_dir = a elif o.startswith('--profile-'): opt_profile[o[10:]] = True @@ -4911,12 +4873,6 @@ try: from pysnmp.smi.error import SmiError from pyasn1.error import ValueConstraintError - if not g_pipe_path: - bail_out("Please specify the path to the pipe (using -P).") - - if not g_socket_path: - bail_out("Please specify the path to the socket (using -S).") - if not opt_foreground: cmk.log.open_log(g_logfile_path)

6 years, 9 months

5211 FIX Agent bakery: Reduced agent baking time when monitoring 0 hosts from central site

by Lars Michelsen

Module: check_mk Branch: master Commit: ec24b918acc34b3a285d42451033dd79874717c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec24b918acc34b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 15:39:25 2017 +0200 5211 FIX Agent bakery: Reduced agent baking time when monitoring 0 hosts from central site When having a distributed Check_MK/WATO environment where the central management site has zero hosts configured to be monitored, the time needed to bake agents was increased by a broken cache. This cache is now being used even when the central site is not monitoring any host. You could workaround this issue by adding a single host to be monitored from the central site. Change-Id: I448f69dcf59d5469f0aaf5c0f9457c34d8b49cfd --- .werks/5211 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5211 b/.werks/5211 new file mode 100644 index 0000000..2d65eb3 --- /dev/null +++ b/.werks/5211 @@ -0,0 +1,16 @@ +Title: Agent bakery: Reduced agent baking time when monitoring 0 hosts from central site +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1506432991 + +When having a distributed Check_MK/WATO environment where the central management site +has zero hosts configured to be monitored, the time needed to bake agents was increased +by a broken cache. This cache is now being used even when the central site is not monitoring +any host. + +You could workaround this issue by adding a single host to be monitored from the central site.

6 years, 9 months

Fixed wrong cache usage

by Lars Michelsen

Module: check_mk Branch: master Commit: edf26498dcc5d7a44415707f683d58d428d3a37f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edf26498dcc5d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 15:42:41 2017 +0200 Fixed wrong cache usage An empty cache does not mean that it has not be populated. An empty population result can also be a regular case in which the calculation should not be done twice. Example: A sites needs to detect the list of hosts to be monitored locally. Even when there are hundret of sites with thousands of hosts monitored on all sites, a empty result has to be cached for a site that does not monitor any host. Change-Id: Id69612525c3e8ffc3b02e578f8a4543aad055cc3 --- cmk_base/caching.py | 15 +++++++++++++++ cmk_base/config.py | 21 ++++++++++++++------- tests/cmk_base/test_caching.py | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/cmk_base/caching.py b/cmk_base/caching.py index e6451fa..28227b2 100644 --- a/cmk_base/caching.py +++ b/cmk_base/caching.py @@ -76,10 +76,25 @@ class CacheManager(object): class Cache(object): + _populated = False + def is_empty(self): + """Whether or not there is something in the collection at the moment""" return not self + def is_populated(self): + """Whether or not the cache has been marked as populated. This is just a flag + to tell the caller the initialization state of the cache. It has to be set + to True manually by using self.set_populated()""" + return self._populated + + + def set_populated(self): + self._populated = True + + + # Just a small wrapper round a dict to get some caching specific functionality # for analysis etc. class DictCache(dict, Cache): diff --git a/cmk_base/config.py b/cmk_base/config.py index b44c070..a8e37fb 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -399,8 +399,9 @@ def collect_hosttags(): # Returns a set of all active hosts def all_active_hosts(): cache = cmk_base.config_cache.get_set("all_active_hosts") - if cache.is_empty(): + if not cache.is_populated(): cache.update(all_active_realhosts(), all_active_clusters()) + cache.set_populated() return cache @@ -409,8 +410,9 @@ def all_active_hosts(): def all_active_realhosts(): active_realhosts = cmk_base.config_cache.get_set("active_realhosts") - if active_realhosts.is_empty(): + if not active_realhosts.is_populated(): active_realhosts.update(filter_active_hosts(all_configured_realhosts())) + active_realhosts.set_populated() return active_realhosts @@ -420,8 +422,9 @@ def all_active_realhosts(): def all_active_clusters(): active_clusters = cmk_base.config_cache.get_set("active_clusters") - if active_clusters.is_empty(): + if not active_clusters.is_populated(): active_clusters.update(filter_active_hosts(all_configured_clusters())) + active_clusters.set_populated() return active_clusters @@ -430,8 +433,9 @@ def all_active_clusters(): # disabled or monitored on a remote site. def all_configured_hosts(): cache = cmk_base.config_cache.get_set("all_configured_hosts") - if cache.is_empty(): + if not cache.is_populated(): cache.update(all_configured_realhosts(), all_configured_clusters()) + cache.set_populated() return cache @@ -440,8 +444,9 @@ def all_configured_hosts(): # cluster hosts. def all_configured_realhosts(): cache = cmk_base.config_cache.get_set("all_configured_realhosts") - if cache.is_empty(): + if not cache.is_populated(): cache.update(strip_tags(all_hosts)) + cache.set_populated() return cache @@ -450,8 +455,9 @@ def all_configured_realhosts(): # normal hosts. def all_configured_clusters(): cache = cmk_base.config_cache.get_set("all_configured_clusters") - if cache.is_empty(): + if not cache.is_populated(): cache.update(strip_tags(clusters.keys())) + cache.set_populated() return cache @@ -570,11 +576,12 @@ def parents_of(hostname): # If not, return an empty list. def clusters_of(hostname): cache = cmk_base.config_cache.get_dict("clusters_of") - if cache.is_empty(): + if not cache.is_populated(): for cluster, hosts in clusters.items(): clustername = cluster.split('|', 1)[0] for name in hosts: cache.setdefault(name, []).append(clustername) + cache.set_populated() return cache.get(hostname, []) diff --git a/tests/cmk_base/test_caching.py b/tests/cmk_base/test_caching.py index 33191eb..26deb00 100644 --- a/tests/cmk_base/test_caching.py +++ b/tests/cmk_base/test_caching.py @@ -71,3 +71,21 @@ def test_clear_all(): assert dict_cache.is_empty() assert set_cache.is_empty() + +def test_populated(): + mgr = cmk_base.caching.CacheManager() + + cache = mgr.get_set("test1") + assert not cache.is_populated() + cache.set_populated() + assert cache.is_populated() + + cache = mgr.get_dict("test2") + assert not cache.is_populated() + cache.set_populated() + assert cache.is_populated() + + cache = mgr.get_list("test3") + assert not cache.is_populated() + cache.set_populated() + assert cache.is_populated()

6 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017