Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

4990 Host tags: Tags of a tag group can now be sorted by the description

by Lars Michelsen

Module: check_mk Branch: master Commit: ced1c4f20adeaa4c6e351c438d542fc750055189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ced1c4f20adeaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 14:28:34 2017 +0200 4990 Host tags: Tags of a tag group can now be sorted by the description Change-Id: I0708d38e145817f1bc94783bd18a4fe8c223fba8 --- .werks/4990 | 10 ++++++++ web/htdocs/js/checkmk.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++- web/htdocs/valuespec.py | 14 +++++++++++ web/htdocs/wato.py | 4 +++- 4 files changed, 86 insertions(+), 2 deletions(-) diff --git a/.werks/4990 b/.werks/4990 new file mode 100644 index 0000000..5a53dea --- /dev/null +++ b/.werks/4990 @@ -0,0 +1,10 @@ +Title: Host tags: Tags of a tag group can now be sorted by the description +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499948872 +Class: feature + + diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 24eef6f..ba7b081 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2123,6 +2123,59 @@ function valuespec_listof_move(oA, varprefix, nr, where) { } +function valuespec_listof_sort(varprefix, magic, sort_by) { + var table = document.getElementById(varprefix + "_table"); + var tbody = table.firstChild; + var rows = tbody.rows; + + var entries = []; + for (var i = 0, td, sort_field_name, fields; i < rows.length; i++) { + // Find the index of this row + var td = rows[i].cells[0]; /* TD with buttons */ + if(td.children.length == 0) + continue; + var index = td.getElementsByClassName("orig_index")[0].value; + + sort_field_name = varprefix + "_" + index + "_" + sort_by; + + // extract the sort field value and add it to the entries list + // together with the row to be moved + fields = document.getElementsByName(sort_field_name); + if (fields.length == 0) { + return; // abort sorting + } + + entries.push({ + sort_value : fields[0].value, + row_node : rows[i] + }); + } + + entries.sort(function (a, b) { + if (a.sort_value.toLowerCase() < b.sort_value.toLowerCase()) { + return -1; + } + if (a.sort_value.toLowerCase() > b.sort_value.toLowerCase()) { + return 1; + } + return 0; + }); + + // Remove all rows from the list and then add the rows back to it + // in sorted order + + while (tbody.firstChild) { + tbody.removeChild(tbody.firstChild); + } + + for (var i = 0; i < entries.length; i++) { + tbody.appendChild(entries[i].row_node); + } + + valuespec_listof_fixarrows(tbody); +} + + function valuespec_listof_fixarrows(oTbody) { if(!oTbody || typeof(oTbody.rows) == undefined) { return; @@ -2137,7 +2190,12 @@ function valuespec_listof_fixarrows(oTbody) { continue; var oIndex = oTd.getElementsByClassName("index")[0]; - oIndex.value = "" + (parseInt(i) + 1); + if (oIndex.value === "") { + // initialization of recently added row + var orig_index = oTd.getElementsByClassName("orig_index")[0]; + orig_index.value = "" + (i+1); + } + oIndex.value = "" + (i+1); if (oTd.childNodes.length > 4) { /* movable */ var buttons = oTd.getElementsByClassName("iconbutton"); diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4fb02bb..ab88b86 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1204,6 +1204,11 @@ class ListOf(ValueSpec): self._text_if_empty = kwargs.get("text_if_empty", _("No entries")) self._allow_empty = kwargs.get("allow_empty", True) self._empty_text = kwargs.get("empty_text") # complain text if empty + # Makes a sort button visible that can be used to sort the list in the GUI + # (without submitting the form). But this currently only works for list of + # tuples that contain input field elements directly. The value of sort_by + # refers to the index of the sort values in the tuple + self._sort_by = kwargs.get("sort_by") if not self._empty_text: self._empty_text = _("Please specify at least one entry") @@ -1244,6 +1249,8 @@ class ListOf(ValueSpec): html.hidden_field(varprefix + "_indexof_" + self._magic, "", add_var=True, class_="index") # reconstruct order after moving stuff + html.hidden_field(varprefix + "_orig_indexof_" + self._magic, "", + add_var=True, class_="orig_index") self.del_button(varprefix, self._magic) if self._movable: self.move_button(varprefix, self._magic, "up") @@ -1281,6 +1288,8 @@ class ListOf(ValueSpec): html.open_td(class_="vlof_buttons") html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "", add_var=True, class_="index") # reconstruct order after moving stuff + html.hidden_field(varprefix + "_orig_indexof_%d" % (nr+1), "", + add_var=True, class_="orig_index") self.del_button(varprefix, nr+1) if self._movable: self.move_button(varprefix, nr+1, "up") # visibility fixed by javascript @@ -1294,6 +1303,11 @@ class ListOf(ValueSpec): html.br() html.jsbutton(varprefix + "_add", self._add_label, "valuespec_listof_add('%s', '%s')" % (varprefix, self._magic)) + if self._sort_by is not None: + html.jsbutton(varprefix + "_sort", _("Sort"), + "valuespec_listof_sort(%s, %s, %s)" % + (json.dumps(varprefix), json.dumps(self._magic), json.dumps(self._sort_by))) + html.javascript("valuespec_listof_fixarrows(document.getElementById('%s_table').childNodes[0]);" % varprefix) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9dbeb19..ec9f99d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11975,7 +11975,9 @@ class ModeEditHosttagGroup(ModeEditHosttagConfiguration): orientation = "horizontal"), add_label = _("Add tag choice"), - row_label = "@. Choice") + row_label = "@. Choice", + sort_by = 1, # sort by description + )

6 years, 11 months

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: ce51ebd168d238018bf0286912d228fd62a81ac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce51ebd168d238… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 13 14:25:39 2017 +0200 Reserved 10 Werk IDS Change-Id: I44b4690dfc3196e6d9607c1494d7d9f38e9c32fd --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b72271c..4e01312 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5018 +5028

6 years, 11 months

EC: Logging can now be configured with finer granularity

by Lars Michelsen

Module: check_mk Branch: master Commit: a5d76812199aac25af13ac98707064da642af9ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5d76812199aac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 12:27:14 2017 +0200 EC: Logging can now be configured with finer granularity Change-Id: I7243eae8419774e2d2e3f23f4ccd7b5e76170ca7 --- bin/mkeventd | 25 ++++++++++++++++++--- web/htdocs/wato.py | 2 +- web/plugins/wato/mkeventd.py | 53 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 69af468..17a0aeb 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -602,6 +602,7 @@ class HostConfig(object): def _set_logger(self): self.logger = logger.getChild("HostConfig") + #self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.HostConfig"]) def initialize(self): @@ -1276,6 +1277,7 @@ class EventServer(object): def _set_logger(self): self.logger = logger.getChild("EventServer") + self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventServer"]) def status_columns(self): @@ -3096,6 +3098,7 @@ class StatusServer(object): def _set_logger(self): self.logger = logger.getChild("StatusServer") + self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.StatusServer"]) def open_sockets(self): @@ -3655,6 +3658,7 @@ class EventStatus(object): def _set_logger(self): self.logger = logger.getChild("EventStatus") + self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventStatus"]) def flush(self): @@ -4711,9 +4715,19 @@ def load_configuration(): execfile(path, g_config, g_config) # If not set by command line, set the log level by configuration - # TODO: Change EC log level configuration to new cmk standard log levels if opt_verbose == 0: - cmk.log.set_verbosity(g_config["log_level"]) + # Transform old normal/verbose config + if g_config["log_level"] in (0, 1): + log_level = cmk.log.INFO if g_config["log_level"] == 0 else cmk.log.VERBOSE + + g_config["log_level"] = { + "cmk.mkeventd" : log_level, + "cmk.mkeventd.EventServer" : log_level, + "cmk.mkeventd.EventStatus" : log_level, + "cmk.mkeventd.StatusServer" : log_level, + } + + logger.setLevel(g_config["log_level"]["cmk.mkeventd"]) # Configure the auto deleting indexes in the DB when mongodb is enabled if g_config['archive_mode'] == 'mongodb': @@ -4753,7 +4767,12 @@ def default_config(): "actions" : [], "debug_rules" : False, "rule_optimizer" : True, - "log_level" : 0, + "log_level" : { + "cmk.mkeventd" : cmk.log.INFO, + "cmk.mkeventd.EventServer" : cmk.log.INFO, + "cmk.mkeventd.EventStatus" : cmk.log.INFO, + "cmk.mkeventd.StatusServer" : cmk.log.INFO, + }, "log_rulehits" : False, "log_messages" : False, "retention_interval" : 60, diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4dd6177..9dbeb19 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16667,7 +16667,7 @@ def is_a_checkbox(vs): def site_neutral_path(path): if path.startswith('/omd'): parts = path.split('/') - parts[3] = '<siteid>' + parts[3] = '[SITE_ID]' return '/'.join(parts) else: return path diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 505818b..f77e30a 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2756,18 +2756,51 @@ if mkeventd_enabled: domain = ConfigDomainEventConsole, ) + def ec_log_level_elements(): + elements = [] + + for component, title, help_txt in [ + ("cmk.mkeventd", _("General messages"), + _("Log level for all log messages that are not in one of the categories below")), + ("cmk.mkeventd.EventServer", _("Processing of incoming events"), + _("Log level for the processing of all incoming events")), + ("cmk.mkeventd.EventStatus", _("Event database"), + _("Log level for managing already created events")), + ("cmk.mkeventd.StatusServer", _("Status queries"), + _("Log level for handling of incoming queries to the status socket")), + ]: + elements.append( + (component, DropdownChoice( + title = title, + help = help_txt, + choices = [ + (cmk.log.CRITICAL, _("Critical") ), + (cmk.log.ERROR, _("Error") ), + (cmk.log.WARNING, _("Warning") ), + (cmk.log.INFO, _("Informational") ), + (cmk.log.VERBOSE, _("Verbose") ), + (cmk.log.DEBUG, _("Debug") ), + ], + default_value = cmk.log.INFO, + )) + ) + return elements + register_configvar(groups["ec_log"], "log_level", - DropdownChoice( - title = _("Log level"), - help = _("You can configure the Event Console to log more details about it's actions. " - "These information are logged into the file <tt>%s</tt>") % - site_neutral_path(cmk.paths.log_dir + "/mkeventd.log"), - choices = [ - (0, _("Normal logging")), - (1, _("Verbose logging")), - ], - default_value = 0, + Transform( + Dictionary( + title = _("Log level"), + help = _("You can configure the Event Console to log more details about it's actions. " + "These information are logged into the file <tt>%s</tt>") % + site_neutral_path(cmk.paths.log_dir + "/mkeventd.log"), + elements = ec_log_level_elements, + optional_keys = [], + ), + # Transform old values: + # 0 -> normal logging + # 1 -> verbose logging + forth=lambda x: {"cmk.mkeventd": (cmk.log.INFO if x == 0 else cmk.log.VERBOSE)} if x in (0, 1) else x, ), domain = ConfigDomainEventConsole, )

6 years, 11 months

by Lars Michelsen

Module: check_mk Branch: master Commit: dfb462b4589bd21d02fd4715556da0fc9771ed4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfb462b4589bd2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 11:22:59 2017 +0200 x Change-Id: Ied6668be94a42020ab3893dda1f6f7a53762b8d6 --- bin/mkeventd | 25 ++++++++++++++++++++++--- lib/log.py | 3 --- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index f016131..841007f 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -401,12 +401,12 @@ class VerboseLock(object): def __enter__(self): self._depth += 1 - self.logger.debug("%d -> %d" % (self._name, self._depth-1, self._depth)) + 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._name, self._depth+1, self._depth)) + self.logger.debug("%d -> %d" % (self._depth+1, self._depth)) class MKSignalException(Exception): @@ -597,6 +597,16 @@ def check_timeperiod(tpname): # TODO: Reload config on core reload class HostConfig(object): def __init__(self): + self._set_logger() + self.initialize() + + + def _set_logger(self): + self.logger = logger.getChild("HostConfig") + + + def initialize(self): + self.logger.debug("Initializing host config") self._event_host_to_host = {} self._hosts_by_name = {} @@ -644,6 +654,8 @@ class HostConfig(object): if self._got_config_from_core: return + self.logger.debug("Fetching host config from core") + columns = [ "name", "alias", @@ -662,6 +674,7 @@ class HostConfig(object): self._hosts_by_lower_alias[host["alias"].lower()] = host self._hosts_by_lower_address[host["alias"].lower()] = host + self.logger.debug("Got %d hosts from core" % len(self._hosts_by_name)) self._got_config_from_core = True @@ -2047,6 +2060,10 @@ class EventServer(object): g_event_status.remove_event(event) + def reload_configuration(self): + self.compile_rules(g_config["rules"], g_config["rule_packs"]) + self.host_config.initialize() + # Precompile regular expressions and similar stuff. Also convert legacy # "rules" parameter into new "rule_packs" parameter @@ -3345,7 +3362,8 @@ class StatusServer(object): with lock_configuration: load_configuration() initialize_snmptrap_handling() - g_event_server.compile_rules(g_config["rules"], g_config["rule_packs"]) + g_event_server.reload_configuration() + g_status_server.reload_configuration() self.logger.info("Reloaded configuration.") @@ -4919,6 +4937,7 @@ try: elif o.startswith('--profile-'): opt_profile[o[10:]] = True + cmk.log.open_log(sys.stderr) cmk.log.set_verbosity(opt_verbose) # now handle action options diff --git a/lib/log.py b/lib/log.py index df3dfec..f35eaed 100644 --- a/lib/log.py +++ b/lib/log.py @@ -116,9 +116,6 @@ def open_log(log_file_path, fallback_to=None): logfile = file(log_file_path, "a") logfile.flush() except Exception, e: - if cmk.debug.enabled(): - raise - logger.exception("Cannot open log file '%s': %s" % (log_file_path , e)) if fallback_to:

6 years, 11 months

EC: host config cache is now updated on core config reload

by Lars Michelsen

Module: check_mk Branch: master Commit: 178d21532289bfd8cf4df6616118a95daa6c2bab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=178d21532289bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 11:45:43 2017 +0200 EC: host config cache is now updated on core config reload Change-Id: I1d14fe6a4661fc8cf88c0727f807f33fa73281da --- bin/mkeventd | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 841007f..69af468 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -594,7 +594,6 @@ def check_timeperiod(tpname): # | It fetches and caches the information during runtine of the EC. | # '----------------------------------------------------------------------' -# TODO: Reload config on core reload class HostConfig(object): def __init__(self): self._set_logger() @@ -623,12 +622,16 @@ class HostConfig(object): def get_by_event_host_name(self, event_host_name, deflt=None): try: + self._update_from_core() + except: + self.logger.exception("Failed to get host info from core. Try again later.") + return + + try: return self._event_host_to_host[event_host_name] except KeyError: pass # Not cached yet - self._update_from_core() - # Note: It is important that we use exactly the same algorithm here as in the core # (enterprise/core/src/World.cc getHostByDesignation) # @@ -651,9 +654,10 @@ class HostConfig(object): def _update_from_core(self): - if self._got_config_from_core: + if not self._has_core_config_reloaded(): return + self.initialize() self.logger.debug("Fetching host config from core") columns = [ @@ -675,7 +679,25 @@ class HostConfig(object): self._hosts_by_lower_address[host["alias"].lower()] = host self.logger.debug("Got %d hosts from core" % len(self._hosts_by_name)) - self._got_config_from_core = True + self._got_config_from_core = self._get_core_start_time() + + + def _has_core_config_reloaded(self): + if not self._got_config_from_core: + return True + + if self._get_core_start_time() > self._got_config_from_core: + return True + + return False + + + def _get_core_start_time(self): + query = ( + "GET status\n" + "Columns: program_start\n" + ) + return livestatus.LocalConnection().query_value(query)

6 years, 11 months

Small cleanup of imports; get version from cmk module

by Lars Michelsen

Module: check_mk Branch: master Commit: 526304b3cae16656b1fb578b0e447c2047a98e16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=526304b3cae166… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 10:01:59 2017 +0200 Small cleanup of imports; get version from cmk module Change-Id: I7e7ed9190b61b34263c59d387d5277d510ebdb1c --- Makefile | 2 +- bin/mkeventd | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index dae19c8..b50d88b 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,7 @@ version: setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ - sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ + sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkbackup ; \ sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py bin/mkbench bin/livedump; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files diff --git a/bin/mkeventd b/bin/mkeventd index 2d8507e..065ab76 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -33,20 +33,28 @@ import ast import errno -import socket, os, time, sys, getopt, signal, thread, pprint, re, \ - select, subprocess, stat, string +import socket +import os +import time +import sys +import getopt +import signal +import thread +import pprint +import re +import select +import subprocess +import stat +import string import traceback -from cmk.regex import regex, is_regex +import json + +import cmk import cmk.defines as defines import cmk.daemon -import livestatus - -try: - import simplejson as json -except ImportError: - import json +from cmk.regex import regex, is_regex -VERSION="1.5.0i1" +import livestatus # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | @@ -4915,7 +4923,7 @@ try: usage() sys.exit(0) elif o in [ '-V', '--version' ]: - sys.stdout.write("mkeventd version %s\n" % VERSION) + sys.stdout.write("mkeventd version %s\n" % cmk.__version__) sys.exit(0) if opt_snmptrap: @@ -4945,7 +4953,7 @@ try: if not opt_foreground: open_logfile() log("-" * 65) - log("mkeventd version %s starting" % VERSION) + log("mkeventd version %s starting" % cmk.__version__) load_configuration()

6 years, 11 months

EC: refactored to use new style classes

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ca133a51e86cfc72fb0f364cd39bf7e89ded8b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ca133a51e86cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 10:47:31 2017 +0200 EC: refactored to use new style classes Change-Id: I4c98031ad0acef9611308671de2a8684b23d7665 --- bin/mkeventd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 6b8704f..f016131 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -390,7 +390,7 @@ def format_exception(): # Class for debugging locking. Beware: This does not really # implement a true locking! It's just for detecting deadlocks! -class VerboseLock: +class VerboseLock(object): def __init__(self, name): self._depth = 0 self._name = name @@ -425,7 +425,7 @@ class MKClientError(Exception): Exception.__init__(self, t) -class Queries: +class Queries(object): def __init__(self, sock): self._socket = sock self._buffer = "" @@ -1101,7 +1101,7 @@ def get_logfile_timespan(path): # +----------------------------------------------------------------------+ # | Helper class for performance counting | # '----------------------------------------------------------------------' -class Perfcounters: +class Perfcounters(object): def __init__(self): self._lock = thread.allocate_lock() # Event counters @@ -1213,7 +1213,7 @@ class Perfcounters: # | Verarbeitung und Klassifizierung von eingehenden Events. | # '----------------------------------------------------------------------' -class EventServer: +class EventServer(object): 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, } @@ -3045,7 +3045,7 @@ class EventServer: # | Beantworten von Status- und Kommandoanfragen über das UNIX-Socket | # '----------------------------------------------------------------------' -class StatusServer: +class StatusServer(object): def __init__(self): self._socket = None self._tcp_socket = None @@ -3606,7 +3606,7 @@ def run_eventd(): # | durch ein Lock vor gleichzeitigen Zugriffen durch die Threads. | # '----------------------------------------------------------------------' -class EventStatus(): +class EventStatus(object): def __init__(self): self._set_logger()

6 years, 11 months

4989 Added handling of host downtimes during event creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 97b3a4fccfe3b9f53f2f520c84e2128bcf185b88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97b3a4fccfe3b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 10:58:03 2017 +0200 4989 Added handling of host downtimes during event creation The Event Console is now saving whether or not a host that can be found in the core was in downtime or not. Based on this information the event handling can be influenced in different ways. The idea is: In the moment a host is in downtime all events generated by the host are "handled problems". The events should be created and be visible during the downtime to assist during maintenance. After maintenance the events that have been created in the downtime are not interesting anymore. What has changed: <ul> <li>Each event has a new attribute <tt>event_host_in_downtime</tt>. Assuming <i>0</i> (no) for existing events.</li> <li>It is possible to filter event views by this information</li> <li>Separate counting events are created for in downtime / not in downtime</li> <li>Events are added during downtime and visible in the default events views<li> <li>The tactical overview does not count events created in host downtime in the "handled problems" column</li> <li>Events created during downtime will be archived automatically after the host left the downtime</li> <li>Actions are handled independent of the downtime by default. But you have the option to only execute actions when the host was not in downtime</li> </ul> Events that are not associated with a monitoring host in the local site are not affected by the changes mentioned above. Change-Id: Ic571b8488134095c019965cc76ea36efcbfdec67 --- .werks/4989 | 36 ++++ bin/mkeventd | 300 +++++++++++++++++++++--------- livestatus/src/TableEventConsoleEvents.cc | 3 + web/htdocs/htmllib.py | 6 +- web/plugins/sidebar/shipped.py | 16 +- web/plugins/views/mkeventd.py | 271 ++++++++++++++------------- web/plugins/visuals/mkeventd.py | 1 + web/plugins/wato/mkeventd.py | 21 ++- 8 files changed, 432 insertions(+), 222 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=97b3a4fccf…

6 years, 11 months

Fixed wrong branch for tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c5541d68d2b9a9fe4e805fc6fca98853b7845e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c5541d68d2b9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 11:13:14 2017 +0200 Fixed wrong branch for tests Change-Id: Icc03a56aa25d2ec3317b9c2d12538a5bdd45476a --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index d719250..0d08e63 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -80,7 +80,7 @@ def _get_site_object(): return os.environ.get("EDITION", testlib.CMKVersion.CEE) def site_branch(): - return os.environ.get("BRANCH", "1.4.0") + return os.environ.get("BRANCH", "master") def reuse_site(): return os.environ.get("REUSE", "1") == "1"

6 years, 11 months

EC: Refactored logging mechanics

by Lars Michelsen

Module: check_mk Branch: master Commit: a84cb85b86dc700db1bde65a6681dd9acd8d6245 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a84cb85b86dc70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 13 10:46:24 2017 +0200 EC: Refactored logging mechanics Change-Id: I42b6a4d8f7166e369c854adc12578d02f3ba4397 --- bin/mkeventd | 408 ++++++++++++++++++++++++++++++----------------------------- lib/log.py | 38 ++++++ 2 files changed, 244 insertions(+), 202 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a84cb85b86…

6 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017