Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Notification script that messages to slack webhook

by Óscar Nájera

Module: check_mk Branch: master Commit: e95ca3af09f75b525ff0fa41c093c815f5e056d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95ca3af09f75b… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Sep 17 15:59:36 2018 +0200 Notification script that messages to slack webhook - Deals with host state changes and service state changes - Config WATO GUI - Split contexts so that multiple users can be mentioned in the message - Referenced Host and services are hyperlinked to Check_MK Change-Id: Iffaa4a9b00365bbcdcbc9d4394f2eefb3d519bc4 --- .werks/6639 | 21 +++++ cmk/gui/plugins/wato/notifications.py | 47 ++++++++++++ cmk_base/notify.py | 2 +- notifications/slack | 139 ++++++++++++++++++++++++++++++++++ 4 files changed, 208 insertions(+), 1 deletion(-) diff --git a/.werks/6639 b/.werks/6639 new file mode 100644 index 0000000..0227c3e --- /dev/null +++ b/.werks/6639 @@ -0,0 +1,21 @@ +Title: slack: New notification plugin for slack +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537357015 +Class: feature + +It is now possible to for Check_MK to send notifications about state +changes of hosts and services into a Slack channel. + +Slack needs to be first configured to recieve messages from Check_MK. This +can be done by setting up a Webhook <a +href=\"https://my.slack.com/services/new/incoming-webhook/\" +target=\"_blank\"> here </a>, where you specify which channel wil recieve +the notifications. In Check_MK, under WATO->Notifications, create a new +notification rule. And select under Notification Method Slack. Copy the URL +that Slack gives you after completing the configuration into the Slack +Webhook-URL field. Optionally if you want sent messages to include +hyperlinks to Check_MK, enable the field URL prefix for links to Check_MK. diff --git a/cmk/gui/plugins/wato/notifications.py b/cmk/gui/plugins/wato/notifications.py old mode 100644 new mode 100755 index b014aa8..19f362f --- a/cmk/gui/plugins/wato/notifications.py +++ b/cmk/gui/plugins/wato/notifications.py @@ -196,6 +196,53 @@ register_notification_parameters( ) ) +register_notification_parameters( + "slack", + Dictionary( + optional_keys=["url_prefix"], + elements=[ + ("webhook_url", + TextAscii( + title=_("Slack Webhook-URL"), + size=80, + allow_empty=False, + help=_( + "URL from Slack Webhook. Setup one <a href=\"https://my.slack.com/services/new/incoming-webhook/\" target=\"_blank\"> here </a>"), + regex="^https://hooks.slack.com/services/.+", + regex_error=_("The Webhook-URL must begin with " + "<tt>https://hooks.slack.com/services/</tt>"), + ) + ), + ("url_prefix", + Transform(CascadingDropdown( + style="dropdown", + title=_("URL prefix for links to Check_MK"), + help=_("If you use <b>Automatic HTTP/s</b> the URL prefix for " + "host and service links within the notification mail " + "is filled automatically. " + "If you specify an URL prefix here, then several parts of the " + "slack message are armed with hyperlinks to your Check_MK GUI. In both cases " + "the recipient of the message can directly visit the host or " + "service in question in Check_MK. Specify an absolute URL including " + "the <tt>.../check_mk/</tt>"), + choices=[ + ("automatic_http", _("Automatic HTTP")), + ("automatic_https", _("Automatic HTTPs")), + ("manual", _("Specify URL prefix"), TextAscii( + regex="^(http|https)://.*/check_mk/$", + regex_error=_("The URL must begin with <tt>http</tt> or " + "<tt>https</tt> and end with <tt>/check_mk/</tt>."), + size=64, + default_value="http://" + socket.gethostname() + "/" + ( + config.omd_site() and config.omd_site() + "/" or "") + "check_mk/", + )), + ], + ), forth=transform_forth_html_mail_url_prefix, + back=transform_back_html_mail_url_prefix) + ), + ] + ) +) register_notification_parameters( "asciimail", diff --git a/cmk_base/notify.py b/cmk_base/notify.py old mode 100644 new mode 100755 index 28f6ce8..2b1e745 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -526,7 +526,7 @@ def notify_rulebased(raw_context, analyse=False): plugin_context = create_plugin_context(raw_context, params) rbn_add_contact_information(plugin_context, contacts) - split_contexts = (plugin not in ["", "mail", "asciimail"] or + split_contexts = (plugin not in ["", "mail", "asciimail", "slack"] or # params can be a list (e.g. for custom notificatios) params.get("disable_multiplexing") or bulk) diff --git a/notifications/slack b/notifications/slack new file mode 100755 index 0000000..2410324 --- /dev/null +++ b/notifications/slack @@ -0,0 +1,139 @@ +#!/usr/bin/env python +# Slack + +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +r""" +Send notification messages to slack +=================================== + +Use a slack webhook to send notification messages +""" + +from typing import Dict # pylint: disable=unused-import +import os +import sys +import requests + +COLORS = { + "CRITICAL": "#EE0000", + "DOWN": "#EE0000", + "WARNING": "#FFDD00", + "OK": "#00CC00", + "UP": "#00CC00", + "UNKNOWN": "#CCCCCC", + "UNREACHABLE": "#CCCCCC", +} + + +def extend_context_with_link_urls(context): + if context.get("PARAMETER_URL_PREFIX"): + url_prefix = context["PARAMETER_URL_PREFIX"] + elif context.get("PARAMETER_URL_PREFIX_MANUAL"): + url_prefix = context["PARAMETER_URL_PREFIX_MANUAL"] + elif context.get("PARAMETER_URL_PREFIX_AUTOMATIC") == "http": + url_prefix = "http://%s/%s" % (context["MONITORING_HOST"], context["OMD_SITE"]) + elif context.get("PARAMETER_URL_PREFIX_AUTOMATIC") == "https": + url_prefix = "https://%s/%s" % (context["MONITORING_HOST"], context["OMD_SITE"]) + else: + url_prefix = None + + if url_prefix: + base_url = url_prefix.rstrip('/') + if base_url.endswith("/check_mk"): + base_url = base_url[:-9] + host_url = base_url + context['HOSTURL'] + + context['LINKEDHOSTNAME'] = '<%s|%s>' % (host_url, context['HOSTNAME']) + + if context['WHAT'] == 'SERVICE': + service_url = base_url + context['SERVICEURL'] + context['LINKEDSERVICEDESC'] = '<%s|%s>' % (service_url, context['SERVICEDESC']) + + else: + context['LINKEDHOSTNAME'] = context['HOSTNAME'] + context['LINKEDSERVICEDESC'] = context.get('SERVICEDESC', '') + + +def construct_message(context): + # type: (Dict) -> Dict + """Build the message for slack""" + + extend_context_with_link_urls(context) + + if context.get('SERVICESTATE', None): + color = COLORS.get(context["SERVICESTATE"]) + title = "Service {NOTIFICATIONTYPE} notification".format(**context) + text = "Host: {LINKEDHOSTNAME} (IP: {HOSTADDRESS})\nService: {LINKEDSERVICEDESC}\nState: {SERVICESTATE}".format( + **context) + output = context["SERVICEOUTPUT"] + else: + color = COLORS.get(context["HOSTSTATE"]) + title = "Host {NOTIFICATIONTYPE} notification".format(**context) + text = "Host: {LINKEDHOSTNAME} (IP: {HOSTADDRESS})\nState: {HOSTSTATE}".format(**context) + output = context["HOSTOUTPUT"] + + return { + "attachments": [ + { + "color": color, + "title": title, + "text": text, + }, + { + "color": + color, + "title": + "Additional Info", + "text": + output + "\nPlease take a look: " + ", ".join( + map("@{}".format, context["CONTACTNAME"].split(','))), + "footer": + "Check_MK notification: {LONGDATETIME}".format(**context), + }, + ] + } + + +def main(): + context = { + var[7:]: value.decode("utf-8") + for (var, value) in os.environ.items() + if var.startswith("NOTIFY_") + } + + url = context.get("PARAMETER_WEBHOOK_URL") + + r = requests.post(url=url, json=construct_message(context)) + + if r.status_code == 200: + sys.exit(0) + else: + sys.stderr.write( + "Failed to send notification. Status: %i, Response: %s\n" % (r.status_code, r.text)) + sys.exit(2) + + +if __name__ == '__main__': + main()

5 years, 12 months

Tuple valuespec: Fixed broken HTML code in some case

by Lars Michelsen

Module: check_mk Branch: master Commit: c0c974553e3d52ebb240b4bee12a5aec26d9f5fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0c974553e3d52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 17:22:47 2018 +0200 Tuple valuespec: Fixed broken HTML code in some case A td was missing when show_titles is False and orientation is horizontal. Change-Id: Iad2e61067811d4642211014f6cc4002385556aab --- cmk/gui/valuespec.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 4402d90..57e2a2d 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -3323,6 +3323,10 @@ class Tuple(ValueSpec): html.write_text(" ") html.help(element.help()) + else: + if self._orientation == "horizontal": + html.open_td(class_="tuple_td") + if self._orientation == "vertical": html.open_td(class_="tuple_right")

5 years, 12 months

dump_host.py: Fix TypeError if host has no IP address

by Moritz Kiemer

Module: check_mk Branch: master Commit: d20b994388612853851c5a3ccdfb7823401de3c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d20b9943886128… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Sep 20 14:58:41 2018 +0200 dump_host.py: Fix TypeError if host has no IP address Change-Id: Idaf30d59fe746fcb37ace08f0604c6b99724850f --- cmk_base/dump_host.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 6cbc7a6..e2c4257 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -66,7 +66,7 @@ def dump_host(hostname): else: addresses += " (Primary: IPv4)" - console.output(tty.yellow + "Addresses: " + tty.normal + addresses + "\n") + console.output(tty.yellow + "Addresses: " + tty.normal + (addresses if addresses is not None else "No IP") + "\n") tags = config.tags_of_host(hostname) console.output(tty.yellow + "Tags: " + tty.normal + ", ".join(tags) + "\n")

5 years, 12 months

6603 FIX CRE: Fixed Check_MK service crash if a check plugin is unknown to the check context

by Simon Betz

Module: check_mk Branch: master Commit: 4b7a09b0ef5cbd97534abcdef4f462a04ec6e316 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b7a09b0ef5cbd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 20 14:57:25 2018 +0200 6603 FIX CRE: Fixed Check_MK service crash if a check plugin is unknown to the check context Change-Id: I6e4103da535162f18d8eb2cd51948f42b0239db4 --- .werks/6603 | 19 +++++++++++++++++++ cmk_base/check_table.py | 11 ++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/6603 b/.werks/6603 new file mode 100644 index 0000000..213796c --- /dev/null +++ b/.werks/6603 @@ -0,0 +1,19 @@ +Title: CRE: Fixed Check_MK service crash if a check plugin is unknown to the check context +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537441766 + +A host has discovered a set of check plugin names which are triggered by the +Check_MK service. If the agent type of this host changes without performing a +rediscovery afterwards and the configuration changes are activated then there +may be new or vanished check plugins which are unknown to the current check +context. This leads to a KeyError of the Check_MK service. + +Now if a check plugin is unknown to the current check context Check_MK ignores +this check plugin. Aside from that the Check_MK Discovery service reports about +vanished or unmonitored serices. diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index 2a28d16..03d6dd4 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -78,14 +78,19 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, return is_checkname_valid_cache[the_id] passed = True + if checkname not in config.check_info: + passed = False + # Skip SNMP checks for non SNMP hosts (might have been discovered before with other # agent setting. Remove them without rediscovery). Same for agent based checks. - if not config.is_snmp_host(hostname) and cmk_base.check_utils.is_snmp_check(checkname) and \ + elif not config.is_snmp_host(hostname) and cmk_base.check_utils.is_snmp_check(checkname) and \ (not config.has_management_board(hostname) or config.management_protocol_of(hostname) != "snmp"): - passed = False - if not config.is_tcp_host(hostname) and not piggyback.has_piggyback_raw_data(config.piggyback_max_cachefile_age, hostname) \ + passed = False + + elif not config.is_tcp_host(hostname) and not piggyback.has_piggyback_raw_data(config.piggyback_max_cachefile_age, hostname) \ and cmk_base.check_utils.is_tcp_check(checkname): passed = False + is_checkname_valid_cache[the_id] = passed return passed

5 years, 12 months

6467 FIX jolokia_metrics.tp: Only discover services which can be checked

by Konstantin Büttner

Module: check_mk Branch: master Commit: e84c0d1e20f68eccb9031e7a6db2f7a76c7f3ad9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84c0d1e20f68e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Sep 20 13:25:27 2018 +0200 6467 FIX jolokia_metrics.tp: Only discover services which can be checked In some circumstances, Check_MK would discover services for which the maxThreads value of the thread pool was missing, leading to permanently unknown services. This has been fixed. Change-Id: I4ac30ba799eb67bc6ed450df8ada4c2cee73aed8 --- .werks/6467 | 13 +++++++++++++ checks/jolokia_metrics | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/6467 b/.werks/6467 new file mode 100644 index 0000000..6d683d6 --- /dev/null +++ b/.werks/6467 @@ -0,0 +1,13 @@ +Title: jolokia_metrics.tp: Only discover services which can be checked +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537442631 + +In some circumstances, Check_MK would discover services for which the maxThreads +value of the thread pool was missing, leading to permanently unknown services. +This has been fixed. diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 4709cea..c3ff118 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -460,8 +460,9 @@ def inventory_jolokia_metrics_tp(info): for inst, vals in parsed.iteritems(): if vals is None: continue # no data from agent - for threadpool_name, _threadpool_info in vals.get('tp', {}).iteritems(): - inv.append(("%s ThreadPool %s" % (inst, threadpool_name) , {})) + for threadpool_name, threadpool_info in vals.get('tp', {}).iteritems(): + if "maxThreads" in threadpool_info: + inv.append(("%s ThreadPool %s" % (inst, threadpool_name) , {})) return inv

5 years, 12 months

Fixed KeyError while getting status data via LQ for the inventory tree

by Simon Betz

Module: check_mk Branch: master Commit: ef562a5c56fad1e495d5884692bcc2ff3ee0798a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef562a5c56fad1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 20 14:49:50 2018 +0200 Fixed KeyError while getting status data via LQ for the inventory tree Change-Id: I9b38e1123a71dc304abdb0f99d5414f8a36f5f0d --- cmk/gui/plugins/views/inventory.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 021033a..b00b49f 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1314,17 +1314,18 @@ def declare_invtable_view(infoname, invpath, title_singular, title_plural): def _create_view_enabled_check_func(invpath, is_history=False): def _check_view_enabled(linking_view, view, context_vars): context = dict(context_vars) - if "host" not in context: + hostname = context.get("host") + if hostname is None: return True # No host data? Keep old behaviour - if context["host"] == "": + elif hostname == "": return False # FIXME In order to decide whether this view is enabled # do we really need to load the whole tree? if is_history: - struct_tree = inventory.load_filtered_inventory_tree(context["host"]) + struct_tree = inventory.load_filtered_inventory_tree(hostname) else: - row = inventory.get_status_data_via_livestatus(context["site"], context["host"]) + row = inventory.get_status_data_via_livestatus(context.get("site"), hostname) struct_tree = inventory.load_filtered_and_merged_tree(row) if not struct_tree:

5 years, 12 months

6601 FIX fsc_sc2_fans, fsc_sc2_psu: Discover fans and PSUs if they are present

by Simon Betz

Module: check_mk Branch: master Commit: 7f6f3c58a4e0e1fd3a036ce70c0afe9dd0b4f602 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f6f3c58a4e0e1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 19 13:48:20 2018 +0200 6601 FIX fsc_sc2_fans, fsc_sc2_psu: Discover fans and PSUs if they are present Change-Id: I159e05d6c8e7dfdad9a3e130e9bfc6d2cc62b570 --- .werks/6601 | 11 +++++++++++ checks/fsc_sc2_fans | 11 +++++------ checks/fsc_sc2_psu | 15 +++++++++------ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.werks/6601 b/.werks/6601 new file mode 100644 index 0000000..4e7f176 --- /dev/null +++ b/.werks/6601 @@ -0,0 +1,11 @@ +Title: fsc_sc2_fans, fsc_sc2_psu: Discover fans and PSUs only if present +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537357667 + + diff --git a/checks/fsc_sc2_fans b/checks/fsc_sc2_fans index 48286b3..e3bda1c 100644 --- a/checks/fsc_sc2_fans +++ b/checks/fsc_sc2_fans @@ -52,7 +52,8 @@ factory_settings['fan_fsc_sc2_levels'] = { def inventory_fsc_sc2_fans(info): for line in info: - yield line [0], {} + if line[1] not in ["8"]: + yield line[0], {} def check_fsc_sc2_fans(item, params, info): @@ -68,17 +69,15 @@ def check_fsc_sc2_fans(item, params, info): } if type(params) == tuple: - params = { 'lower' : params } + params = {'lower': params} for designation, status, rpm in info: if designation == item: - # in this case booth values are important + yield status_map.get(status, (3, 'Status is unknown')) if rpm: yield check_fan(int(rpm), params) else: - yield 3, "Device did not deliver rpm values" - - yield status_map.get(status, (3, 'Status is unknown')) + yield 0, "Device did not deliver RPM values" check_info["fsc_sc2_fans"] = { diff --git a/checks/fsc_sc2_psu b/checks/fsc_sc2_psu index 2dc13dd..47e59d8 100644 --- a/checks/fsc_sc2_psu +++ b/checks/fsc_sc2_psu @@ -35,19 +35,20 @@ def inventory_fsc_sc2_psu(info): for line in info: - yield line [0], None + if line[1] not in ["2"]: + yield line [0], None def check_fsc_sc2_psu(item, _no_params, info): psu_status = { '1' : (3, 'Status is unknown'), - '2' : (0, 'Status is not-present'), + '2' : (1, 'Status is not-present'), '3' : (0, 'Status is ok'), '4' : (2, 'Status is failed'), '5' : (2, 'Status is ac-fail'), '6' : (2, 'Status is dc-fail'), '7' : (2, 'Status is critical-temperature'), - '8' : (0, 'Status is not-manageable'), + '8' : (1, 'Status is not-manageable'), '9' : (1, 'Status is fan-failure-predicted'), '10': (2, 'Status is fan-failure'), '11': (1, 'Status is power-safe-mode'), @@ -58,11 +59,13 @@ def check_fsc_sc2_psu(item, _no_params, info): for designation, status, load, nominal in info: if designation == item: yield psu_status.get(status, (3, 'Status is unknown')) - if nominal and load: - yield 0, 'Nominal load: {0} W, Actual load: {1} W'.format(nominal, load), [('power', int(load))] + infotext = 'Nominal load: %s W, Actual load: %s W' % (nominal, load) + perfdata = [('power', int(load))] else: - yield 1, 'Did not receive load data' + infotext = 'Did not receive load data' + perfdata = [] + yield 0, infotext, perfdata check_info["fsc_sc2_psu"] = {

5 years, 12 months

jolokia_metrics.tp: Improve variable naming

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69fcf1ac7415cb3fa782ee1529ff066acb5bcb93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69fcf1ac7415cb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Sep 20 13:18:15 2018 +0200 jolokia_metrics.tp: Improve variable naming Change-Id: I35e4d2354e935f20711745aa952649a2e78fd57c --- checks/jolokia_metrics | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 0c9cdcc..4709cea 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -443,15 +443,15 @@ check_info["jolokia_metrics.gc"] = { # | |_| | # '----------------------------------------------------------------------' -def jolokia_metrics_tp(info, (inst, typ, tp)): +def jolokia_metrics_tp(info, (inst, typ, threadpool_name)): parsed = jolokia_metrics_parse(info) if parsed.get(inst, "") == None: raise MKCounterWrapped("No information from Jolokia agent") if not inst in parsed \ - or not tp in parsed[inst].get('tp', {}): + or not threadpool_name in parsed[inst].get('tp', {}): return None - return parsed[inst]['tp'][tp] + return parsed[inst]['tp'][threadpool_name] def inventory_jolokia_metrics_tp(info): @@ -460,8 +460,8 @@ def inventory_jolokia_metrics_tp(info): for inst, vals in parsed.iteritems(): if vals is None: continue # no data from agent - for tp in vals.get('tp', {}).iterkeys(): - inv.append(("%s ThreadPool %s" % (inst ,tp) , {})) + for threadpool_name, _threadpool_info in vals.get('tp', {}).iteritems(): + inv.append(("%s ThreadPool %s" % (inst, threadpool_name) , {})) return inv @@ -470,15 +470,15 @@ def check_jolokia_metrics_tp(item, params, info): if params is None: params = {} - tp = jolokia_metrics_tp(info, item.split()) + threadpool_info = jolokia_metrics_tp(info, item.split()) - if tp is None or "maxThreads" not in tp: + if threadpool_info is None or "maxThreads" not in threadpool_info: return - max_threads = float(tp["maxThreads"]) + max_threads = float(threadpool_info["maxThreads"]) def check_thread_levels(what): - threads_abs = int(tp[what]) + threads_abs = int(threadpool_info[what]) threads_rel = threads_abs / max_threads infotext = "%s: %d (%.1f%%)" % (what, threads_abs, threads_rel) status = 0 @@ -498,9 +498,9 @@ def check_jolokia_metrics_tp(item, params, info): perfdata = [ (what, threads_abs, warn, crit, 0, max_threads) ] return status, infotext, perfdata - if 'currentThreadsBusy' in tp: + if 'currentThreadsBusy' in threadpool_info: yield check_thread_levels('currentThreadsBusy') - if 'currentThreadCount' in tp: + if 'currentThreadCount' in threadpool_info: yield check_thread_levels('currentThreadCount') yield 0, "Maximum threads: %d" % max_threads

5 years, 12 months

6627 FIX Fixed exception in export hook software_csv

by Lars Michelsen

Module: check_mk Branch: master Commit: 131409c2c42213a278fc1e5b82fb8cd6491b7d7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=131409c2c42213… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 11:48:13 2018 +0200 6627 FIX Fixed exception in export hook software_csv The exception "global name 'cmk' is not defined" occurred when trying to use the software export hook in 1.5. Change-Id: I7aa327df24f2101ae612cbb7188448be2430b9f1 --- .werks/6627 | 12 ++++++++++++ inventory/export_software_csv | 2 ++ 2 files changed, 14 insertions(+) diff --git a/.werks/6627 b/.werks/6627 new file mode 100644 index 0000000..97b33ab --- /dev/null +++ b/.werks/6627 @@ -0,0 +1,12 @@ +Title: Fixed exception in export hook software_csv +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537436791 + +The exception "global name 'cmk' is not defined" occurred when trying to +use the software export hook in 1.5. diff --git a/inventory/export_software_csv b/inventory/export_software_csv index 068866f..83a9eea 100644 --- a/inventory/export_software_csv +++ b/inventory/export_software_csv @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk.paths + def inv_export_software_csv(hostname, params, tree): separator = params.get("separator", ";") quotes = params.get("quotes", None) # Also: "single", "double"

5 years, 12 months

Agent Baking: Fixed bug where hosts used bakery settings from other hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: c541e5197b87b4e0f2a1f5225e49a7596df645c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c541e5197b87b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 20 10:24:14 2018 +0200 Agent Baking: Fixed bug where hosts used bakery settings from other hosts Change-Id: Ie4cc878934d424fc6a2df14843caa237198976d0 --- .werks/6659 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6659 b/.werks/6659 new file mode 100644 index 0000000..e4d6bb2 --- /dev/null +++ b/.werks/6659 @@ -0,0 +1,12 @@ +Title: Agent Baking: Fixed bug where hosts used bakery settings from other hosts +Level: 2 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1537430154 + +The rule evaluation for bakery rules was broken for certain dictionary based rule types. +As a result HostA may have received plugin configurations for HostB.

5 years, 12 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018