Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4400 FIX Fixed possible random "OSError: [Errno 9] Bad file descriptor" in GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 5195ae65da3d67f365443408ff7204a74a22c05f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5195ae65da3d67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 27 09:01:36 2017 +0100 4400 FIX Fixed possible random "OSError: [Errno 9] Bad file descriptor" in GUI During rendering of any page in the GUI this error could occur. Restarting the apache of the site should fix the issue for some time. Change-Id: I122a427e6f9ef49d0117b4f98c99ac451a8f2011 --- .werks/4400 | 13 +++++++++++++ lib/store.py | 8 +++++++- web/htdocs/crash_reporting.py | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/4400 b/.werks/4400 new file mode 100644 index 0000000..f29c234 --- /dev/null +++ b/.werks/4400 @@ -0,0 +1,13 @@ +Title: Fixed possible random "OSError: [Errno 9] Bad file descriptor" in GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488182205 + +During rendering of any page in the GUI this error could occur. Restarting the +apache of the site should be a workaround the issue for some time unitl applying +the fix shipped with this change. diff --git a/lib/store.py b/lib/store.py index 8edf2ce..51f4c69 100644 --- a/lib/store.py +++ b/lib/store.py @@ -252,7 +252,13 @@ def release_all_locks(): global g_aquired_locks, g_locked_paths for _unused_path, fd in g_aquired_locks: - os.close(fd) + try: + os.close(fd) + except OSError, e: + if e.errno == 9: # OSError: [Errno 9] Bad file descriptor + pass + else: + raise g_aquired_locks = [] g_locked_paths = [] diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 6236f47..d88a05f 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -151,6 +151,7 @@ def get_crash_info(tardata): def fetch_file_from_tar(tardata, filename): p = subprocess.Popen(['tar', 'xzf', '-', '--to-stdout', filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=open(os.devnull, "w"), close_fds=True) result = p.communicate(tardata) return result[0]

7 years, 7 months

Updated bug entries #2805

by Lars Michelsen

Module: check_mk Branch: master Commit: 049b0f30afb28f3afed4f236ef2ee7ebe4d193e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049b0f30afb28f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 27 08:33:45 2017 +0100 Updated bug entries #2805 Change-Id: Ic83806342382eec102d04287b892c10dd260b959 --- .bugs/2805 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2805 b/.bugs/2805 index 1f2040e..4bb1dd3 100644 --- a/.bugs/2805 +++ b/.bugs/2805 @@ -1,9 +1,9 @@ Title: Adding a view to a report ships unneccessary filters Component: reporting -State: open +Class: bug +State: done Date: 2015-09-16 12:05:09 Targetversion: future -Class: bug Try this: go to the view "host" of some host. Add this to a report using the small button at the bottom of the page. @@ -11,3 +11,6 @@ the small button at the bottom of the page. This view will now be added including the two context filters "Service" and "Service State". Both are inactive and unncessary, however. Only active filters should be added. + +2017-02-27 08:33:11: changed state open -> done +This has already been fixed.

7 years, 7 months

Reserved 30 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: c99bc3a143f7aed58d6c3458b0d3b5eeffbfa952 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c99bc3a143f7ae… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 24 13:24:33 2017 +0100 Reserved 30 Werk IDS Change-Id: Iac1c07a66b7baf8e2e2372437ff5bf8263978a06 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e7718be..ddbeab2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4446 +4476

7 years, 7 months

4446 new check netapp_api_environment (cluster mode only):

by Andreas Boesl

allows monitoring of PSU faults Message-ID: <58b02770.8SOxOWFXdFlRrZwg%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b72a4ad29967ec39c1fcc155dec6afd3f7c867fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b72a4ad29967ec… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 24 13:27:45 2017 +0100 4446 new check netapp_api_environment (cluster mode only): allows monitoring of PSU faults Change-Id: I485944705b6f1487a8d1a23c1c22e608c1131234 --- .werks/4446 | 10 ++++++++ agents/special/agent_netapp | 8 ++++++ checkman/netapp_api_environment | 13 ++++++++++ checks/netapp_api_environment | 56 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/.werks/4446 b/.werks/4446 new file mode 100644 index 0000000..65c54fc --- /dev/null +++ b/.werks/4446 @@ -0,0 +1,10 @@ +Title: new check netapp_api_environment (cluster mode only): allows monitoring of PSU faults +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487939170 +Class: feature + + diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 6948d37..2222838 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -1133,6 +1133,14 @@ try: if node in ha_partners: processed_nodes.append(ha_partners[node]) + + # Controller Status + enviroment = query("environment-sensors-get-iter") + if enviroment: + print "<<<netapp_api_enviroment>>>" + print format_config(enviroment, "sensor-name", "sensor-name") + + # Qtree quota usage quota_info = query("quota-report-iter") if quota_info: diff --git a/checkman/netapp_api_environment b/checkman/netapp_api_environment new file mode 100644 index 0000000..d3ec0bd --- /dev/null +++ b/checkman/netapp_api_environment @@ -0,0 +1,13 @@ +title: NetApp Filer Clustermode: PSU Fault Info +agents: netapp +catalog: hw/storagehw/netapp +license: GPL +distribution: check_mk +description: + This check monitors the state of the powersupplys sensor states for a NetApp clustermode filer. + + The checks reports {CRIT} when the discrete-sensor-state differs from {normal} + +inventory: + One check is created for each PSU found + diff --git a/checks/netapp_api_environment b/checks/netapp_api_environment new file mode 100644 index 0000000..a014ca2 --- /dev/null +++ b/checks/netapp_api_environment @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +# <<<netapp_api_environment:sep(9)>>> +# sensor-name PSU1 FAULT sensor-type discrete node-name BIN-CL1-N1 discrete-sensor-value OK discrete-sensor-state normal threshold-sensor-state normal + +def inventory_netapp_api_environment(parsed): + for key, values in parsed.items(): + # Let's hope this simple match catches all PSU FAULTs.. + if "FAULT" in key: + item_name = "%s / %s" % (values.get("node-name"), values.get("sensor-name").replace(" FAULT", "")) + yield item_name, None + +def check_netapp_api_environment(item, _no_params, parsed): + psu = parsed.get("%s.%s" % tuple(item.split(" / "))) + if not psu: + return + + state = 0 + if psu.get("discrete-sensor-state") != "normal": + state = 2 + + yield state, "Sensor state: %s, Sensor value: %s" % \ + (psu["discrete-sensor-state"], psu["discrete-sensor-value"]) + + +check_info["netapp_api_environment"] = { + 'check_function' : check_netapp_api_environment, + 'inventory_function' : inventory_netapp_api_environment, + 'parse_function' : lambda info: netapp_api_parse_lines(info, custom_keys = ["node-name", "sensor-name"]), + 'service_description' : 'PSU Controller %s', + 'includes' : ["netapp_api.include"] +}

7 years, 7 months

4397 FIX Views: Fixed datasource KeyError exception

by Lars Michelsen

Module: check_mk Branch: master Commit: dfe426184df96bdfcaab16f3f49c6731dc872521 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfe426184df96b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 10:22:36 2017 +0100 4397 FIX Views: Fixed datasource KeyError exception When e.g. a Event Console related view was added to a dashboard and then the Event Console was disabled or that site, this could lead into a KeyError exception when rendering the dashboard, because the datasource was not existant anymore. Change-Id: Ie0f9fd35300e6ff5ebe594e013c6d0eb6d8b1b1a --- .werks/4397 | 14 ++++++++++++++ web/htdocs/views.py | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/4397 b/.werks/4397 new file mode 100644 index 0000000..8e17c5c --- /dev/null +++ b/.werks/4397 @@ -0,0 +1,14 @@ +Title: Views: Fixed datasource KeyError exception +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487928038 + +When e.g. a Event Console related view was added to a dashboard and +then the Event Console was disabled or that site, this could lead +into a KeyError exception when rendering the dashboard, because the +datasource was not existant anymore. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 99b2686..2be24b2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1466,7 +1466,18 @@ def show_view(view, show_heading = False, show_buttons = True, show_checkboxes = force_checkboxes or html.var('show_checkboxes', '0') == '1' # Get the datasource (i.e. the logical table) - datasource = multisite_datasources[view["datasource"]] + try: + datasource = multisite_datasources[view["datasource"]] + except KeyError: + if view["datasource"].startswith("mkeventd_"): + raise MKUserError(None, + _("The Event Console view '%s' can not be rendered. The Event Console is possibly " + "disabled.") % view["name"]) + else: + raise MKUserError(None, + _("The view '%s' using the datasource '%s' can not be rendered " + "because the datasource does not exist.") % (view["name"], view["datasource"])) + tablename = datasource["table"] # Filters to use in the view

7 years, 7 months

4399 FIX Views: Fixed graph showing views of services with invalid perfdata

by Lars Michelsen

Module: check_mk Branch: master Commit: 51b987cd0697445a7e77fb245a337f6d38d0a9dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51b987cd069744… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 10:59:48 2017 +0100 4399 FIX Views: Fixed graph showing views of services with invalid perfdata Some checks that produced invalid perfdata like 'key=" "' were causing the metric parsing to crash with a "IndexError (list index out of range)" error. The metric parsing is now skipping those invalid values. Change-Id: I5b0ab12e2a0d32546823c8a588fdadd6c9453d0b --- .werks/4399 | 14 ++++++++++++++ web/htdocs/metrics.py | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4399 b/.werks/4399 new file mode 100644 index 0000000..d0be212 --- /dev/null +++ b/.werks/4399 @@ -0,0 +1,14 @@ +Title: Views: Fixed graph showing views of services with invalid perfdata +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487930278 + +Some checks that produced invalid perfdata like 'key=" "' were causing the +metric parsing to crash with a "IndexError (list index out of range)" error. + +The metric parsing is now skipping those invalid values. diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7240e48..be5bc61 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -351,7 +351,7 @@ def parse_perf_data(perf_data_string, check_command=None): while len(value_parts) < 5: value_parts.append(None) value_text, warn, crit, min, max = value_parts[0:5] - if value_text == "": + if value_text.strip() == "": continue # ignore useless empty variable # separate value from unit @@ -361,6 +361,8 @@ def parse_perf_data(perf_data_string, check_command=None): i += 1 unit_name = value_text[i:] + if value_text[:i] == "": + continue value = float_or_int(value_text[:i]) perf_data_tuple = (varname, value, unit_name)

7 years, 7 months

4398 FIX Fixed broken GUI when deleting local/share/check_mk/web/ plugins dir

by Lars Michelsen

Module: check_mk Branch: master Commit: 10307e794a1f66eea47a615ecf499df5c48ca444 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10307e794a1f66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 10:48:33 2017 +0100 4398 FIX Fixed broken GUI when deleting local/share/check_mk/web/plugins dir An exception "OSError ([Errno 2] No such file or directory: '/omd/sites/shl/local/share/check_mk/web/plugins/')" prevented use of the GUI at all when deleting the directory. Change-Id: I3d4284755aa156695960f0c8751a50cbf2090fa8 --- .werks/4398 | 11 +++++++++++ web/htdocs/lib.py | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/4398 b/.werks/4398 new file mode 100644 index 0000000..7f50f55 --- /dev/null +++ b/.werks/4398 @@ -0,0 +1,11 @@ +Title: Fixed broken GUI when deleting local/share/check_mk/web/plugins dir +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487929499 + +An exception "OSError ([Errno 2] No such file or directory: '/omd/sites/shl/local/share/check_mk/web/plugins/')" prevented use of the GUI at all when deleting the directory. diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index a957ffd..3a702c0 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -190,7 +190,16 @@ def load_web_plugins(forwhat, globalvars): def find_local_web_plugins(): basedir = cmk.paths.local_web_dir + "/plugins/" - for plugins_dir in os.listdir(basedir): + + try: + plugin_dirs = os.listdir(basedir) + except OSError, e: + if e.errno == 2: + return + else: + raise + + for plugins_dir in plugin_dirs: dir_path = basedir + plugins_dir yield dir_path # Changes in the directory like deletion of files! if os.path.isdir(dir_path):

7 years, 7 months

8756 FIX didactum.include: added missing states and improved status handling

by Simon Betz

Module: check_mk Branch: master Commit: 79dee8f87e31d9aa8f840d10ed4d5283df916546 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79dee8f87e31d9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 24 10:46:26 2017 +0100 8756 FIX didactum.include: added missing states and improved status handling Change-Id: I1c4e4f2e4bd963d6ebb3777e16e17648358b2cc9 --- .werks/8756 | 11 +++++++++++ checks/didactum.include | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/8756 b/.werks/8756 new file mode 100644 index 0000000..f61d717 --- /dev/null +++ b/.werks/8756 @@ -0,0 +1,11 @@ +Title: didactum.include: added missing states and improved status handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487929535 + + diff --git a/checks/didactum.include b/checks/didactum.include index 7732215..2ea0ad2 100644 --- a/checks/didactum.include +++ b/checks/didactum.include @@ -35,7 +35,9 @@ def scan_didactum(oid): def parse_didactum_sensors(info): map_states = { "alarm" : 2, + "high alarm" : 2, "warning" : 1, + "high warning" : 1, "normal" : 0, "not connected" : 3, "on" : 0, @@ -55,9 +57,16 @@ def parse_didactum_sensors(info): except: value = value_str + if status in map_states: + state = map_states[status] + state_readable = status + else: + state = 3 + state_readable = "unknown[%s]" % status + parsed[ty].setdefault(name, { - "state" : map_states.get(status, 3), - "state_readable" : status, + "state" : state, + "state_readable" : state_readable, "value" : value, })

7 years, 7 months

4034 Windows agent fileinfo monitoring: Now able to configure globbing patterns for subdirectories

by Andreas Boesl

Module: check_mk Branch: master Commit: c9566d10e15ffeece952b1d3c63422e871a9fdfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9566d10e15ffe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 24 10:17:00 2017 +0100 4034 Windows agent fileinfo monitoring: Now able to configure globbing patterns for subdirectories Previously you could only configure globbing patterns on the filename level. E.g. C:\test\mylog2017*.txt. This new feature enables globbing patterns for paths, too. E.g. C:\test\archive-2017-*\summary?.log. Change-Id: Ica19d910b665ce6a7f4708fbc624a37ecf8b3a8b --- .werks/4034 | 13 +++ agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1332224 -> 1338880 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15690517 -> 15800314 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1332224 -> 1338880 bytes agents/windows/check_mk_agent.exe | Bin 1308672 -> 1316352 bytes agents/windows/check_mk_agent.msi | Bin 2910720 -> 2925056 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13575746 -> 13661730 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1308672 -> 1316352 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 588355 -> 591476 bytes agents/windows/install_agent.exe | Bin 585583 -> 588705 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionFileinfo.cc | 134 +++++++++++++++++------ agents/windows/sections/SectionFileinfo.h | 10 +- 16 files changed, 125 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9566d10e1…

7 years, 7 months

BI: Fixed exception in BI views when using site icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 49e408f6155a6db214866905617bcffa292b3624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e408f6155a6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 09:59:35 2017 +0100 BI: Fixed exception in BI views when using site icons Change-Id: I883e47dda8a43834982ad27aa80aebb6d6d55f39 --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 90f134f..2fb1f19 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -489,13 +489,13 @@ multisite_painters["host_icons"] = { # '----------------------------------------------------------------------' def paint_site_icon(row): - if row["site"] and config.use_siteicons: + if row.get("site") and config.use_siteicons: return None, "<img class=siteicon src=\"icons/site-%s-24.png\">" % row["site"] else: return None, "" multisite_painters["site_icon"] = { - "title" : _("Icon showing the site"), + "title" : _("Site icon"), "short" : "", "columns" : ["site"], "paint" : paint_site_icon,

7 years, 7 months

← Newer
1
2
3
4
5
6
7
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017