Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Remove livestatus_fetch_query(), use livestatus.LocalConnection() instead

by Mathias Kettner

Module: check_mk Branch: master Commit: e211771664cf232d6684ff9b3a725c959188c1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e211771664cf23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:16:20 2016 +0100 Remove livestatus_fetch_query(), use livestatus.LocalConnection() instead Change-Id: Ia58b1bac8cd9edccca53a98bee5b331da4365369 --- modules/events.py | 42 +++++++++++++++++++++--------------------- modules/notify.py | 21 ++++++++++++++------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/modules/events.py b/modules/events.py index f81f5ba..89faef8 100644 --- a/modules/events.py +++ b/modules/events.py @@ -28,6 +28,7 @@ # only) by the alert handling import pprint, urllib, select, subprocess, socket +import livestatus, os from cmk.regex import regex @@ -187,36 +188,31 @@ def find_host_service_in_context(context): return host -def livestatus_fetch_query(query): - # TODO: use livestatus.py instead! - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.connect(cmk.paths.livestatus_unix_socket) - sock.send(query) - sock.shutdown(socket.SHUT_WR) - response = sock.recv(10000000) - sock.close() - return response - def livestatus_fetch_contacts(host, service): try: if service: - query = "GET services\nFilter: host_name = %s\nFilter: service_description = %s\nColumns: contacts\n" % ( + query = "GET services\nFilter: host_name = %s\nFilter: service_description = %s\nColumns: contacts" % ( host, service) else: - query = "GET hosts\nFilter: host_name = %s\nColumns: contacts\n" % host + query = "GET hosts\nFilter: host_name = %s\nColumns: contacts" % host + + contact_list = livestatus.LocalConnection().query_value(query) + if "check-mk-notify" in contact_list: # Remove artifical contact used for rule based notifications + contact_list.remove("check-mk-notify") + return contact_list - commasepped = livestatus_fetch_query(query).strip() - aslist = commasepped.split(",") - if "check-mk-notify" in aslist: # Remove artifical contact used for rule based notifications - aslist.remove("check-mk-notify") - return ",".join(aslist) + except livestatus.MKLivestatusNotFoundError: + if not service: + return None + else: + # Service not found: try again with contacts of host! + return livestatus_fetch_contacts(host, None) except Exception, e: - if cmk.debug.enabled(): + if True or cmk.debug.enabled(): raise - return "" # We must allow notifications without Livestatus access - + return None # We must allow notifications without Livestatus access @@ -224,7 +220,11 @@ def add_rulebased_macros(raw_context): # For the rule based notifications we need the list of contacts # an object has. The CMC does send this in the macro "CONTACTS" if "CONTACTS" not in raw_context: - raw_context["CONTACTS"] = livestatus_fetch_contacts(raw_context["HOSTNAME"], raw_context.get("SERVICEDESC")) + contact_list = livestatus_fetch_contacts( + raw_context["HOSTNAME"], + raw_context.get("SERVICEDESC")) + if contact_list != None: + raw_context["CONTACTS"] = ",".join(contact_list) # Add a pseudo contact name. This is needed for the correct creation diff --git a/modules/notify.py b/modules/notify.py index e372475..abc0cf6 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -795,17 +795,24 @@ def rbn_all_contacts(with_email=None): def rbn_groups_contacts(groups): if not groups: return {} - contacts = set([]) query = "GET contactgroups\nColumns: members\n" for group in groups: query += "Filter: name = %s\n" % group query += "Or: %d\n" % len(groups) - response = livestatus_fetch_query(query) - for line in response.splitlines(): - line = line.strip() - if line: - contacts.update(line.split(",")) - return contacts + + try: + contacts = set([]) + for contact_list in livestatus.LocalConnection().query_column(query): + contacts.update(contact_list) + return contacts + + except livestatus.MKLivestatusNotFoundError: + return [] + + except Exception, e: + if cmk.config.debug: + raise + return [] def rbn_emails_contacts(emails):

7 years, 9 months

Added inline comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 8773d9ef6c7d253c70aabf4f0314ebb0e89c904b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8773d9ef6c7d25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 15:34:47 2016 +0100 Added inline comment Change-Id: If2861e6f6b87d4df5e69a93bc4ea3aa0ed75f664 --- modules/notify.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/notify.py b/modules/notify.py index 203efa0..1e26a4e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -811,6 +811,7 @@ def rbn_object_contacts(context): if commasepped: return commasepped.split(",") else: + # TODO: Hier die Fallback-Contacts eintragen! return [] @@ -1688,6 +1689,7 @@ def notify_log(message): if notification_logging >= 1: event_log(notification_log, message) + def notify_log_debug(message): if notification_logging >= 2: notify_log(message)

7 years, 9 months

Move some functions from notify.py to events.py

by Mathias Kettner

Module: check_mk Branch: master Commit: f017dc63308bc63914e5edfccfb56fec30d83f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f017dc63308bc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 15:36:09 2016 +0100 Move some functions from notify.py to events.py Reason: notify depends on events - not vice versa. But these functions were called from events to notify. Change-Id: I45877bbb4ba107181bc8d931ff8e8f205ecf683e --- modules/events.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/notify.py | 43 ------------------------------------------- 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/modules/events.py b/modules/events.py index 0c4afa2..f81f5ba 100644 --- a/modules/events.py +++ b/modules/events.py @@ -186,6 +186,55 @@ def find_host_service_in_context(context): else: return host + +def livestatus_fetch_query(query): + # TODO: use livestatus.py instead! + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(cmk.paths.livestatus_unix_socket) + sock.send(query) + sock.shutdown(socket.SHUT_WR) + response = sock.recv(10000000) + sock.close() + return response + + +def livestatus_fetch_contacts(host, service): + try: + if service: + query = "GET services\nFilter: host_name = %s\nFilter: service_description = %s\nColumns: contacts\n" % ( + host, service) + else: + query = "GET hosts\nFilter: host_name = %s\nColumns: contacts\n" % host + + commasepped = livestatus_fetch_query(query).strip() + aslist = commasepped.split(",") + if "check-mk-notify" in aslist: # Remove artifical contact used for rule based notifications + aslist.remove("check-mk-notify") + return ",".join(aslist) + + except Exception, e: + if cmk.debug.enabled(): + raise + return "" # We must allow notifications without Livestatus access + + + + +def add_rulebased_macros(raw_context): + # For the rule based notifications we need the list of contacts + # an object has. The CMC does send this in the macro "CONTACTS" + if "CONTACTS" not in raw_context: + raw_context["CONTACTS"] = livestatus_fetch_contacts(raw_context["HOSTNAME"], raw_context.get("SERVICEDESC")) + + + # Add a pseudo contact name. This is needed for the correct creation + # of spool files. Spool files are created on a per-contact-base, as in classical + # notifications the core sends out one individual notification per contact. + # In the case of rule based notifications we do not make distinctions between + # the various contacts. + raw_context["CONTACTNAME"] = "check-mk-notify" + + # Add a few further helper variables that are useful in notification and alert plugins def complete_raw_context(raw_context, with_dump, event_log): raw_keys = list(raw_context.keys()) diff --git a/modules/notify.py b/modules/notify.py index 1e26a4e..e372475 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -508,19 +508,6 @@ def rbn_finalize_plugin_parameters(hostname, plugin, rule_parameters): else: return rule_parameters -def add_rulebased_macros(raw_context): - # For the rule based notifications we need the list of contacts - # an object has. The CMC does send this in the macro "CONTACTS" - if "CONTACTS" not in raw_context: - raw_context["CONTACTS"] = livestatus_fetch_contacts(raw_context["HOSTNAME"], raw_context.get("SERVICEDESC")) - - # Add a pseudo contact name. This is needed for the correct creation - # of spool files. Spool files are created on a per-contact-base, as in classical - # notifications the core sends out one individual notification per contact. - # In the case of rule based notifications we do not make distinctions between - # the various contacts. - raw_context["CONTACTNAME"] = "check-mk-notify" - # Create a table of all user specific notification rules. Important: # create deterministic order, so that rule analyses can depend on @@ -574,27 +561,6 @@ def rbn_add_contact_information(plugin_context, contact): rbn_add_contact_information(plugin_context, contact_dict) -def livestatus_fetch_contacts(host, service): - try: - if service: - query = "GET services\nFilter: host_name = %s\nFilter: service_description = %s\nColumns: contacts\n" % ( - host, service) - else: - query = "GET hosts\nFilter: host_name = %s\nColumns: contacts\n" % host - - commasepped = livestatus_fetch_query(query).strip() - aslist = commasepped.split(",") - if "check-mk-notify" in aslist: # Remove artifical contact used for rule based notifications - aslist.remove("check-mk-notify") - return ",".join(aslist) - - except: - if cmk.debug.enabled(): - raise - return "" # We must allow notifications without Livestatus access - - - def rbn_match_rule(rule, context): if rule.get("disabled"): return "This rule is disabled" @@ -1643,15 +1609,6 @@ def substitute_context(template, context): # | Some generic helper functions | # '----------------------------------------------------------------------' -def livestatus_fetch_query(query): - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.connect(cmk.paths.livestatus_unix_socket) - sock.send(query) - sock.shutdown(socket.SHUT_WR) - response = sock.recv(10000000) - sock.close() - return response - def livestatus_send_command(command): try: message = "COMMAND [%d] %s\n" % (time.time(), command)

7 years, 9 months

BI Leaf compilation: some code refactoring and introduction of caches

by Andreas Boesl

Module: check_mk Branch: master Commit: 69abb7e8a63436b38520b88307c1ec5241d73ead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69abb7e8a63436… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 14 10:24:23 2016 +0100 BI Leaf compilation: some code refactoring and introduction of caches Change-Id: Ie6dcbfe6852cf75ef7d3765eb94ff625e46397a2 --- web/htdocs/bi.py | 75 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index b4603e0..6b1f64f 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -112,6 +112,8 @@ NT_PLACEHOLDER = 4 # temporary dummy entry needed for REMAINING # global variables g_cache = {} # per-user cache +g_services_items = None + g_config_information = None # for invalidating cache after config change did_compilation = False # Is set to true if anything has been compiled @@ -726,6 +728,9 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): global g_remaining_refs g_remaining_refs = [] + global g_compiled_services_leafes + g_compiled_services_leafes = {} + # Convert new dictionary style rule into old tuple based # format if type(rule) == dict: @@ -863,11 +868,9 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): def find_remaining_services(hostspec, aggregation): tags, all_services, childs, parents, alias = g_services[hostspec] all_services = set(all_services) - for site, host, service in find_all_leaves(aggregation): - if (site, host) == hostspec: - all_services.discard(service) - remaining = list(all_services) - remaining.sort() + + remaining = all_services - g_compiled_services_leafes.get(hostspec, set([])) + g_compiled_services_leafes.get(hostspec, set([])).update(remaining) return [ { "type" : NT_LEAF, "host" : hostspec, @@ -956,6 +959,15 @@ def match_host(hostname, hostalias, host_spec, tags, required_tags, site, honor_ return do_match(anchored, to_match) +# dictionary with hosts and its compiled services +g_compiled_services_leafes = {} + +regex_host_hit_cache = set() +regex_host_miss_cache = set() + +regex_svc_hit_cache = set() +regex_svc_miss_cache = set() + def compile_leaf_node(host_re, service_re = config.HOST_STATE): found = [] @@ -969,14 +981,17 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): entries = [ ((e[0], host_re), e[1]) for e in g_services_by_hostname.get(host_re, []) ] else: - entries = g_services.items() + if g_services_items: + entries = g_services_items + else: + entries = g_services.items() # TODO: If we already know the host we deal with, we could avoid this loop for (site, hostname), (tags, services, childs, parents, alias) in entries: # For regex to have '$' anchor for end. Users might be surprised # to get a prefix match on host names. This is almost never what # they want. For services this is useful, however. - if host_re.endswith("$"): + if host_re[-1] == "$": anchored = host_re else: anchored = host_re + "$" @@ -986,10 +1001,20 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): # does not contain the site separator - though - we ignore the site # an match the rule for all sites. if honor_site: - if not regex(anchored).match("%s%s%s" % (site, SITE_SEP, hostname)): - continue + search_term = "%s%s%s" % (site, SITE_SEP, hostname) else: - if not regex(anchored).match(hostname): + search_term = hostname + + + cache_id = (anchored, search_term) + if cache_id in regex_host_miss_cache: + continue + + if cache_id not in regex_host_hit_cache: + if regex(anchored).match(search_term): + regex_host_hit_cache.add(cache_id) + else: + regex_host_miss_cache.add(cache_id) continue if service_re == config.HOST_STATE: @@ -1002,23 +1027,31 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): found.append({"type" : NT_REMAINING, "reqhosts" : [(site, hostname)], "host" : (site, hostname)}) - else: for service in services: mo = (service_re, service) - if mo in service_nomatch_cache: + if mo in regex_svc_miss_cache: continue - m = regex(service_re).match(service) - if m: - found.append({"type" : NT_LEAF, - "reqhosts" : [(site, hostname)], - "host" : (site, hostname), - "service" : service, - "title" : "%s - %s" % (hostname, service)} ) - else: - service_nomatch_cache.add(mo) + + if mo not in regex_svc_hit_cache: + if regex(service_re).match(service): + regex_svc_hit_cache.add(mo) + else: + regex_svc_miss_cache.add(mo) + continue + + found.append({"type" : NT_LEAF, + "reqhosts" : [(site, hostname)], + "host" : (site, hostname), + "service" : service, + "title" : "%s - %s" % (hostname, service)} ) found.sort() + + for entry in found: + if "service" in entry: + g_compiled_services_leafes.setdefault(entry["host"], set([])).add(entry["service"]) + return found

7 years, 9 months

Merge "BI Leaf compilation: some code refactoring and introduction of caches"

by Lars Michelsen

Module: check_mk Branch: master Commit: 25d3dd8ddb4c06ba0828d7e94a12abfb28904116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25d3dd8ddb4c06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 13:18:22 2016 +0100 Merge "BI Leaf compilation: some code refactoring and introduction of caches" ---

7 years, 9 months

Merge "BI Aggregation: Added minor speedup in leaf node compilation"

by Lars Michelsen

Module: check_mk Branch: master Commit: 957a4ea4b7577e4419056874452e1a7216592599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=957a4ea4b7577e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 13:14:36 2016 +0100 Merge "BI Aggregation: Added minor speedup in leaf node compilation" ---

7 years, 9 months

BI Aggregation: Added minor speedup in leaf node compilation

by Andreas Boesl

Module: check_mk Branch: master Commit: 7f68c468ccfae9337fe7f6c3b28f293d496aa972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f68c468ccfae9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 14 10:15:41 2016 +0100 BI Aggregation: Added minor speedup in leaf node compilation Change-Id: Ie7b8f2af39e174b58ea868bd1693e47757ffe718 --- web/htdocs/bi.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 45d938e..b4603e0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -958,6 +958,10 @@ def match_host(hostname, hostalias, host_spec, tags, required_tags, site, honor_ def compile_leaf_node(host_re, service_re = config.HOST_STATE): found = [] + + if host_re == "$1$": + return found + honor_site = SITE_SEP in host_re if not honor_site and not '*' in host_re and not '$' in host_re \ and not '|' in host_re and '[' not in host_re:

7 years, 9 months

Add EC overflows to event console status table

by Mathias Kettner

Module: check_mk Branch: master Commit: f489fa87b164a9dc4eef8ecff361ce4751cd56e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f489fa87b164a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 12:59:57 2016 +0100 Add EC overflows to event console status table Change-Id: I04d9d429dff01697b5e3e45330e033e9dbb3166b --- livestatus/src/TableEventConsoleStatus.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/livestatus/src/TableEventConsoleStatus.cc b/livestatus/src/TableEventConsoleStatus.cc index 3685e82..173cfda 100644 --- a/livestatus/src/TableEventConsoleStatus.cc +++ b/livestatus/src/TableEventConsoleStatus.cc @@ -68,6 +68,14 @@ TableEventConsoleStatus::TableEventConsoleStatus(MonitoringCore *mc) addColumn(make_unique<DoubleEventConsoleColumn>("status_average_drop_rate", "The average drop rate")); addColumn(make_unique<IntEventConsoleColumn>( + "status_overflows", + "The number of message overflows, i.e. messages simply dropped due to " + "an overflow of the Event Console")); + addColumn(make_unique<DoubleEventConsoleColumn>("status_overflow_rate", + "The overflow rate")); + addColumn(make_unique<DoubleEventConsoleColumn>("status_average_overflow_rate", + "The average overflow rate")); + addColumn(make_unique<IntEventConsoleColumn>( "status_events", "The number of events received since startup of the Event Console")); addColumn(make_unique<DoubleEventConsoleColumn>("status_event_rate",

7 years, 9 months

4148 EC: reorder entries in Performance snapin, add overflows and load

by Mathias Kettner

Module: check_mk Branch: master Commit: a00857224f94e16690ed2856248b18cbc8a5fb16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a00857224f94e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 12:59:19 2016 +0100 4148 EC: reorder entries in Performance snapin, add overflows and load Change-Id: I85cfe5deecb189fbed8b2b275a5e451ef91b0fcc --- .werks/4148 | 9 +++++ ChangeLog | 1 + web/plugins/sidebar/mkeventd.py | 86 +++++++++++++++++++++++++---------------- 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/.werks/4148 b/.werks/4148 new file mode 100644 index 0000000..43392c3 --- /dev/null +++ b/.werks/4148 @@ -0,0 +1,9 @@ +Title: EC: reorder entries in Performance snapin, add overflows and load +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1481716724 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8d2fed0..34f6ee7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ Event Console: * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... + * 4148 EC: reorder entries in Performance snapin, add overflows and load * 4097 FIX: Event console: Make writing of status file more robust... * 4147 FIX: Always show rule analyser result on Generate, not only after previous Try out... diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 4f8fad4..c992bf7 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -31,77 +31,95 @@ try: except: mkeventd_enabled = False -def render_mkeventd_performance(): - def write_line(left, right): - html.write("<tr><td class=left>%s:</td>" - "<td class=right><strong>%s</strong></td></tr>" % (left, right)) +def mkeventd_performance_entries(): status = mkeventd.get_status() - - html.write("<table class=\"content_center mkeventd_performance\">\n") + entries = [] # TODO: Reorder these values and create a useful order. # e.g. Client connects and Time per client request after # each other. columns = [ - (_("Received messages"), "message", "%.2f/s"), - (_("Rule hits"), "rule_hit", "%.2f/s"), - (_("Rule tries"), "rule_trie", "%.2f/s"), - (_("Created events"), "event", "%.2f/s"), - (_("Client connects"), "connect", "%.2f/s"), + (1, _("Received messages"), "message", "%.2f/s"), + (2, _("Rule tries"), "rule_trie", "%.2f/s"), + (3, _("Rule hits"), "rule_hit", "%.2f/s"), + (4, _("Created events"), "event", "%.2f/s"), + (10, _("Client connects"), "connect", "%.2f/s"), + (9, _("Overflows"), "overflow", "%.2f/s"), ] - for what, col, fmt in columns: - write_line(what, fmt % status["status_average_%s_rate" % col]) + for index, what, col, fmt in columns: + col_name = "status_average_%s_rate" % col + if col_name in status: + entries.append((index, what, fmt % status[col_name])) # Hit rate if status["status_average_rule_trie_rate"] == 0.0: - write_line(_("Rule hit ratio"), _("-.-- %")) + entries.append((3.5, _("Rule hit ratio"), _("-.-- %"))) else: - write_line(_("Rule hit ratio"), "%.2f %%" % ( + entries.append((3.5, _("Rule hit ratio"), "%.2f%%" % ( status["status_average_rule_hit_rate"] / - status["status_average_rule_trie_rate"] * 100)) + status["status_average_rule_trie_rate"] * 100))) # Time columns time_columns = [ - (_("Processing time per message"), "processing"), - (_("Time per client request"), "request"), - (_("Replication synchronization"), "sync"), + (5, _("Processing time per message"), "processing"), + (11, _("Time per client request"), "request"), + (20, _("Replication synchronization"), "sync"), ] - for title, name in time_columns: + for index, title, name in time_columns: value = status.get("status_average_%s_time" % name) if value: - write_line(title, "%.2f ms" % (value * 1000)) + entries.append((index, title, "%.3f ms" % (value * 1000))) elif name != "sync": - write_line(title, _("-.-- ms")) + entries.append((index, title, _("-.-- ms"))) + + # Load + entries.append((6, "Processing load", "%.0f%%" % ( + min(100.0, status["status_average_processing_time"] * status["status_average_message_rate"] * 100.0)))) + + + + entries.sort() + return entries + + +def render_mkeventd_performance(): + html.open_table(class_=["mkeventd_performance"]) + for index, left, right in mkeventd_performance_entries(): + html.tr( + html.render_td("%s:" % left) + + html.render_td(right)) html.close_table() if mkeventd_enabled: sidebar_snapins["mkeventd_performance"] = { - "title" : _("Event Console Performance"), + "title" : _("Event Console Performance"), "description" : _("Monitor the performance of the Event Console"), - "refresh" : 15, - "render" : render_mkeventd_performance, - "allowed" : [ "admin", ], - "styles" : """ + "refresh" : 15, + "render" : render_mkeventd_performance, + "allowed" : [ "admin", ], + "styles" : """ + table.mkeventd_performance { width: %dpx; - -moz-border-radius: 5px; - background-color: #589; - /* background-color: #6da1b8;*/ + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.1); border-style: solid; - border-color: #444 #bbb #eee #666; - /* The border needs to be substracted from the width */ - border-width: 1px; + border-color: rgba(0, 0, 0, 0.3) rgba(255, 255, 255, 0.3) rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.3); + border-width: 1.5px; */ } + table.mkeventd_performance td { padding: 0px 2px; font-size: 8pt; } - table.mkeventd_performance td.right { + + table.mkeventd_performance td:nth-of-type(2) { text-align: right; padding: 0px; padding-right: 1px; white-space: nowrap; + font-weight: bold; } """ % (snapin_width - 2)

7 years, 9 months

EC: log overflows only in verbose mode, add counter for overflows

by Mathias Kettner

Module: check_mk Branch: master Commit: b540c28b867c3c4b36f95e1116757f97caf2b1f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b540c28b867c3c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 12:57:53 2016 +0100 EC: log overflows only in verbose mode, add counter for overflows Change-Id: I30e48ba56a4ea0f506d170dfa4dfb47c402c339c --- bin/mkeventd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 1cf41cf..ae28ce7 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1036,6 +1036,7 @@ class Perfcounters: "rule_tries" : 0, "rule_hits" : 0, "drops" : 0, + "overflows" : 0, "events" : 0, "connects" : 0, } @@ -2758,7 +2759,9 @@ class EventServer: return False # Should have solved the issue. Hand over to next check. if above_limit: - log(" Skip processing because limit is in effect") + # Just log in verbose mode! Otherwise log file will be flooded + verbose(" Skip processing because limit is in effect") + g_perfcounters.count("overflows") return True # Prevent creation and prevent one time actions (below) log(" The limit has been reached")

7 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016