Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 89d3edbf4f49fa211740f970e31805656b1eedf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89d3edbf4f49fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 09:17:29 2015 +0200 Testcommit --- checkman/uptime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/uptime b/checkman/uptime index 497d95f..bf60a08 100644 --- a/checkman/uptime +++ b/checkman/uptime @@ -1,6 +1,6 @@ title: Uptime of operating system agents: linux -catalog: hw/environment +catalog: os/misc license: GPL distribution: check_mk description:

8 years, 10 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: a3ebeb8d44d2fc8455abe8c4fbffa5b16ec7e4c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3ebeb8d44d2fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 09:16:49 2015 +0200 Testcommit --- checkman/uptime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/uptime b/checkman/uptime index 44de2a1..497d95f 100644 --- a/checkman/uptime +++ b/checkman/uptime @@ -1,6 +1,6 @@ title: Uptime of operating system agents: linux -catalog: oxs/misc +catalog: hw/environment license: GPL distribution: check_mk description:

8 years, 10 months

Check_MK Git: check_mk: Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 0319c57804c99e231514a85510f415c257d1ca9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0319c57804c99e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 09:14:21 2015 +0200 Tescommit --- checkman/uptime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/uptime b/checkman/uptime index bf60a08..44de2a1 100644 --- a/checkman/uptime +++ b/checkman/uptime @@ -1,6 +1,6 @@ title: Uptime of operating system agents: linux -catalog: os/misc +catalog: oxs/misc license: GPL distribution: check_mk description:

8 years, 10 months

Check_MK Git: check_mk: Removed needless semicolon

by Lars Michelsen

Module: check_mk Branch: master Commit: 86229e81caa37e8f4bcb40e53ef26a256888ddf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86229e81caa37e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 08:35:42 2015 +0200 Removed needless semicolon --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dc3b9b6..1d27735 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1777,7 +1777,7 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int store_aggregated_service_result(host, servicedesc, sa, state, infotext) # performance data - if any - is stored in the third part of the result - perftexts = []; + perftexts = [] perftext = "" if perfdata:

8 years, 10 months

Check_MK Git: check_mk: synology_disks: fixed UnicodeDecodeError

by Lars Michelsen

Module: check_mk Branch: master Commit: 1be62fe1327de0600cccc7255d94f46e524b3be1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1be62fe1327de0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 13 16:46:30 2015 +0200 synology_disks: fixed UnicodeDecodeError --- checks/synology_disks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/synology_disks b/checks/synology_disks index f55e8c9..e3a0d01 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -58,7 +58,7 @@ def check_synology_disks(item, params, info): else: status_code, status_text = states[int(status)] - message = "Status: %s, Temperature: %d °C, Model: %s" % ( status_text, temp, model ) + message = u"Status: %s, Temperature: %d °C, Model: %s" % ( status_text, temp, model ) return status_code, message, [("temp", temp )]

8 years, 10 months

Check_MK Git: check_mk: Fixed spelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0579dd41fa9bddddfe24c23f9201dd74e31b2b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0579dd41fa9bdd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 13 16:03:23 2015 +0200 Fixed spelling --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6dd70e8..bab1381 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4222,7 +4222,7 @@ graph_info.append({ }) graph_info.append({ - "title" : _("Battery currencies"), + "title" : _("Battery currents"), "metrics" : [ ( "battery_current", "area" ), ( "current", "stack" ),

8 years, 10 months

Check_MK Git: check_mk: #2507 FIX mysql_slave: fixed exception caused by wrong parsing of agent data

by Lars Michelsen

Module: check_mk Branch: master Commit: 23844cacd66901588f48abe90bee8d83e916895d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23844cacd66901… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 13 14:41:43 2015 +0200 #2507 FIX mysql_slave: fixed exception caused by wrong parsing of agent data --- .werks/2507 | 10 ++++++++++ ChangeLog | 1 + checks/mysql_slave | 16 +++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/2507 b/.werks/2507 new file mode 100644 index 0000000..984247a --- /dev/null +++ b/.werks/2507 @@ -0,0 +1,10 @@ +Title: mysql_slave: fixed exception caused by wrong parsing of agent data +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1439469675 + + diff --git a/ChangeLog b/ChangeLog index 40bb87d..d2e957e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 2506 FIX: Diskstat summary: Ignoring stats from LVM devices * 2455 FIX: raritan_pdu_inlet: Fixed scaling... * 2492 FIX: check_mk_agent.linux: avoid problems with crashing waitmax after Ubuntu update... + * 2507 FIX: mysql_slave: fixed exception caused by wrong parsing of agent data Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/mysql_slave b/checks/mysql_slave index 0b0d352..dd3b705 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -39,7 +39,9 @@ def parse_mysql_slave(info): val = False elif val == 'None': val = None - return val + return line[0][:-1], val + else: + return None, None parsed = {} instance = False @@ -49,17 +51,17 @@ def parse_mysql_slave(info): instance = line[0][2:-2] parsed[instance] = [] elif instance: - value = parse_line(line) - if value: - parsed[instance][line[0][:-1]] = value + key, value = parse_line(line) + if key: + parsed[instance][key] = value # Support for old Plugin version if not instance: parsed['mysql'] = {} for line in info: - value = parse_line(line) - if value: - parsed['mysql'][line[0][:-1]] = value + key, value = parse_line(line) + if key: + parsed['mysql'][key] = value return parsed

8 years, 10 months

Check_MK Git: check_mk: Tuple check results must not return "None" as infotext

by Lars Michelsen

Module: check_mk Branch: master Commit: 75202aa86a9c4b8a5112ceef9049136fb1f1d30f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75202aa86a9c4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 13 10:24:07 2015 +0200 Tuple check results must not return "None" as infotext --- modules/check_mk_base.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5c9c09b..dc3b9b6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1401,7 +1401,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): dont_submit = True except Exception, e: - result = 3, create_crash_dump(hostname, checkname, item, params, description, info) + result = 3, create_crash_dump(hostname, checkname, item, params, description, info), [] if opt_debug: raise @@ -1619,7 +1619,7 @@ def convert_check_info(): def sanitize_check_result(result, is_snmp): if type(result) == tuple: - return sanitize_check_result_encoding(result) + return sanitize_tuple_check_result(result) elif result == None: return item_not_found(is_snmp) @@ -1639,7 +1639,7 @@ def sanitize_yield_check_result(result, is_snmp): # Simple check with no separate subchecks (yield wouldn't have been neccessary here!) if len(subresults) == 1: - return sanitize_check_result_encoding(subresults[0]) + return sanitize_tuple_check_result(subresults[0]) # Several sub results issued with multiple yields. Make that worst sub check # decide the total state, join the texts and performance data. Subresults with @@ -1650,7 +1650,7 @@ def sanitize_yield_check_result(result, is_snmp): status = 0 for subresult in subresults: - st, text, perf = sanitize_check_result_encoding(subresult) + st, text, perf = sanitize_tuple_check_result(subresult, allow_missing_infotext=True) if text != None: infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) @@ -1667,24 +1667,34 @@ def sanitize_yield_check_result(result, is_snmp): def item_not_found(is_snmp): if is_snmp: - return 3, "Item not found in SNMP data" + return 3, "Item not found in SNMP data", [] else: - return 3, "Item not found in agent output" + return 3, "Item not found in agent output", [] -def sanitize_check_result_encoding(result): +def sanitize_tuple_check_result(result, allow_missing_infotext=False): if len(result) >= 3: state, infotext, perfdata = result[:3] else: state, infotext = result perfdata = None - if type(infotext) == str: - infotext = infotext.decode('utf-8') + if not allow_missing_infotext or infotext != None: + infotext = sanitize_check_result_infotext(infotext) return state, infotext, perfdata +def sanitize_check_result_infotext(infotext): + if infotext == None: + raise MKGeneralException("Invalid infotext from check: \"None\"") + + if type(infotext) == str: + return infotext.decode('utf-8') + else: + return infotext + + def open_checkresult_file(): global checkresult_file_fd global checkresult_file_path @@ -1747,11 +1757,9 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int if not result: result = 3, "Check plugin did not return any result" - if len(result) >= 3: - state, infotext, perfdata = result[:3] - else: - state, infotext = result - perfdata = None + if len(result) != 3: + raise MKGeneralException("Invalid check result: %s" % (result, )) + state, infotext, perfdata = result if not ( infotext.startswith("OK -") or

8 years, 10 months

Check_MK Git: check_mk: Fixed setting duplicate HTTP headers

by Lars Michelsen

Module: check_mk Branch: master Commit: cc19b9e49aa362c30be3ad63b8b2d9c888454918 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc19b9e49aa362… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 13 10:02:48 2015 +0200 Fixed setting duplicate HTTP headers --- web/htdocs/html_mod_python.py | 13 ++++++------- web/htdocs/index.py | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index e65b7e8..c141c4c 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -72,6 +72,9 @@ class html_mod_python(htmllib.html): except: pass + # Finish the HTTP request short before handing over to mod_python + def finalize(self, is_error=False): + self.live = None # disconnects from livestatus def get_request_header(self, key, deflt=None): return self.req.headers_in.get(key, deflt) @@ -164,14 +167,10 @@ class html_mod_python(htmllib.html): self.set_http_header('Location', url) raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY - # Needs to set both, headers_out and err_headers_out to be sure to send - # the header on all responses - # - # FIXME: err_headers_out are sent out when a HTTP error occures (which states are treated as "errors"?) - # AND when no error occures. headers_out is sent out in case of HTTP 200 (only?). This leads to duplicated - # HTTP headers in regular cases. Should be avoided - clean it up! + # When setting err_headers_out, don't set headers_out because setting + # err_headers_out is also setting headers_out within mod_python. Otherwise + # we would send out duplicate HTTP headers which might cause bugs. def set_http_header(self, key, val): - self.req.headers_out.add(key, val) self.req.err_headers_out.add(key, val) def check_limit(self, rows, limit): diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 20845c7..194d5ac 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -298,7 +298,7 @@ def handler(req, fields = None, profiling = True): (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): release_all_locks() - html.live = None + html.finalize(is_error=True) raise except Exception, e: @@ -315,7 +315,7 @@ def handler(req, fields = None, profiling = True): response_code = apache.OK release_all_locks() - html.live = None # disconnects from livestatus + html.finalize() return response_code def page_not_found():

8 years, 10 months

Check_MK Git: check_mk: ipmi: code cleanup

by Sebastian Herbord

Module: check_mk Branch: master Commit: 83e260711fd1359986010f9349987653a601295f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83e260711fd135… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Aug 13 08:56:50 2015 +0200 ipmi: code cleanup --- checks/ipmi | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 34b8e97..6667a2e 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -103,12 +103,10 @@ def ipmi_ignore_entry(name, state): def ignored_sensors(): # merge ignored sensor list specified here and those from wato ignored_sensors_combined = ipmi_ignored_sensors[:] - try: - rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] - except IndexError: - rules = {} + rules = host_extra_conf(g_hostname, inventory_ipmi_rules) + if rules: + ignored_sensors_combined += rules[0].get("ignored_sensors", []) - ignored_sensors_combined += rules.get("ignored_sensors", []) return ignored_sensors_combined if ipmi_ignore_nr and state == 'nr': @@ -119,13 +117,13 @@ def ipmi_ignore_entry(name, state): return False def inventory_ipmi(info): - try: - rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] - except IndexError: - rules = {} + summarize = True + rules = host_extra_conf(g_hostname, inventory_ipmi_rules) + if rules: + summarize = rules[0].get("summarize", True) # the default for summarize is always true so if either configuration key has been set # to false that setting was changed by the user and needs to override the other - if not ipmi_summarize or not rules.get("summarize", True) or len(info) == 0: + if not ipmi_summarize or not summarize or len(info) == 0: for line in info: if not ipmi_ignore_entry(line[0], line[3]): yield line[0], None

8 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015