Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3447 mssql_versions: Added inventory plugin for MSSQL instances

by Lars Michelsen

Module: check_mk Branch: master Commit: 6061cd8d1b6c9bc1e09da79eface2a14b096dd4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6061cd8d1b6c9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 11:10:44 2016 +0200 3447 mssql_versions: Added inventory plugin for MSSQL instances --- .werks/3447 | 9 ++++++ ChangeLog | 1 + inventory/mssql_versions | 59 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 14 ++++++++-- 4 files changed, 81 insertions(+), 2 deletions(-) diff --git a/.werks/3447 b/.werks/3447 new file mode 100644 index 0000000..d7447ba --- /dev/null +++ b/.werks/3447 @@ -0,0 +1,9 @@ +Title: mssql_versions: Added inventory plugin for MSSQL instances +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1461834633 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 84873f2..6ea00c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -378,6 +378,7 @@ * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag... * 3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems... + * 3447 mssql_versions: Added inventory plugin for MSSQL instances * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/inventory/mssql_versions b/inventory/mssql_versions new file mode 100644 index 0000000..bcf6b7e --- /dev/null +++ b/inventory/mssql_versions @@ -0,0 +1,59 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# pre 1.4.0i1 output (without edition, space separated) +# <<<mssql_versions>>> +# MSSQL_SQLEXPRESS 10.50.1600.1 + +# 1.4.0i1 output +# <<<mssql_versions:sep(124)>>> +# MSSQL_MSSQLSERVER|10.50.1600.1|Enterprise Edition + +def inv_mssql_versions(info): + node = inv_tree("software.applications.mssql.instances") + + for line in info: + if len(line) not in [2, 4]: + continue + + instance_id = line[0].split("_", 1)[1] + version = line[1] + edition = len(line) == 4 and line[2] or "" + clustered = len(line) == 4 and line[3] != "" + cluster_name = len(line) == 4 and line[3] or "" + + instance = { + "name" : instance_id, + "version" : version, + "edition" : edition, + "clustered" : clustered, + "cluster_name" : cluster_name, + } + node.append(instance) + +inv_info["mssql_versions"] = { + "inv_function" : inv_mssql_versions, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index ecc72d1..15905c2 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -474,6 +474,10 @@ def inv_paint_if_available(available): return "if_state " + (available and "if_available" or "if_not_available"), \ (available and _("free") or _("used")) +def inv_paint_mssql_is_clustered(clustered): + return "mssql_" + (clustered and "is_clustered" or "is_not_clustered"), \ + (clustered and _("is clustered") or _("is not clustered")) + def inv_paint_ipv4_network(nw): if nw == "0.0.0.0/0": return "", _("Default") @@ -685,8 +689,14 @@ inventory_displayhints.update({ ".software.applications.citrix.vm.catalog" : { "title" : _("Catalog"), }, ".software.applications.citrix.vm.agent_version" : { "title" : _("Agent Version"), }, - ".software.applications.vmwareesx:*." : { "title" : _("Datacenter %d") }, - ".software.applications.vmwareesx:*.clusters:*." : { "title" : _("Cluster %d") }, + ".software.applications.vmwareesx:*." : { "title" : _("Datacenter %d") }, + ".software.applications.vmwareesx:*.clusters:*." : { "title" : _("Cluster %d") }, + + ".software.applications.mssql." : { "title" : _("MSSQL") }, + ".software.applications.mssql.instances:" : { "title" : _("Instances"), "render" : render_inv_dicttable, + "keyorder" : [ "name", "edition", "version", "clustered", "cluster_name" ], + }, + ".software.applications.mssql.instances:*.clustered" : { "title" : _("Clustered"), "paint" : "mssql_is_clustered"}, ".networking." : { "title" : _("Networking"), "icon" : "networking" }, ".networking.total_interfaces" : { "title" : _("Interfaces"), "paint" : "count", },

8 years, 5 months

3446 mssql_version: Outputs info about cluster state and cluster name

by Lars Michelsen

Module: check_mk Branch: master Commit: e69a3836094658df80855815de48eac444c712c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e69a3836094658… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 09:41:28 2016 +0200 3446 mssql_version: Outputs info about cluster state and cluster name --- .werks/3446 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 8 +++++--- checks/mssql_versions | 19 +++++++++++++------ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.werks/3446 b/.werks/3446 new file mode 100644 index 0000000..63eeef8 --- /dev/null +++ b/.werks/3446 @@ -0,0 +1,9 @@ +Title: mssql_version: Outputs info about cluster state and cluster name +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461829269 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9ab192d..84873f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 3428 bluenet2_powerrail, bluenet2_powerrail.rcm, bluenet2_powerrail.temp, bluenet2_powerrail.humidity: new checks for Bachmann Bluenet2 Powerrails which support the BACHMANN-bluenet2-MIB * 3524 fileinfo, fileinfo.groups: both checks are now cluster ready... * 3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition + * 3446 mssql_version: Outputs info about cluster state and cluster name * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 897559e..28c171f 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -117,14 +117,13 @@ For i = LBound(value_names) To UBound(value_names) instance_name & "\Setup", _ "Edition", edition - addOutput("<<<mssql_versions:sep(124)>>>") - addOutput("MSSQL_" & instance_id & "|" & version & "|" & edition) - ' Check whether or not this instance is clustered registry.GetStringValue HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\" & _ instance_name & "\Cluster", "ClusterName", cluster_name If IsNull(cluster_name) Then + cluster_name = "" + ' In case of instance name "MSSQLSERVER" always use (local) as connect string If instance_id = "MSSQLSERVER" Then sources.add instance_id, "(local)" @@ -140,6 +139,9 @@ For i = LBound(value_names) To UBound(value_names) End If End If + addOutput("<<<mssql_versions:sep(124)>>>") + addOutput("MSSQL_" & instance_id & "|" & version & "|" & edition & "|" & cluster_name) + ' Only collect results for currently running instances Set service = WMI.ExecQuery("SELECT State FROM Win32_Service " & _ "WHERE Name = 'MSSQL$" & instance_id & "' AND State = 'Running'") diff --git a/checks/mssql_versions b/checks/mssql_versions index 74d23ab..d435761 100644 --- a/checks/mssql_versions +++ b/checks/mssql_versions @@ -30,22 +30,29 @@ # 1.4.0i1 output # <<<mssql_versions:sep(124)>>> -# MSSQL_MSSQLSERVER|10.50.1600.1|Enterprise Edition +# MSSQL_MSSQLSERVER|10.50.1600.1|Enterprise Edition|ZMUCSQLCTX def inventory_mssql_versions(info): inventory = [] for line in info: - if len(line) in [2, 3] and line[0] != "Error:": + if len(line) in [2, 4] and line[0] != "Error:": inventory.append((line[0], None)) return inventory def check_mssql_versions(item, _unused, info): for line in info: if line[0] == item: - if len(line) == 2: - return 0, 'Server is running version %s' % line[1] - else: - return 0, 'Server is running %s in version %s' % (line[2], line[1]) + if len(line) >= 2: + yield 0, 'Server is running version %s' % line[1] + + if len(line) == 4: + yield 0, line[2] # edition + + if line[3] != "": + yield 0, "clustered as %s" % line[3] + + return + check_info["mssql_versions"] = { 'check_function': check_mssql_versions,

8 years, 5 months

3127 new icon on services that are outside their check period

by Sebastian Herbord

Module: check_mk Branch: master Commit: caf3989badef61947d15b4251378075de7970420 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caf3989badef61… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 28 10:41:54 2016 +0200 3127 new icon on services that are outside their check period --- .werks/3127 | 9 +++++++++ ChangeLog | 1 + web/htdocs/images/icon_pause.png | Bin 0 -> 1538 bytes web/plugins/icons/builtin.py | 28 ++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/.werks/3127 b/.werks/3127 new file mode 100644 index 0000000..19166eb --- /dev/null +++ b/.werks/3127 @@ -0,0 +1,9 @@ +Title: new icon on services that are outside their check period +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1461826524 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 134e27f..e7afa21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ * 3443 FIX: mk_logwatch: Fixed exception in agent plugin configuration parsing error handling Multisite: + * 3127 new icon on services that are outside their check period * 3187 notification view: new filter for log command via regex * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... diff --git a/web/htdocs/images/icon_pause.png b/web/htdocs/images/icon_pause.png new file mode 100644 index 0000000..12a3626 Binary files /dev/null and b/web/htdocs/images/icon_pause.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 297fb6f..b28453a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -856,3 +856,31 @@ multisite_icons_and_actions['crashed_check'] = { 'paint' : paint_icon_crashed_check, 'toplevel' : True, } + +#. +# .--Check Period--------------------------------------------------------. +# | ____ _ _ ____ _ _ | +# | / ___| |__ ___ ___| | __ | _ \ ___ _ __(_) ___ __| | | +# | | | | '_ \ / _ \/ __| |/ / | |_) / _ \ '__| |/ _ \ / _` | | +# | | |___| | | | __/ (__| < | __/ __/ | | | (_) | (_| | | +# | \____|_| |_|\___|\___|_|\_\ |_| \___|_| |_|\___/ \__,_| | +# | | +# +----------------------------------------------------------------------+ +# | Icon shown if the check is outside its check period | +# '----------------------------------------------------------------------' + + +def paint_icon_check_period(what, row, tags, host_custom_vars): + if row['%s_in_passive_check_period' % what] == 0\ + or row['%s_in_check_period' % what] == 0: + return 'pause', _("This %s is currently not being checked") % _(what) + + +multisite_icons_and_actions['check_period'] = { + 'columns' : ['in_passive_check_period', 'in_check_period'], + 'paint' : paint_icon_check_period, + 'toplevel' : True, +} + + +#.

8 years, 5 months

pylint does not seem to detect dynamically registered methods of _socketobject

by Lars Michelsen

Module: check_mk Branch: master Commit: fcf4f9a54e991a90b4848eed9cec35f857d55775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcf4f9a54e991a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 18:13:20 2016 +0200 pylint does not seem to detect dynamically registered methods of _socketobject --- bin/mkeventd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index 2aeb09d..2c80cdc 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1437,11 +1437,13 @@ class EventServer: # Accept new connection on event unix socket if self._eventsocket in readable: client_socket, address = self._eventsocket.accept() + # pylint: disable=no-member client_sockets[client_socket.fileno()] = (client_socket, address, "") # Same for the TCP syslog socket if self._syslog_tcp and self._syslog_tcp in readable: client_socket, address = self._syslog_tcp.accept() + # pylint: disable=no-member client_sockets[client_socket.fileno()] = (client_socket, address, "") # Read data from existing event unix socket connections

8 years, 5 months

Fixed different issues in active checks found by pylint

by Lars Michelsen

Module: check_mk Branch: master Commit: 3648f3555594e4802643aa14120dfe183d8d28ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3648f3555594e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 13:38:07 2016 +0200 Fixed different issues in active checks found by pylint --- doc/treasures/active_checks/check_cpu_peaks | 4 ++++ doc/treasures/active_checks/check_form_submit | 4 ++-- doc/treasures/active_checks/check_mail | 4 ++-- pylintrc | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/treasures/active_checks/check_cpu_peaks b/doc/treasures/active_checks/check_cpu_peaks index ea0ae38..408bf24 100755 --- a/doc/treasures/active_checks/check_cpu_peaks +++ b/doc/treasures/active_checks/check_cpu_peaks @@ -107,6 +107,8 @@ try: util_total = [] is_windows = True try: + # can not check for get_rrd_data because it's hacky included with execfile + # pylint: disable=undefined-variable data = get_rrd_data(host, "CPU utilization", "util", "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0] @@ -118,6 +120,8 @@ try: # looks like this is not a windows rrd... is_windows = False for key in ["system", "user", "wait"]: + # can not check for get_rrd_data because it's hacky included with execfile + # pylint: disable=undefined-variable data = get_rrd_data(host, "CPU utilization", key, "MAX", fromtime, untiltime) datasets.append(data[1]) step_secs = data[0] diff --git a/doc/treasures/active_checks/check_form_submit b/doc/treasures/active_checks/check_form_submit index 5f1edca..65b3d4f 100755 --- a/doc/treasures/active_checks/check_form_submit +++ b/doc/treasures/active_checks/check_form_submit @@ -144,7 +144,7 @@ def debug(s): if opt_debug: sys.stderr.write('%s\n' % s) -class HostResult(): +class HostResult(Exception): def __init__(self, result): self.result = result @@ -184,7 +184,7 @@ def open_url(url, method = 'GET', data = None): if method == 'GET' and data is not None: # Add the query string to the url in this case start = '?' in url and '&' or '?' - url += start + '&'.join([ '='.join(item) in data.items() ]) + url += start + '&'.join([ '='.join(item) for item in data.items() ]) data = None try: diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 306a07e..85b9dad 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -115,7 +115,7 @@ fetch_user = None fetch_pass = None fetch_ssl = False conn_timeout = 10 -cleanup_messages = False +cleanup_messages = "" forward_ec = False forward_facility = 16 # default to "mail" (2 << 3) forward_app = None @@ -346,7 +346,7 @@ def forward_to_ec(mails): sock.send(message + "\n") sock.close() - elif not forward_method.startswith('spool:'): + elif not forward_method.startswith('spool:'): # pylint: disable=no-member # write into local event pipe # Important: When the event daemon is stopped, then the pipe # is *not* existing! This prevents us from hanging in such diff --git a/pylintrc b/pylintrc new file mode 120000 index 0000000..0dba11a --- /dev/null +++ b/pylintrc @@ -0,0 +1 @@ +pylint/pylintrc \ No newline at end of file

8 years, 5 months

fixed pylint errors in python notification scripts

by Lars Michelsen

Module: check_mk Branch: master Commit: 8273cfab1a6597ca3c1cc96bfcc8ffb204fc10da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8273cfab1a6597… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 14:12:45 2016 +0200 fixed pylint errors in python notification scripts --- notifications/asciimail | 12 ++++++------ notifications/mail | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/notifications/asciimail b/notifications/asciimail index 243f016..e43f323 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -173,7 +173,12 @@ def read_bulk_contexts(): # First comes a section with global variables for line in sys.stdin: line = line.strip() - if line: + + if not line: + in_params = False + context = {} + contexts.append(context) + else: try: key, value = line.split("=", 1) value = value.replace("\1", "\n") @@ -186,11 +191,6 @@ def read_bulk_contexts(): else: context[key] = value - else: - in_params = False - context = {} - contexts.append(context) - return parameters, contexts def main(): diff --git a/notifications/mail b/notifications/mail index 0c01952..7ee3d43 100755 --- a/notifications/mail +++ b/notifications/mail @@ -730,7 +730,12 @@ def read_bulk_contexts(): # First comes a section with global variables for line in sys.stdin: line = line.strip() - if line: + + if not line: + in_params = False + context = {} + contexts.append(context) + else: key, value = line.split("=", 1) value = value.replace("\1", "\n") if in_params: @@ -738,11 +743,6 @@ def read_bulk_contexts(): else: context[key] = value - else: - in_params = False - context = {} - contexts.append(context) - return parameters, contexts def main():

8 years, 5 months

plesk_domains: added missing module for error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 59eef4d2dd4f234c8ab4fe7ac1d79b9db19ae51e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59eef4d2dd4f23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 18:18:13 2016 +0200 plesk_domains: added missing module for error handling --- agents/plugins/plesk_domains | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/plugins/plesk_domains b/agents/plugins/plesk_domains index 0ce04fd..b862c74 100755 --- a/agents/plugins/plesk_domains +++ b/agents/plugins/plesk_domains @@ -29,6 +29,7 @@ # <<<plesk_domains>>> # <domain> +import sys import MySQLdb try:

8 years, 5 months

3443 FIX mk_logwatch: Fixed exception in agent plugin configuration parsing error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 2bcb1e0987e5b462b44763fa49f41f320b920568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bcb1e0987e5b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 08:56:34 2016 +0200 3443 FIX mk_logwatch: Fixed exception in agent plugin configuration parsing error handling --- .werks/3443 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_logwatch | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/3443 b/.werks/3443 new file mode 100644 index 0000000..a9d9d6b --- /dev/null +++ b/.werks/3443 @@ -0,0 +1,10 @@ +Title: mk_logwatch: Fixed exception in agent plugin configuration parsing error handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461826579 + + diff --git a/ChangeLog b/ChangeLog index 5b813fa..134e27f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -193,6 +193,7 @@ * 3441 FIX: ps: Added missing graph for number of processes * 3429 FIX: ps, mem.linux, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling * 3126 FIX: fixed crash in some wmi-based checks when items disappear from the agent output + * 3443 FIX: mk_logwatch: Fixed exception in agent plugin configuration parsing error handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 24c758a..96f548f 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -90,13 +90,15 @@ def is_not_comment(line): def parse_filenames(line): return line.split() -def parse_pattern(level, pattern): +def parse_pattern(level, pattern, line): if level not in [ 'C', 'W', 'I', 'O' ]: - raise(Exception("Invalid pattern line '%s'" % line)) + raise Exception("Invalid pattern line '%s'" % line) + try: compiled = re.compile(pattern) except: - raise(Exception("Invalid regular expression in line '%s'" % line)) + raise Exception("Invalid regular expression in line '%s'" % line) + return (level, compiled) def read_config(): @@ -119,7 +121,7 @@ def read_config(): elif level == 'R': rewrite_list.append(pattern) else: - level, compiled = parse_pattern(level, pattern) + level, compiled = parse_pattern(level, pattern, line) cont_list = [] # List of continuation patterns rewrite_list = [] # List of rewrite patterns patterns.append((level, compiled, cont_list, rewrite_list))

8 years, 5 months

Ignore not importable module during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 80b88318612715418202b3a72998a775eaf26373 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b88318612715… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 18:16:06 2016 +0200 Ignore not importable module during tests --- agents/plugins/mailman_lists | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mailman_lists b/agents/plugins/mailman_lists index a331817..4e7515a 100755 --- a/agents/plugins/mailman_lists +++ b/agents/plugins/mailman_lists @@ -35,7 +35,7 @@ sys.path.append("/usr/local/mailman") # Set to True to filter out all "hidden" mailinglists only_advertised = True -from Mailman import Utils, MailList +from Mailman import Utils, MailList # pylint: disable=import-error # 1. list memberships print '<<<mailman_lists>>>'

8 years, 5 months

3126 FIX fixed crash in some wmi-based checks when items disappear from the agent output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 31c663ce9d311d712c60c63b197768a58ef39243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31c663ce9d311d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 27 15:31:42 2016 +0200 3126 FIX fixed crash in some wmi-based checks when items disappear from the agent output --- .werks/3126 | 10 ++++++++++ ChangeLog | 1 + checks/wmi.include | 21 +++++++++++++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.werks/3126 b/.werks/3126 new file mode 100644 index 0000000..c750b32 --- /dev/null +++ b/.werks/3126 @@ -0,0 +1,10 @@ +Title: fixed crash in some wmi-based checks when items disappear from the agent output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461763841 + + diff --git a/ChangeLog b/ChangeLog index 56cff79..5b813fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 3438 FIX: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported * 3441 FIX: ps: Added missing graph for number of processes * 3429 FIX: ps, mem.linux, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling + * 3126 FIX: fixed crash in some wmi-based checks when items disappear from the agent output Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/wmi.include b/checks/wmi.include index 6dcb798..425f75e 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -243,7 +243,10 @@ def wmi_yield_raw_persec(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - value = int(table.get(row, column)) + try: + value = int(table.get(row, column)) + except KeyError: + return 3, "item not present anymore", [] value_per_sec = get_rate(column, get_wmi_time(table, row), value) @@ -259,7 +262,10 @@ def wmi_yield_raw_counter(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - value = int(table.get(row, column)) + try: + value = int(table.get(row, column)) + except KeyError: + return 3, "item not present anymore", [] status = wmi_determine_status(value, levels) @@ -296,7 +302,10 @@ def wmi_calculate_raw_average(table, row, column, factor): def wmi_yield_raw_average(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - average = wmi_calculate_raw_average(table, row, column, 1) + try: + average = wmi_calculate_raw_average(table, row, column, 1) + except KeyError: + return 3, "item not present anymore", [] return ( wmi_determine_status(average, levels), @@ -308,7 +317,11 @@ def wmi_yield_raw_average(table, row, column, label, perfvar, levels=None): def wmi_yield_raw_fraction(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - average = wmi_calculate_raw_average(table, row, column, 100) + try: + average = wmi_calculate_raw_average(table, row, column, 100) + except KeyError: + return 3, "item not present anymore", [] + status = wmi_determine_status(average, levels) return (

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016