Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#2987 FIX esx_vsphere_counters: Improved accuracy of all counter values

by Andreas Boesl

Module: check_mk Branch: master Commit: 213f9197c826b91ea35f9f1d0603864426d38c63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=213f9197c826b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 2 11:19:47 2016 +0100 #2987 FIX esx_vsphere_counters: Improved accuracy of all counter values In the previous versions the esx_vsphere_counter checks only got the last real time sample from the ESX system, which always represents a fixed interval of 20 seconds.<br> With this update the agent vsphere now queries the last n-samples. The number of samples is determined out of the agents check interval.<br> Some of the counter checks have been rewritten to handle the increased amount of data. Most of the values are simply processed to an average value, with the expection of the latency, which uses the maximum value. --- .werks/2987 | 16 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 82 +++++++++++++++++++++++++++++------------- checks/esx_vsphere_counters | 60 +++++++++++++++++++------------ 4 files changed, 112 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=213f9197c8…

8 years, 8 months

#3040 FIX Removed all summary_hosts related filters from shipped views

by Lars Michelsen

Module: check_mk Branch: master Commit: e2ca3ab0ddeeabd4e1981886df37f23fef98a522 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ca3ab0ddeeab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 10:51:55 2016 +0100 #3040 FIX Removed all summary_hosts related filters from shipped views The so called summary hosts which were only rarely used is a feature we are about to deprecate in the coming 1.2.9 release. As preparation for this we are now removing the hard coded default filters from the views shipped with Check_MK. We assume that nearly no users will be affected from this since most users simply don't have any summary host defined. If you have summary hosts configured you are requested to migrate your configuration. To make the views work again, most of them were filtering out the summary hosts, you need to add this filter again on your own to the view by editing it with the view editor. --- .werks/3040 | 17 ++++++++ ChangeLog | 1 + web/plugins/dashboard/builtin.py | 4 -- web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/builtin.py | 82 ++++++++++++++------------------------ web/plugins/views/dashboard.py | 6 +-- web/plugins/views/mobile.py | 13 ++---- 7 files changed, 53 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2ca3ab0dd…

8 years, 8 months

#3064 FIX netscaler_health: no longer discovers non-running fans ( i.e. in virtual appliances)

by Sebastian Herbord

Module: check_mk Branch: master Commit: ff3a7b620528a7916ed02c8886127e7e96c5e6ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff3a7b620528a7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Feb 2 09:45:56 2016 +0100 #3064 FIX netscaler_health: no longer discovers non-running fans (i.e. in virtual appliances) --- .werks/3064 | 9 +++++++++ ChangeLog | 1 + checks/netscaler_health | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3064 b/.werks/3064 new file mode 100644 index 0000000..08a2778 --- /dev/null +++ b/.werks/3064 @@ -0,0 +1,9 @@ +Title: netscaler_health: no longer discovers non-running fans (i.e. in virtual appliances) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454402678 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7454dc6..a3ad808 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ * 2942 FIX: juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values... NOTE: Please refer to the migration notes! * 3063 FIX: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system + * 3064 FIX: netscaler_health: no longer discovers non-running fans (i.e. in virtual appliances) Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netscaler_health b/checks/netscaler_health index 6f8e653..570c8fb 100644 --- a/checks/netscaler_health +++ b/checks/netscaler_health @@ -68,7 +68,7 @@ factory_settings["netscaler_health_fan_default_levels"] = { def inventory_netscaler_health_fan(info): for name, value in info: - if name.endswith("Speed"): + if name.endswith("Speed") and value != "0": yield name[:-5], {} def check_netscaler_health_fan(item, params, info):

8 years, 8 months

websphere_mq_channels: fixed usage of fallback

by Sebastian Herbord

Module: check_mk Branch: master Commit: c15b3d4f79a7a949c37b8e1343347489e9fad3a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c15b3d4f79a7a9… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 16:38:50 2016 +0100 websphere_mq_channels: fixed usage of fallback --- checks/websphere_mq_channels | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/websphere_mq_channels b/checks/websphere_mq_channels index 7002599..2e3081d 100644 --- a/checks/websphere_mq_channels +++ b/checks/websphere_mq_channels @@ -67,7 +67,7 @@ def check_websphere_mq_channels(item, params, info): yield (state, "%d/%d Messages" % (messages, max_messages), [ ('messages', messages, warn, crit, 0, max_messages) ]) - state = params['status'].get(status, 2) + state = params['status'].get(status, params['status'].get('other', 2)) yield state, "Channel State: %s" % status, []

8 years, 8 months

clang-formatted all C/C++ stuff.

by Sven Panne

8 years, 8 months

Fixed broken table header styling on WATO services page

by Lars Michelsen

Module: check_mk Branch: master Commit: a9762c4cb3179a9572dc8ecd94c95d058d5b64d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9762c4cb3179a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 1 15:32:06 2016 +0100 Fixed broken table header styling on WATO services page --- web/htdocs/pages.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 073ffa3..f4b9fba 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -348,6 +348,9 @@ table.data.oddeven > tbody > tr:nth-child(even) { background-color: #ddd; } +table.data.oddeven > tbody > tr.groupheader { + background-color: transparent; +} /* Two-lined header, for example in WATO: ChangeLog->Site Status */ table.data tr.dualheader th {

8 years, 8 months

#3039 Added more useful debugging infos to crash reports

by Lars Michelsen

Module: check_mk Branch: master Commit: ab9ee8ceb90dcc4e205db806cbd86758e2d92e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab9ee8ceb90dcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 1 15:20:44 2016 +0100 #3039 Added more useful debugging infos to crash reports We added the following generic infos to all crash reports: - Python version - Local variables of crash raising function This has been added to GUI crashes: - Request method (POST/GET) - Page referer --- .werks/3039 | 17 +++++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 3 +++ web/htdocs/crash_reporting.py | 30 ++++++++++++++++++++++++++---- web/htdocs/html_mod_python.py | 20 ++++++++++++++++---- web/htdocs/htmllib.py | 17 +++++++++++++---- 6 files changed, 76 insertions(+), 12 deletions(-) diff --git a/.werks/3039 b/.werks/3039 new file mode 100644 index 0000000..0030e08 --- /dev/null +++ b/.werks/3039 @@ -0,0 +1,17 @@ +Title: Added more useful debugging infos to crash reports +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1454336335 +Class: feature + +We added the following generic infos to all crash reports: + +- Python version +- Local variables of crash raising function + +This has been added to GUI crashes: + +- Request method (POST/GET) +- Page referer diff --git a/ChangeLog b/ChangeLog index ebc4cc4..7454dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore... * 2881 Automatically restart core instead of reload after changes in local check plugins... + * 3039 Added more useful debugging infos to crash reports... * 2682 FIX: Fixed exception Error creating configuration: global name 'extra_host_attributes' is not defined * 2443 FIX: Fixed quoting of ! in classical nagios checks configured via WATO... * 2718 FIX: Fixed agent timeouts not resulting in a crash report anympore... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index eef1b9c..67c20ac 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1519,14 +1519,17 @@ def is_manual_check(hostname, check_type, item): def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text): exc_type, exc_value, exc_traceback = sys.exc_info() + import inspect crash_info = { "crash_type" : "check", "time" : time.time(), "os" : get_os_info(), "version" : check_mk_version, + "python_version": sys.version, "exc_type" : exc_type.__name__, "exc_value" : "%s" % exc_value, "exc_traceback" : traceback.extract_tb(exc_traceback), + "local_vars" : inspect.trace()[-1][0].f_locals, "details" : { "check_output" : text, "host" : hostname, diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index aeb798b..07ea45d 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import subprocess, base64, time, pprint, traceback, tarfile, cStringIO, sys +import inspect from lib import * from valuespec import * import table, defaults, config, userdb, forms @@ -270,14 +271,22 @@ def show_crash_report(info): html.write("<td>%s</td></tr>" % html.attrencode(info["os"])) html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check_MK Version")) html.write("<td>%s</td></tr>" % html.attrencode(info["version"])) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Exception")) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Python Version")) + html.write("<td>%s</td></tr>" % html.attrencode(info.get("python_version", _("Unknown")))) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Exception")) html.write("<td><pre>%s (%s)</pre></td></tr>" % (html.attrencode(info["exc_type"]), html.attrencode(info["exc_value"]))) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Traceback")) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Traceback")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(info["exc_traceback"]))) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Local Variables")) + html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_local_vars(info["local_vars"]))) html.write("</table>") +def format_local_vars(local_vars): + return pprint.pformat(local_vars) + + def show_crashed_check_details(info): def format_bool(val): return { @@ -334,13 +343,17 @@ def show_gui_crash_details(info): html.write("<table class=\"data\">") html.write("<tr class=\"data even0\"><td class=\"left legend\">%s</td>" % _("Page")) html.write("<td>%s</td></tr>" % html.attrencode(details["page"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("HTTP Parameters")) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Request Method")) + html.write("<td>%s</td></tr>" % html.attrencode(details.get("request_method", _("Unknown")))) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("HTTP Parameters")) html.write("<td>") html.debug_vars(vars=details["vars"], hide_with_mouse=False) html.write("</td></tr>") + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Referer")) + html.write("<td>%s</td></tr>" % html.attrencode(details.get("referer", _("Unknown")))) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Username")) html.write("<td>%s</td></tr>" % html.attrencode(details["username"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("User-Agent")) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("User Agent")) html.write("<td>%s</td></tr>" % html.attrencode(details["user_agent"])) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Mobile GUI")) html.write("<td>%s</td></tr>" % html.attrencode(details["is_mobile"])) @@ -372,6 +385,11 @@ def show_agent_output(tardata): output_box(_("Agent output"), agent_output) +# FIXME: Maybe we need to introduce some kind of size limit +def get_local_vars_of_last_exception(): + return inspect.trace()[-1][0].f_locals + + # Slightly duplicate code with modules/check_mk_base.py. Maybe create some kind of central library? def create_crash_dump_info_file(tar): exc_type, exc_value, exc_traceback = sys.exc_info() @@ -381,17 +399,21 @@ def create_crash_dump_info_file(tar): "time" : time.time(), "os" : get_os_info(), "version" : defaults.check_mk_version, + "python_version": sys.version, "exc_type" : exc_type.__name__, "exc_value" : "%s" % exc_value, "exc_traceback" : traceback.extract_tb(exc_traceback), + "local_vars" : get_local_vars_of_last_exception(), "details" : { "page" : html.myfile+".py", "vars" : html.vars, "username" : html.user, "user_agent" : html.get_user_agent(), + "referer" : html.get_referer(), "is_mobile" : html.is_mobile(), "is_ssl_request" : html.is_ssl_request(), "language" : config.get_language(), + "request_method" : html.request_method(), }, } diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 465d9f0..67dc5d9 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -71,6 +71,22 @@ class html_mod_python(htmllib.html): return int(self.req.server.timeout) + def request_method(self): + return self.req.method + + + def is_ssl_request(self): + return self.get_request_header('X-Forwarded-Proto') == 'https' + + + def get_user_agent(self): + return self.req.headers_in.get('User-Agent', '') + + + def get_referer(self): + return self.req.headers_in.get('Referer', '') + + def guitest_fake_login(self, user_id): config.login(user_id) self.user = user_id @@ -166,10 +182,6 @@ class html_mod_python(htmllib.html): return self.req.headers_in.get(key, deflt) - def is_ssl_request(self): - return self.get_request_header('X-Forwarded-Proto') == 'https' - - def set_cookie(self, varname, value, expires = None): # httponly tells the browser not to make this cookie available to Javascript c = Cookie.Cookie(varname, make_utf8(value), path='/', httponly=True) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 81d76dc..7d5d1ce 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -136,7 +136,19 @@ class html(GUITester): return self.mobile def get_user_agent(self): - return self.req.headers_in.get('User-Agent', '') + raise MKGeneralException("get_user_agent not implemented") + + def get_referer(self): + raise MKGeneralException("get_referer not implemented") + + def request_timeout(self): + raise MKGeneralException("request_timeout not implemented") + + def is_ssl_request(self): + raise MKGeneralException("is_ssl_request not implemented") + + def request_method(self): + raise MKGeneralException("request_method not implemented") def set_page_context(self, c): self.page_context = c @@ -922,9 +934,6 @@ class html(GUITester): def http_redirect(self, url): raise MKGeneralException("http_redirect not implemented") - def request_timeout(self): - raise MKGeneralException("request_timeout not implemented") - def set_browser_redirect(self, secs, url): self.browser_reload = secs self.browser_redirect = url

8 years, 8 months

#3063 FIX mcaffee_av_client: plugin didn' t work with 32-bit av software installed on 64-bit system

by Sebastian Herbord

Module: check_mk Branch: master Commit: f43680f8c25c0984ebb4d2101515445ef136c7c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f43680f8c25c09… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 15:15:40 2016 +0100 #3063 FIX mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system --- .werks/3063 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mcafee_av_client.bat | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3063 b/.werks/3063 new file mode 100644 index 0000000..49af189 --- /dev/null +++ b/.werks/3063 @@ -0,0 +1,9 @@ +Title: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454336076 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 81f2c89..ebc4cc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -236,6 +236,7 @@ * 2940 FIX: dell_om_disks: non-raid state is no longer treated as a critical problem... * 2942 FIX: juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values... NOTE: Please refer to the migration notes! + * 3063 FIX: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mcafee_av_client.bat b/agents/windows/plugins/mcafee_av_client.bat index ee324c2..d5376b9 100644 --- a/agents/windows/plugins/mcafee_av_client.bat +++ b/agents/windows/plugins/mcafee_av_client.bat @@ -8,7 +8,12 @@ rem # ------------------------------------------------------------------------- setlocal enableDelayedExpansion set dateval= -for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\McAfee\AvEngine" ^|find "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\McAfee\AvEngine" ^|find /I "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +if "%dateval%"=="" ( + rem # on 64 bit systems the registry key is in the wow64/32 branch + for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\McAfee\AvEngine" ^|find /I "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +) + if not "%dateval%"=="" ( echo ^<^<^<mcafee_av_client^>^>^> echo %dateval%

8 years, 8 months

Reserved 100 Werk IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: faf7c2688e6ea86eb7adf45997f7caea4c1dccce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faf7c2688e6ea8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 15:14:34 2016 +0100 Reserved 100 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 58d3b5c..dc1727d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3063 +3163

8 years, 8 months

tinkerforge: 7-segment display of ambient brightness was off by the factor 10

by Sebastian Herbord

Module: check_mk Branch: master Commit: f784980875d526fbe1f92a79e298c67364772c84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f784980875d526… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 14:47:26 2016 +0100 tinkerforge: 7-segment display of ambient brightness was off by the factor 10 --- agents/plugins/mk_tinkerforge | 4 ++-- agents/special/agent_tinkerforge | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mk_tinkerforge b/agents/plugins/mk_tinkerforge index 3aeee5e..d71214b 100755 --- a/agents/plugins/mk_tinkerforge +++ b/agents/plugins/mk_tinkerforge @@ -126,13 +126,13 @@ def print_generic(settings, sensor_type, ident, factor, unit, *values): def print_ambient_light(conn, settings, uid): from tinkerforge.bricklet_ambient_light import BrickletAmbientLight br = BrickletAmbientLight(uid, conn) - print_generic(settings, "ambient", br.get_identity(), 0.1, "L", br.get_illuminance()) + print_generic(settings, "ambient", br.get_identity(), 0.01, "L", br.get_illuminance()) def print_ambient_light_v2(conn, settings, uid): from tinkerforge.bricklet_ambient_light_v2 import BrickletAmbientLightV2 br = BrickletAmbientLightV2(uid, conn) - print_generic(settings, "ambient", br.get_identity(), 0.1, "L", br.get_illuminance()) + print_generic(settings, "ambient", br.get_identity(), 0.01, "L", br.get_illuminance()) def print_temperature(conn, settings, uid): diff --git a/agents/special/agent_tinkerforge b/agents/special/agent_tinkerforge index 3aeee5e..d71214b 100755 --- a/agents/special/agent_tinkerforge +++ b/agents/special/agent_tinkerforge @@ -126,13 +126,13 @@ def print_generic(settings, sensor_type, ident, factor, unit, *values): def print_ambient_light(conn, settings, uid): from tinkerforge.bricklet_ambient_light import BrickletAmbientLight br = BrickletAmbientLight(uid, conn) - print_generic(settings, "ambient", br.get_identity(), 0.1, "L", br.get_illuminance()) + print_generic(settings, "ambient", br.get_identity(), 0.01, "L", br.get_illuminance()) def print_ambient_light_v2(conn, settings, uid): from tinkerforge.bricklet_ambient_light_v2 import BrickletAmbientLightV2 br = BrickletAmbientLightV2(uid, conn) - print_generic(settings, "ambient", br.get_identity(), 0.1, "L", br.get_illuminance()) + print_generic(settings, "ambient", br.get_identity(), 0.01, "L", br.get_illuminance()) def print_temperature(conn, settings, uid):

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016