Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2762 FIX Fixed formating of check_http when using "clickable URL" option

by Lars Michelsen

Module: check_mk Branch: master Commit: 79c9f6eceb616b18ffddf0bfadee36c6bb646430 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79c9f6eceb616b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 11:09:43 2015 +0100 #2762 FIX Fixed formating of check_http when using "clickable URL" option --- .werks/2762 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 7 ++++++- web/htdocs/status.css | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2762 b/.werks/2762 new file mode 100644 index 0000000..542e599 --- /dev/null +++ b/.werks/2762 @@ -0,0 +1,10 @@ +Title: Fixed formating of check_http when using "clickable URL" option +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447236552 + + diff --git a/ChangeLog b/ChangeLog index c9d0896..b6417a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 2709 FIX: fixed exception when opening the action menu... * 2447 FIX: Fixed sorting of performancedata values with units... * 2758 FIX: Fixed processing of metrics containing varnames with quotes and/or spaces + * 2762 FIX: Fixed formating of check_http when using "clickable URL" option WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index d45213a..110c144 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -288,10 +288,15 @@ def format_plugin_output(output, row = None): output = output[:a] + "running on " + h + output[e+1:] if config.escape_plugin_output: - output = re.sub("http[s]?://[^\"'>\t\s\n,]+", + # (?:<A HREF="), (?: target="_blank">)? and endswith(" </A>") is a special + # handling for the HTML code produced by check_http when "clickable URL" option is active. + output = re.sub("(?:<A HREF=")?http[s]?://[^\"'>\t\s\n,]+(?: target="_blank">)?", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % (p.group(0).replace('"', ''), p.group(0).replace('"', '')), output) + if output.endswith(" </A>"): + output = output[:-11] + return output def format_exception(): diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 798db16..f74afc1 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -123,6 +123,7 @@ img.pluginurl { width: 16px; height: 16px; vertical-align: middle; + margin: 1px; } /* *some* problem */

8 years, 8 months

#2761 FIX check_http: Fixed handling of multiple strings given as " Strings to expect in server response"

by Lars Michelsen

Module: check_mk Branch: master Commit: 44bcab548cf32ebdb05f3a8df6f809eec5c7b54e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44bcab548cf32e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 10:34:23 2015 +0100 #2761 FIX check_http: Fixed handling of multiple strings given as "Strings to expect in server response" --- .werks/2761 | 10 ++++++++++ ChangeLog | 1 + checks/check_http | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2761 b/.werks/2761 new file mode 100644 index 0000000..639a979 --- /dev/null +++ b/.werks/2761 @@ -0,0 +1,10 @@ +Title: check_http: Fixed handling of multiple strings given as "Strings to expect in server response" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447234428 + + diff --git a/ChangeLog b/ChangeLog index ed68509..c9d0896 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 2700 FIX: ibm_svc_node: fixed handling with agent output after firmware update * 2701 FIX: zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems... * 2702 FIX: oracle_diva_csm: fixed handling of empty sublists + * 2761 FIX: check_http: Fixed handling of multiple strings given as "Strings to expect in server response" Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/check_http b/checks/check_http index 85b3153..5d4e9da 100644 --- a/checks/check_http +++ b/checks/check_http @@ -101,8 +101,8 @@ def check_http_arguments(params): if "onredirect" in settings: args += ' --onredirect=%s' % settings["onredirect"] - for s in settings.get("expect_response", []): - args += ' -e %s' % quote_shell_string(s) + if "expect_response" in settings: + args += ' -e %s' % quote_shell_string(",".join(settings["expect_response"])) if "expect_string" in settings: args += ' -s %s' % quote_shell_string(settings["expect_string"])

8 years, 8 months

#2760 FIX Fixed case where "activate changes" was not commiting the pending changes entries correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 56293e2e5489978d616be73a4570270f70e55fb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56293e2e548997… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 10:29:09 2015 +0100 #2760 FIX Fixed case where "activate changes" was not commiting the pending changes entries correctly It could happen that activate changes was not commiting the pending changes entries correctly after applying the changes. Right after activation the changes look ok, but when coming back to another WATO page, the changes are visible as pending again. --- .werks/2760 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 12 +++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/2760 b/.werks/2760 new file mode 100644 index 0000000..d6cf35f --- /dev/null +++ b/.werks/2760 @@ -0,0 +1,12 @@ +Title: Fixed case where "activate changes" was not commiting the pending changes entries correctly +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447234005 + +It could happen that activate changes was not commiting the pending changes entries correctly +after applying the changes. Right after activation the changes look ok, but when coming back to +another WATO page, the changes are visible as pending again. diff --git a/ChangeLog b/ChangeLog index f611d18..ed68509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 2723 FIX: Hiding "discard changes button" after successful activation of changes * 2742 FIX: Make selection of folders and host group tag filter use nicer drawing characters * 2774 FIX: Fix exception when deleting certain types of MIBs + * 2760 FIX: Fixed case where "activate changes" was not commiting the pending changes entries correctly... Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d6f3d1..1742ca6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11820,7 +11820,13 @@ class SiteAttribute(Attribute): # "need_restart" : True, # True, if remote site needs a restart (cmk -R) def load_replication_status(): try: - return eval(file(repstatus_file).read()) + repstatus = eval(file(repstatus_file).read()) + + for site_id, status in repstatus.items(): + if site_is_local(site_id): # nevery sync to local site + status["need_sync"] = False + + return repstatus except: return {} @@ -11841,6 +11847,10 @@ def update_replication_status(site_id, vars, times = {}): else: repstatus.setdefault(site_id, {}) repstatus[site_id].update(vars) + + if site_is_local(site_id): # nevery sync to local site + repstatus[site_id]["need_sync"] = False + old_times = repstatus[site_id].setdefault("times", {}) for what, duration in times.items(): if what not in old_times:

8 years, 8 months

NagiosTextAttribute input field can now be configured to have a different size

by Lars Michelsen

Module: check_mk Branch: master Commit: ffd18e36957c88685f641179d4b584ba55891526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd18e36957c88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 09:58:16 2015 +0100 NagiosTextAttribute input field can now be configured to have a different size --- web/htdocs/wato.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1c597b0..7d6f3d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6064,7 +6064,8 @@ class Attribute: # A simple text attribute. It is stored in # a Python unicode string class TextAttribute(Attribute): - def __init__(self, name, title, help = None, default_value="", mandatory=False, allow_empty=True, size=25): + def __init__(self, name, title, help = None, default_value="", + mandatory=False, allow_empty=True, size=25): Attribute.__init__(self, name, title, help, default_value) self._mandatory = mandatory self._allow_empty = allow_empty @@ -6125,8 +6126,10 @@ class FixedTextAttribute(TextAttribute): # A text attribute that is stored in a Nagios custom macro class NagiosTextAttribute(TextAttribute): - def __init__(self, name, nag_name, title, help = None, default_value="", mandatory = False, allow_empty=True): - TextAttribute.__init__(self, name, title, help, default_value, mandatory, allow_empty) + def __init__(self, name, nag_name, title, help=None, default_value="", + mandatory=False, allow_empty=True, size=25): + TextAttribute.__init__(self, name, title, help, default_value, + mandatory, allow_empty, size) self.nag_name = nag_name def nagios_name(self):

8 years, 8 months

#2785 WATO Web-API: i18n of error messages and intitial validation of incoming request

by Andreas Boesl

Module: check_mk Branch: master Commit: 71ad8512f91facd339d04cd2510d0f82cf386dbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71ad8512f91fac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 11 10:01:41 2015 +0100 #2785 WATO Web-API: i18n of error messages and intitial validation of incoming request The api now checks if all keys of the incoming request object are valid. Furthermore, the error messages are now internationalized. --- .werks/2785 | 10 ++++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 29 +++++++++++++++++++++++------ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.werks/2785 b/.werks/2785 new file mode 100644 index 0000000..1a4e655 --- /dev/null +++ b/.werks/2785 @@ -0,0 +1,10 @@ +Title: WATO Web-API: i18n of error messages and intitial validation of incoming request +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1447232146 +Class: feature + +The api now checks if all keys of the incoming request object are valid. +Furthermore, the error messages are now internationalized. diff --git a/ChangeLog b/ChangeLog index 1a7a075..f611d18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... + * 2785 WATO Web-API: i18n of error messages and intitial validation of incoming request... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 0b3921c..fdd0f3e 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -24,7 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def validate_api_request(request, valid_keys): + for key in request.keys(): + if key not in valid_keys: + raise MKUserError(None, _("Invalid key: %s") % key) + def action_add_host(request): + validate_api_request(request, ["hostname", "folder", "attributes"]) + if html.var("create_folders"): create_folders = bool(int(html.var("create_folders"))) else: @@ -35,9 +42,9 @@ def action_add_host(request): attributes = request.get("attributes", {}) if not hostname: - raise MKUserError(None, "Hostname is missing") + raise MKUserError(None, _("Hostname is missing")) if not folder: - raise MKUserError(None, "Foldername is missing") + raise MKUserError(None, _("Foldername is missing")) return g_api.add_hosts([{"hostname": hostname, "folder": folder, @@ -52,12 +59,14 @@ api_actions["add_host"] = { ############### def action_edit_host(request): + validate_api_request(request, ["hostname", "unset_attributes", "attributes"]) + hostname = request.get("hostname") attributes = request.get("attributes", {}) unset_attributes = request.get("unset_attributes", []) if not hostname: - raise MKUserError(None, "Hostname is missing") + raise MKUserError(None, _("Hostname is missing")) return g_api.edit_hosts([{"hostname": hostname, "attributes": attributes, @@ -71,6 +80,8 @@ api_actions["edit_host"] = { ############### def action_get_host(request): + validate_api_request(request, ["hostname"]) + if html.var("effective_attributes"): effective_attributes = bool(int(html.var("effective_attributes"))) else: @@ -79,7 +90,7 @@ def action_get_host(request): hostname = request.get("hostname") if not hostname: - raise MKUserError(None, "Hostname is missing") + raise MKUserError(None, _("Hostname is missing")) return g_api.get_host(hostname, effective_attr = effective_attributes) @@ -91,10 +102,12 @@ api_actions["get_host"] = { ############### def action_delete_host(request): + validate_api_request(request, ["hostname"]) + hostname = request.get("hostname") if not hostname: - raise MKUserError(None, "Hostname is missing") + raise MKUserError(None, _("Hostname is missing")) return g_api.delete_hosts([hostname]) @@ -106,12 +119,14 @@ api_actions["delete_host"] = { ############### def action_discover_services(request): + validate_api_request(request, ["hostname"]) + mode = html.var("mode") and html.var("mode") or "new" hostname = request.get("hostname") if not hostname: - raise MKUserError(None, "Hostname is missing") + raise MKUserError(None, _("Hostname is missing")) return g_api.discover_services(hostname, mode = mode) @@ -123,6 +138,8 @@ api_actions["discover_services"] = { ############### def action_activate_changes(request): + validate_api_request(request, ["sites"]) + mode = html.var("mode") and html.var("mode") or "dirty" if html.var("allow_foreign_changes"): allow_foreign_changes = bool(int(html.var("allow_foreign_changes")))

8 years, 8 months

added graph definitions for jolokia_metrics.perm_gen

by Simon Betz

Module: check_mk Branch: master Commit: 4d9295a015ef0bba49b93543d00284c82a1b07c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d9295a015ef0b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 11 09:57:11 2015 +0100 added graph definitions for jolokia_metrics.perm_gen --- web/plugins/metrics/check_mk.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fd27aa4..7fe20e2 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5602,3 +5602,14 @@ graph_info.append({ ( "rta", "line" ), ], }) + +graph_info.append({ + "metrics" : [ + ( "mem_perm_used", "area" ) + ], + "scalars" : [ + "mem_perm_used:warn", + "mem_perm_used:crit", + ], + "range" : (0, "mem_perm_used:max") +})

8 years, 8 months

The LDAP synchronization of Check_MK could already synchronize emails addresses

by Lars Michelsen

Module: check_mk Branch: master Commit: 699b76ffae8040863b5690303736ca62385f2cc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=699b76ffae8040… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 09:39:10 2015 +0100 The LDAP synchronization of Check_MK could already synchronize emails addresses containing special characters like umlauts. But this was not supported by the GUI, notification engine and core. This has been fixed now. Conflicts: ChangeLog modules/check_mk.py --- .werks/2759 | 12 ++++++++++++ ChangeLog | 1 + modules/check_mk.py | 1 + modules/nagios.py | 4 ++-- notifications/asciimail | 2 +- notifications/mail | 2 +- web/htdocs/valuespec.py | 13 +++++++++++++ web/htdocs/wato.py | 16 +++++++++++----- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.werks/2759 b/.werks/2759 new file mode 100644 index 0000000..7c748fd --- /dev/null +++ b/.werks/2759 @@ -0,0 +1,12 @@ +Title: Allowing Emails to contain special characters like umlauts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447230555 + +The LDAP synchronization of Check_MK could already synchronize emails addresses +containing special characters like umlauts. But this was not supported by the +GUI, notification engine and core. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index fe911f9..1a7a075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 2718 FIX: Fixed agent timeouts not resulting in a crash report anympore... * 2724 FIX: Discovery check: Fixed exception in simulation mode when no cache file present * 2756 FIX: SNMP: Generalized error handling of emtpy info for SNMP checks... + * 2759 FIX: Allowing Emails to contain special characters like umlauts... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index 6ed4325..1dc78fa 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2201,6 +2201,7 @@ def do_update_dns_cache(): return updated, failed + def agent_port_of(hostname): ports = host_extra_conf(hostname, agent_ports) if len(ports) == 0: diff --git a/modules/nagios.py b/modules/nagios.py index 7f51276..fa45388 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -848,11 +848,11 @@ def create_nagios_config_contacts(outfile, hostnames): if not cgrs: continue - outfile.write("define contact {\n contact_name\t\t\t%s\n" % cname) + outfile.write("define contact {\n contact_name\t\t\t%s\n" % make_utf8(cname)) if "alias" in contact: outfile.write(" alias\t\t\t\t%s\n" % make_utf8(contact["alias"])) if "email" in contact: - outfile.write(" email\t\t\t\t%s\n" % contact["email"]) + outfile.write(" email\t\t\t\t%s\n" % make_utf8(contact["email"])) if "pager" in contact: outfile.write(" pager\t\t\t\t%s\n" % contact["pager"]) if enable_rulebased_notifications: diff --git a/notifications/asciimail b/notifications/asciimail index 5d6b203..8ae5a53 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -87,7 +87,7 @@ def send_mail(m, target, from_address): cmd = ["/usr/sbin/sendmail"] if from_address: cmd += ['-f', from_address] - cmd += [ "-i", target] + cmd += [ "-i", target.encode("utf-8")] p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) diff --git a/notifications/mail b/notifications/mail index 3ceb71b..6de3ca0 100755 --- a/notifications/mail +++ b/notifications/mail @@ -404,7 +404,7 @@ def send_mail(m, target, from_address): cmd = ["/usr/sbin/sendmail"] if from_address: cmd += ['-f', from_address] - cmd += [ "-i", target] + cmd += [ "-i", target.encode("utf-8")] try: p = subprocess.Popen(cmd, stdin = subprocess.PIPE) except OSError: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c3617da..6992d39 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -514,6 +514,7 @@ class RegExpUnicode(TextUnicode, RegExp): RegExp.validate_value(self, value, varprefix) ValueSpec.custom_validate(self, value, varprefix) + class EmailAddress(TextAscii): def __init__(self, **kwargs): kwargs.setdefault("size", 40) @@ -533,6 +534,18 @@ class EmailAddress(TextAscii): return value +class EmailAddressUnicode(TextUnicode, EmailAddress): + def __init__(self, **kwargs): + TextUnicode.__init__(self, **kwargs) + EmailAddress.__init__(self, **kwargs) + self._regex = re.compile(r'^[\w._%+-]+(a)(localhost|[\w.-]+\.[\w]{2,24})$', re.I | re.UNICODE) + + def validate_value(self, value, varprefix): + TextUnicode.validate_value(self, value, varprefix) + EmailAddress.validate_value(self, value, varprefix) + ValueSpec.custom_validate(self, value, varprefix) + + # Network as used in routing configuration, such as # "10.0.0.0/8" or "192.168.56.1" class IPv4Network(TextAscii): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 38ef972..1c597b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12876,6 +12876,8 @@ def mode_edit_user(phase): else: vs_user_id = FixedValue(userid) + vs_email = EmailAddressUnicode() + # Returns true if an attribute is locked and should be read only. Is only # checked when modifying an existing user locked_attributes = userdb.locked_attributes(user.get('connector')) @@ -12977,10 +12979,8 @@ def mode_edit_user(phase): new_user['serial'] = new_user.get('serial', 0) + 1 # Email address - email = html.var("email", '').strip() - regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.+%]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$-znba55ab8jc' - if email and not re.match(regex_email, email): - raise MKUserError("email", _("'%s' is not a valid email address." % email)) + email = vs_email.from_html_vars("email") + vs_email.validate_value(email, "email") new_user["email"] = email # Pager @@ -13084,7 +13084,13 @@ def mode_edit_user(phase): # Email address forms.section(_("Email address")) - lockable_input('email', '') + email = user.get("email", "") + if not is_locked("email"): + vs_email.render_input("email", email) + else: + html.write(email) + html.hidden_field("email", email) + html.help(_("The email address is optional and is needed " "if the user is a monitoring contact and receives notifications " "via Email."))

8 years, 8 months

#2702 FIX oracle_diva_csm: fixed handling of empty sublists

by Simon Betz

Module: check_mk Branch: master Commit: 6103146e109e1b13e1f5287a3c59bca0257cb58b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6103146e109e1b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 10 16:39:32 2015 +0100 #2702 FIX oracle_diva_csm: fixed handling of empty sublists --- .werks/2702 | 9 +++++++++ ChangeLog | 1 + checks/oracle_diva_csm | 6 ++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2702 b/.werks/2702 new file mode 100644 index 0000000..bd791ea --- /dev/null +++ b/.werks/2702 @@ -0,0 +1,9 @@ +Title: oracle_diva_csm: fixed handling of empty sublists +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447169914 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 515645a..fe911f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 2783 FIX: esx_vsphere_datastores: fixed crash when no provisioning levels were set * 2700 FIX: ibm_svc_node: fixed handling with agent output after firmware update * 2701 FIX: zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems... + * 2702 FIX: oracle_diva_csm: fixed handling of empty sublists Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/oracle_diva_csm b/checks/oracle_diva_csm index bb73d4e..db65427 100644 --- a/checks/oracle_diva_csm +++ b/checks/oracle_diva_csm @@ -141,7 +141,8 @@ check_info['oracle_diva_csm.archive'] = { def inventory_oracle_diva_csm_objects(info): - yield None, None + if len(info) > 4 and len(info[4]) > 0: + yield None, None def check_oracle_diva_csm_objects(item, params, info): @@ -179,7 +180,8 @@ oracle_diva_csm_tapes_default_levels = (5, 1) # number of remaining blank def inventory_oracle_diva_csm_tapes(info): - yield None, 'oracle_diva_csm_tapes_default_levels' + if len(info) > 5 and len(info[5]) > 0 and len(info[5][0]) > 0: + yield None, 'oracle_diva_csm_tapes_default_levels' def check_oracle_diva_csm_tapes(item, params, info):

8 years, 8 months

Process perfdata even when one value failed to be parsed, skip only the affected value

by Lars Michelsen

Module: check_mk Branch: master Commit: 06e0db9a84610123af4f95c709943051ec73adac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06e0db9a846101… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 10 15:49:43 2015 +0100 Process perfdata even when one value failed to be parsed, skip only the affected value --- web/htdocs/metrics.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 98b2a84..2f9595d 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -306,9 +306,9 @@ def parse_perf_data(perf_data_string, check_command=None): return x in [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' ] # Parse performance data, at least try - try: - perf_data = [] - for part in parts: + perf_data = [] + for part in parts: + try: varname, values = part.split("=", 1) varname = varname.replace("\"", "").replace("\'", "") value_parts = values.split(";") @@ -325,10 +325,10 @@ def parse_perf_data(perf_data_string, check_command=None): unit_name = value_text[i:] value = value_text[:i] perf_data.append((varname, value, unit_name, warn, crit, min, max)) - except: - if config.debug: - raise - perf_data = None + except: + if config.debug: + raise + perf_data = None return perf_data, check_command

8 years, 8 months

Made perfdata split work with python<2.5

by Lars Michelsen

Module: check_mk Branch: master Commit: e5946d15e3c21022c0499c83938fc92fd5ebb2c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5946d15e3c210… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 10 15:37:49 2015 +0100 Made perfdata split work with python<2.5 --- web/htdocs/metrics.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 3bca3e0..98b2a84 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -275,6 +275,13 @@ def mix_colors(a, b): # | Parsing of performance data into metrics, evaluation of expressions | # '----------------------------------------------------------------------' + +def split_perf_data(perf_data_string): + # In python < 2.5 shlex.split can not deal with unicode strings. But we always + # have unicode strings. So encode and decode again. + return map(lambda s: s.decode('utf-8'), shlex.split(perf_data_string.encode('utf-8'))) + + # Convert perf_data_string into perf_data, extract check_command def parse_perf_data(perf_data_string, check_command=None): # Strip away arguments like in "check_http!-H mathias-kettner.de" @@ -285,7 +292,7 @@ def parse_perf_data(perf_data_string, check_command=None): return None, check_command # Split the perf data string into parts. Preserve quoted strings! - parts = shlex.split(perf_data_string) + parts = split_perf_data(perf_data_string) # Try if check command is appended to performance data # in a PNP like style

8 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015