Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

EC: Cleaned up threading code of EventStatus and EventServer

by Lars Michelsen

Module: check_mk Branch: master Commit: 3acc78840d53f9e59779ac6d6a88f2587614184e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3acc78840d53f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 08:51:48 2017 +0200 EC: Cleaned up threading code of EventStatus and EventServer Change-Id: Ie5485b9ddb7b9c721175d4f76c8db5e5696ca712 --- bin/mkeventd | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 9d8449c..d4d8a34 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -39,7 +39,7 @@ import time import sys import getopt import signal -import thread +import threading import pprint import re import select @@ -1239,12 +1239,13 @@ class Perfcounters(object): # | Verarbeitung und Klassifizierung von eingehenden Events. | # '----------------------------------------------------------------------' -class EventServer(object): +class EventServer(threading.Thread): month_names = { "Jan": 1, "Feb": 2, "Mar": 3, "Apr": 4, "May": 5, "Jun": 6, "Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12, } def __init__(self): + super(EventServer, self).__init__(name="EventServer") self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -3079,9 +3080,9 @@ class EventServer(object): # | Beantworten von Status- und Kommandoanfragen über das UNIX-Socket | # '----------------------------------------------------------------------' -class StatusServer(object): +class StatusServer(threading.Thread): def __init__(self): - super(StatusServer, self).__init__() + super(StatusServer, self).__init__(name="StatusServer") self._socket = None self._tcp_socket = None self._reopen_sockets = False @@ -3571,12 +3572,9 @@ class StatusServer(object): # | Starten und Verwalten der beiden Threads. | # '----------------------------------------------------------------------' -def run_thread(run_function, args=()): - return thread.start_new_thread(run_function, args) - def run_eventd(): - run_thread(g_status_server.run) - run_thread(g_event_server.run) + g_status_server.start() + g_event_server.start() now = time.time() next_housekeeping = now + g_config["housekeeping_interval"] next_retention = now + g_config["retention_interval"]

7 years, 2 months

EC: Readded (now real) debug logging for thread locking

by Lars Michelsen

Module: check_mk Branch: master Commit: 462e7ea3cacfced7a56f613765fb023ec6762bb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=462e7ea3cacfce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 09:02:21 2017 +0200 EC: Readded (now real) debug logging for thread locking Change-Id: I04b467214459209cb8fe5deb552aca12e7199487 --- bin/mkeventd | 46 ++++++++++++++++++++++++++++++++++++++++---- web/plugins/wato/mkeventd.py | 3 +++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index d4d8a34..e42d132 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -291,6 +291,40 @@ filter_operators = { # | Various helper functions | # '----------------------------------------------------------------------' +class ECLock(object): + def __init__(self, ident): + super(ECLock, self).__init__() + self._lock = threading.Lock() + self.logger = logger.getChild("lock.%s" % ident) + + + def acquire(self, blocking=True): + self.logger.debug("[%s] Trying to acquire lock", threading.current_thread().name) + + ret = self._lock.acquire(blocking) + if ret == True: + self.logger.debug("[%s] Acquired lock", threading.current_thread().name) + else: + self.logger.debug("[%s] Non-blocking aquire failed", threading.current_thread().name) + + return ret + + + def release(self): + self.logger.debug("[%s] Releasing lock", threading.current_thread().name) + self._lock.release() + + + def __enter__(self): + self.acquire() + + + def __exit__(self, exc_type, exc_val, exc_tb): + self.release() + return False # Do not swallow exceptions + + + def bail_out(reason): logger.error("FATAL ERROR: %s" % reason) sys.exit(1) @@ -1129,7 +1163,7 @@ def get_logfile_timespan(path): # '----------------------------------------------------------------------' class Perfcounters(object): def __init__(self): - self._lock = thread.allocate_lock() + self._lock = ECLock("perfcounters") # Event counters self._counters = { "messages": 0, @@ -4700,6 +4734,7 @@ def load_configuration(): "cmk.mkeventd.EventServer": log_level, "cmk.mkeventd.EventStatus": log_level, "cmk.mkeventd.StatusServer": log_level, + "cmk.mkeventd.lock": log_level, } logger.setLevel(g_config["log_level"]["cmk.mkeventd"]) @@ -4707,6 +4742,9 @@ def load_configuration(): logger.getChild("EventStatus").setLevel(g_config["log_level"]["cmk.mkeventd.EventStatus"]) logger.getChild("StatusServer").setLevel(g_config["log_level"]["cmk.mkeventd.StatusServer"]) + if "cmk.mkeventd.lock" in g_config["log_level"]: + logger.getChild("lock").setLevel(g_config["log_level"]["cmk.mkeventd.lock"]) + # Configure the auto deleting indexes in the DB when mongodb is enabled if g_config['archive_mode'] == 'mongodb': update_mongodb_indexes() @@ -4796,9 +4834,9 @@ The following paths are used by the Event Console: # '----------------------------------------------------------------------' # Create locks for global data structures -lock_eventstatus = thread.allocate_lock() -lock_configuration = thread.allocate_lock() -lock_logging = thread.allocate_lock() +lock_eventstatus = ECLock("eventstatus") +lock_configuration = ECLock("configuration") +lock_logging = ECLock("history") if __name__ == "__main__": os.unsetenv("LANG") diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 01b6680..7c294c4 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2770,6 +2770,9 @@ if mkeventd_enabled: _("Log level for managing already created events")), ("cmk.mkeventd.StatusServer", _("Status queries"), _("Log level for handling of incoming queries to the status socket")), + ("cmk.mkeventd.lock", _("Locking"), + _("Log level for the locking mechanics. Setting this to debug will enable " + "log entries for each lock/unlock action.")), ]: elements.append( (component, DropdownChoice(

7 years, 2 months

df: Fix btrfs compatibility issue introduced in Werk #4806

by Konstantin Büttner

Module: check_mk Branch: master Commit: 82c398bdfc1cb59144d222a6f891cb14af7f15b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82c398bdfc1cb5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 27 15:16:52 2017 +0200 df: Fix btrfs compatibility issue introduced in Werk #4806 Change-Id: I3bada28b8baef79c1848f7941663a36d9c5f76fe --- checks/df | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/df b/checks/df index 905d0ae..9d4a62d 100644 --- a/checks/df +++ b/checks/df @@ -114,11 +114,13 @@ def parse_df(info): if line[2] == "File" and line[3] == "System": line = [ line[0], " ".join(line[1:4]) ] + line[4:] + # This particular bit of magic originated in Werk #2671 and has the purpose of avoiding duplicate checks, + # as btrfs filesystems are often mounted at multiple mountpoints. We keep it for compatibility. if line[1] == "btrfs": device = line[0] if device not in btrfs_devices: btrfs_devices.add(device) - mountpoint = device + mountpoint = "btrfs " + device else: mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with /

7 years, 2 months

Add missing declaration of tcpport in mssql.vbs

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5c9ae44ab4f7d13e7275db13247e0cb627e512ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c9ae44ab4f7d1… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Sep 27 14:47:45 2017 +0200 Add missing declaration of tcpport in mssql.vbs Change-Id: I3bd6012f8575c1043fe8c0cb53490c637158b21f --- agents/windows/plugins/mssql.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index d1ddb36..d2fd34a 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -32,7 +32,7 @@ Option Explicit Dim WMI, FSO, SHO, items, objItem, prop, instVersion, registry Dim sources, instances, instance, instance_id, instance_name -Dim cfg_dir, cfg_file, hostname +Dim cfg_dir, cfg_file, hostname, tcpport Const HKLM = &H80000002

7 years, 2 months

Fixed missing parent constructor call

by Lars Michelsen

Module: check_mk Branch: master Commit: 00a4eac4252d88d3f986ca39f1d55cedd55b330a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a4eac4252d88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 15:04:33 2017 +0200 Fixed missing parent constructor call Change-Id: I0956c12e1aec39bccd1684b6820b462b8dbc125d --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index da44d4c..e504fb7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6945,9 +6945,9 @@ class ModeEditGlobals(ModeGlobalSettings): -# TODO: Move site specific global setting stuff to separate class class ModeEditGlobalSetting(WatoMode): def __init__(self): + super(ModeEditGlobalSetting, self).__init__() self._from_vars() self._back_mode = "globalvars"

7 years, 2 months

5213 Global settings can now be filtered to show only modified settings

by Lars Michelsen

Module: check_mk Branch: master Commit: ed014378ca2ae19e84f2fd321c2d9bbe575e5331 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed014378ca2ae1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 13:39:07 2017 +0200 5213 Global settings can now be filtered to show only modified settings To get a better view on the locally modified global settings it is now possible to filter the list of global settings to show only the modified ones. This affects the following places: <ul> <li>global settings</li> <li>site specific global settings</li> <li>event console settings</li> </ul> When the filtering is enabled, each page only shows the settings that have been modified on this page. E.g. the site specific global settings page only shows modified settings that are set specific for this site. Change-Id: I826d3139bd25195d4cf893db8379e9f7b686db59 --- .werks/5213 | 24 ++++++++++++++++++++++++ web/htdocs/wato.css | 4 +++- web/htdocs/wato.py | 17 +++++++++++++++-- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/.werks/5213 b/.werks/5213 new file mode 100644 index 0000000..f613ea9 --- /dev/null +++ b/.werks/5213 @@ -0,0 +1,24 @@ +Title: Global settings can now be filtered to show only modified settings +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506512099 +Class: feature + +To get a better view on the locally modified global settings it is now +possible to filter the list of global settings to show only the modified +ones. + +This affects the following places: + +<ul> + <li>global settings</li> + <li>site specific global settings</li> + <li>event console settings</li> +</ul> + +When the filtering is enabled, each page only shows the settings that +have been modified on this page. E.g. the site specific global settings +page only shows modified settings that are set specific for this site. diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index c8be8d7..17f6a4e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -682,9 +682,11 @@ form#form_timeperiod td.vlof_content { /* main menu */ -form.search { +form.search, div.filter_buttons { padding-top: 10px; clear: both; + display: inline-block; + margin-bottom: 10px; } .wato div.mainmenu a { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9edd75f..6f84153 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6730,6 +6730,7 @@ class ModeGlobalSettings(WatoMode): def __init__(self): super(ModeGlobalSettings, self).__init__() self._search = None + self._show_only_modified = False self._default_values = ConfigDomain.get_all_default_globals() self._global_settings = {} @@ -6740,6 +6741,7 @@ class ModeGlobalSettings(WatoMode): def _from_vars(self): self._search = get_search_expression() + self._show_only_modified = html.has_var("show_only_modified") def _group_names(self, show_all=False): @@ -6769,6 +6771,15 @@ class ModeGlobalSettings(WatoMode): search_form(_("Search for settings:")) search = self._search + html.open_div(class_="filter_buttons") + if self._show_only_modified: + html.buttonlink(html.makeuri([], delvars=["show_only_modified"]), + _("Show all settings")) + else: + html.buttonlink(html.makeuri([("show_only_modified", "1")]), + _("Show only modified settings")) + html.close_div() + at_least_one_painted = False html.open_div(class_="globalvars") for group_name in group_names: @@ -6785,6 +6796,9 @@ class ModeGlobalSettings(WatoMode): if not configvar_show_in_global_settings(varname): continue + if self._show_only_modified and varname not in self._current_settings: + continue + help_text = valuespec.help() or '' title_text = valuespec.title() @@ -6798,7 +6812,7 @@ class ModeGlobalSettings(WatoMode): if not header_is_painted: # always open headers when searching - forms.header(group_name, isopen=search) + forms.header(group_name, isopen=search or self._show_only_modified) header_is_painted = True default_value = self._default_values[varname] @@ -12355,7 +12369,6 @@ def search_form(title=None, mode=None, default_value=""): html.write_text(" ") html.button("_do_seach", _("Search")) html.end_form() - html.br() def get_search_expression():

7 years, 2 months

Refactored global setting edit dialog to WatoMode()

by Lars Michelsen

Module: check_mk Branch: master Commit: ec48d2705dd387b940470b526cb4810d5db77f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec48d2705dd387… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 12:36:04 2017 +0200 Refactored global setting edit dialog to WatoMode() Change-Id: Ic3f09bedc54eb1e8876af75e49f3d4c2adbb9b34 --- web/htdocs/wato.py | 209 ++++++++++++++++++++++--------------------- web/plugins/wato/mkeventd.py | 23 ++++- 2 files changed, 127 insertions(+), 105 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec48d2705d…

7 years, 2 months

Refactored site specific global setting edit dialog to separate mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 679bad898b3ff134876c1ae8e701fa08ced2cb6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679bad898b3ff1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 14:33:36 2017 +0200 Refactored site specific global setting edit dialog to separate mode Change-Id: Iaa687c80987dfba61238b449b19e72c5ba4b2274 --- web/htdocs/wato.py | 110 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 41 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6f84153..da44d4c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6944,6 +6944,7 @@ class ModeEditGlobals(ModeGlobalSettings): self._show_configuration_variables(self._group_names()) + # TODO: Move site specific global setting stuff to separate class class ModeEditGlobalSetting(WatoMode): def __init__(self): @@ -6952,14 +6953,6 @@ class ModeEditGlobalSetting(WatoMode): def _from_vars(self): - self._site_id = html.var("site") - if self._site_id: - self._configured_sites = SiteManagement.load_sites() - try: - site = self._configured_sites[self._site_id] - except KeyError: - raise MKUserError("site", _("Invalid site")) - self._varname = html.var("varname") try: self._domain, self._valuespec, self._need_restart, \ @@ -6970,26 +6963,16 @@ class ModeEditGlobalSetting(WatoMode): if not may_edit_configvar(self._varname): raise MKAuthException(_("You are not permitted to edit this global setting.")) - if self._site_id: - self._current_settings = site.setdefault("globals", {}) - self._global_settings = load_configuration_settings() - else: - self._current_settings = load_configuration_settings() - self._global_settings = {} + self._current_settings = load_configuration_settings() + self._global_settings = {} def title(self): - if self._site_id: - return _("Site-specific global configuration for %s") % self._site_id - else: - return _("Global configuration settings for Check_MK") + return _("Global configuration settings for Check_MK") def buttons(self): - if self._site_id: - html.context_button(_("Abort"), folder_preserving_link([("mode", "edit_site_globals"), ("site", self._site_id)]), "abort") - else: - html.context_button(_("Abort"), folder_preserving_link([("mode", "globalvars")]), "abort") + html.context_button(_("Abort"), folder_preserving_link([("mode", "globalvars")]), "abort") def action(self): @@ -7020,35 +7003,26 @@ class ModeEditGlobalSetting(WatoMode): # FIXME: THIS HTML(...) is needed because we do not know what we get from value_to_text!! msg = HTML(msg) - if self._site_id: - SiteManagement.save_sites(self._configured_sites, activate=False) - if self._site_id == config.omd_site(): - save_site_global_settings(self._current_settings) - add_change("edit-configvar", msg, sites=[self._site_id], domains=[self._domain], need_restart=self._need_restart) - - return "edit_site_globals" - else: - save_global_settings(self._current_settings) - add_change("edit-configvar", msg, domains=[self._domain], need_restart=self._need_restart, sites=self._affected_sites()) + self._save() + add_change("edit-configvar", msg, sites=self._affected_sites(), domains=[self._domain], need_restart=self._need_restart) - return self._back_mode + return self._back_mode def _affected_sites(self): return None # All sites + def _save(self): + save_global_settings(self._current_settings) + + def page(self): is_configured = self._varname in self._current_settings is_configured_globally = self._varname in self._global_settings default_values = ConfigDomain.get_all_default_globals() - if self._site_id: - self._global_settings = load_configuration_settings() - else: - self._global_settings = {} - defvalue = default_values[self._varname] value = self._current_settings.get(self._varname, self._global_settings.get(self._varname, defvalue)) @@ -7063,9 +7037,8 @@ class ModeEditGlobalSetting(WatoMode): self._valuespec.set_focus("ve") html.help(self._valuespec.help()) - if self._site_id and is_configured_globally: - forms.section(_("Global setting")) - html.write_html(self._valuespec.value_to_text(self._global_settings[self._varname])) + if is_configured_globally: + self._show_global_setting() forms.section(_("Factory setting")) html.write_html(self._valuespec.value_to_text(defvalue)) @@ -7094,6 +7067,56 @@ class ModeEditGlobalSetting(WatoMode): html.end_form() + def _show_global_setting(self): + pass + + + +class ModeEditSiteGlobalSetting(ModeEditGlobalSetting): + def __init__(self): + super(ModeEditSiteGlobalSetting, self).__init__() + self._back_mode = "edit_site_globals" + + + def _from_vars(self): + super(ModeEditSiteGlobalSetting, self)._from_vars() + + self._site_id = html.var("site") + if self._site_id: + self._configured_sites = SiteManagement.load_sites() + try: + site = self._configured_sites[self._site_id] + except KeyError: + raise MKUserError("site", _("Invalid site")) + + self._current_settings = site.setdefault("globals", {}) + self._global_settings = load_configuration_settings() + + + def title(self): + return _("Site-specific global configuration for %s") % self._site_id + + + def buttons(self): + html.context_button(_("Abort"), folder_preserving_link([("mode", "edit_site_globals"), + ("site", self._site_id)]), "abort") + + + def _affected_sites(self): + return [self._site_id] + + + def _save(self): + SiteManagement.save_sites(self._configured_sites, activate=False) + if self._site_id == config.omd_site(): + save_site_global_settings(self._current_settings) + + + def _show_global_setting(self): + forms.section(_("Global setting")) + html.write_html(self._valuespec.value_to_text(self._global_settings[self._varname])) + + #. # .--Groups--------------------------------------------------------------. # | ____ | @@ -9783,6 +9806,10 @@ class ModeEditSiteGlobals(ModeSites, ModeGlobalSettings): return None + def _edit_mode(self): + return "edit_site_configvar" + + def page(self): search = get_search_expression() html.help(_("Here you can configure global settings, that should just be applied " @@ -17208,6 +17235,7 @@ modes = { "auditlog" : (["auditlog"], ModeAuditLog), "globalvars" : (["global"], ModeEditGlobals), "edit_configvar" : (["global"], ModeEditGlobalSetting), + "edit_site_configvar": (["global"], ModeEditSiteGlobalSetting), "ldap_config" : (["global"], mode_ldap_config), "edit_ldap_connection": (["global"], mode_edit_ldap_connection), "static_checks" : (["rulesets"], ModeStaticChecksRulesets),

7 years, 2 months

Renamed manpage

by Simon Betz

Module: check_mk Branch: master Commit: 982d232ba268e7002bdea899579b79044376e6f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=982d232ba268e7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 27 13:19:08 2017 +0200 Renamed manpage Change-Id: I42118fc9d626986737fd515eb08e831904268b2a --- checkman/{esx_vsphere_vm.devices => esx_vsphere_vm.mounted_devices} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/esx_vsphere_vm.devices b/checkman/esx_vsphere_vm.mounted_devices similarity index 100% rename from checkman/esx_vsphere_vm.devices rename to checkman/esx_vsphere_vm.mounted_devices

7 years, 2 months

Add test to ensure performance of status queries made by check_mkevents

by Lars Michelsen

Module: check_mk Branch: master Commit: 3df9a77783edc7a90f105300c1a2c894bbda617b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df9a77783edc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 27 11:30:35 2017 +0200 Add test to ensure performance of status queries made by check_mkevents Change-Id: I67f6a7888b265469e7756a02e919c85ed2138c5c --- tests/mkeventd/test_mkeventd_status.py | 125 ++++++++++++++++++++++++++------- 1 file changed, 98 insertions(+), 27 deletions(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index c18e1dd..af608c8 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -17,43 +17,114 @@ def test_mkeventd_unit(): assert mkeventd -def test_handle_client(monkeypatch): - class FakeQueries(object): - def __init__(self, sock): - self._sent = False - pass +class FakeStatusSocket(object): + def __init__(self, query): + self._query = query + self._sent = False + self._response = "" - def __iter__(self): - return self + def recv(self, size): + if self._sent: + return "" - def next(self): - if self._sent: - raise StopIteration() + self._sent = True + return self._query - self._sent = True - return ["GET events"] + def sendall(self, data): + self._response += data + def close(self): + pass - 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 get_response(self): + response = ast.literal_eval(self._response) + assert type(response) == list + return response - def close(self): - pass +(a)pytest.fixture(scope="function") +def config(): + mkeventd.load_configuration() - monkeypatch.setattr(mkeventd, "Queries", FakeQueries) - monkeypatch.setattr(mkeventd.StatusServer, "open_sockets", lambda x: None) +(a)pytest.fixture(scope="function") +def status_server(): mkeventd.g_status_server = mkeventd.StatusServer() - mkeventd.g_event_status = mkeventd.EventStatus() - - mkeventd.g_status_server.handle_client(FakeSocket(), True, "127.0.0.1") + return mkeventd.g_status_server + + +(a)pytest.fixture(scope="function") +def event_status(): + mkeventd.g_event_status = mkeventd.EventStatus() + return mkeventd.g_event_status + + +(a)pytest.fixture(scope="function") +def perfcounters(): + mkeventd.g_perfcounters = mkeventd.Perfcounters() + return mkeventd.g_perfcounters + + +def test_handle_client(status_server, event_status): + s = FakeStatusSocket("GET events") + + status_server.handle_client(s, True, "127.0.0.1") + + response = s.get_response() + assert len(response) == 1 + assert "event_id" in response[0] + + +def test_mkevent_check_query_perf(config, status_server, event_status, perfcounters): + def new_event(num): + return { + "rule_id": 815, + "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@" % \ + (time.time(), num), + "phase": "open", + "count": 1, + "time": time.time(), + "first": time.time(), + "last": time.time(), + "comment": "", + "host": "heute-%d" % num, + "ipaddress": "127.0.0.1", + "application": "", + "pid": 0, + "priority": 3, + "facility": 1, # user + "match_groups": (), + } + + for n in range(10000): + event_status.new_event(new_event(n)) + assert len(event_status.events()) == 10000 + + s = FakeStatusSocket("GET events\n" + "Filter: event_host in heute-1 127.0.0.1 heute123\n" + "Filter: event_phase in open ack\n" + #"OutputFormat: plain\n" + #"Filter: event_application ~~ xxx\n" + ) + + before = time.time() + + #import cProfile, StringIO, pstats + #pr = cProfile.Profile() + #pr.enable() + status_server.handle_client(s, True, "127.0.0.1") + #pr.disable() + #ps = pstats.Stats(pr, stream=StringIO.StringIO()) + #ps.dump_stats("/tmp/test_mkevent_check_query_perf.profile") + + duration = time.time() - before + + response = s.get_response() + assert len(response) == 2 + assert "event_id" in response[0] + + assert duration < 0.2 #

7 years, 2 months

← Newer
1
2
3
4
5
6
7
...
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