Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed inventory section of man page

by Goetz Golla

Module: check_mk Branch: master Commit: e955d4782d95f75e62819975b0dd7f9eddf3d4ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e955d4782d95f7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 08:35:38 2015 +0100 Fixed inventory section of man page --- checkman/domino_users | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checkman/domino_users b/checkman/domino_users index 5d69d70..84f1c95 100644 --- a/checkman/domino_users +++ b/checkman/domino_users @@ -10,6 +10,9 @@ description: perfdata: The number of users +inventory: + One check per Lotus Domino Server is created. + [parameters] parameters(tuple): parameters is a tuple of two values

9 years, 8 months

Check_MK Git: check_mk: multipath: fix recent error with undefined "regex" variable

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a9207ca6741f40fe1f4d9a80ec7d146d198c92b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a9207ca6741f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 8 17:58:55 2015 +0100 multipath: fix recent error with undefined "regex" variable --- checks/multipath | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/multipath b/checks/multipath index f3b0f95..b212b83 100644 --- a/checks/multipath +++ b/checks/multipath @@ -202,8 +202,8 @@ def parse_multipath(info): if line[0][0] not in [ '[', '`', '|', '\\' ] and not line[0].startswith("size="): # Try to match header lines matchobject = None - for regex, uuid_pos, alias_pos, dm_pos in reg_headers: - matchobject = regex.search(l) + for header_regex, uuid_pos, alias_pos, dm_pos in reg_headers: + matchobject = header_regex.search(l) if matchobject: uuid = matchobject.group(uuid_pos).strip()

9 years, 8 months

Check_MK Git: check_mk: Added missing encoding bugfix when rendering select fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d7ae2b1bd921f1ae759e595fc1ae235d5ad1e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7ae2b1bd921f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 8 15:03:09 2015 +0100 Added missing encoding bugfix when rendering select fields --- web/htdocs/htmllib.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6fc7da5..f147269 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -557,8 +557,6 @@ class html: for value, text in choices: if value == None: value = "" - elif type(value) == unicode: - value = value.encode('utf-8') sel = value == current and " selected" or "" self.write("<option value=\"%s\"%s>%s</option>\n" % (self.attrencode(value), sel, self.attrencode(text)))

9 years, 8 months

Check_MK Git: check_mk: Fixed handling of some livestatus exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: eae2141587a4a5e9a205be77c4d0bdd597af74fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae2141587a4a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 8 14:50:32 2015 +0100 Fixed handling of some livestatus exceptions --- web/htdocs/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3963157..90bba75 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -243,10 +243,10 @@ def handler(req, fields = None, profiling = True): except (MKUserError, MKAuthException, MKUnauthenticatedException, MKConfigError, MKGeneralException, livestatus.MKLivestatusNotFoundError, livestatus.MKLivestatusException), e: ty = type(e) - if ty ==livestatus.MKLivestatusNotFoundError: + if ty == livestatus.MKLivestatusNotFoundError: title = _("Data not found") plain_title = _("Livestatus-data not found") - elif ty ==livestatus.MKLivestatusException: + elif isinstance(e, livestatus.MKLivestatusException): title = _("Livestatus problem") plain_title = _("Livestatus problem") else:

9 years, 8 months

Check_MK Git: check_mk: Removed obsolete code

by Mathias Kettner

Module: check_mk Branch: master Commit: 253b8e67fb07ca741f05729202022e19b15dffe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=253b8e67fb07ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 8 12:14:20 2015 +0100 Removed obsolete code --- checks/windows_multipath | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checks/windows_multipath b/checks/windows_multipath index e5ce636..f5a1936 100644 --- a/checks/windows_multipath +++ b/checks/windows_multipath @@ -51,14 +51,9 @@ def check_windows_multipath(item, params, info): elif num_paths < all_paths: state = 1 - return (state, "paths reported %d, expected paths %d" % (num_paths, all_paths) + state * "!") - - return (3, "Data not in agent output") - - check_info["windows_multipath"] = { "check_function" : check_windows_multipath, "inventory_function" : inventory_windows_multipath,

9 years, 8 months

Check_MK Git: check_mk: Added comment to cpu_load.include

by Mathias Kettner

Module: check_mk Branch: master Commit: 7bacebf885d83a786b5e2e318ec28a477f64bf1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bacebf885d83a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 8 11:54:18 2015 +0100 Added comment to cpu_load.include --- checks/cpu_load.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index 01e998e..ac92a9f 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -29,6 +29,8 @@ # of processes in the running state (on some systems, like Linux, # also Disk wait is account for the load). +# load is a triple of three floats: average load of +# the last 1, 5 or 15 minutes def check_cpu_load_generic(params, load, num_cpus=1): # Prepare performance data

9 years, 8 months

Check_MK Git: check_mk: Internal cleanup: Clarified encoded/

by Lars Michelsen

unencoded HTML handling within multisite code a bit more Message-ID: <54ad5aa8.Lx/UxCJX1yNBjK2Z%lm(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: 24d85b37230239997f86135c2bef81c5b756eb3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24d85b37230239… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 7 17:10:29 2015 +0100 Internal cleanup: Clarified encoded/unencoded HTML handling within multisite code a bit more --- web/htdocs/dashboard.py | 4 +--- web/htdocs/htmllib.py | 26 +++++++++++++++++++++++++- web/htdocs/notify.py | 16 ++++++++-------- web/htdocs/visuals.py | 4 +--- web/htdocs/wato.py | 17 ++++++----------- 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a58367b..106d1e8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1034,9 +1034,7 @@ def page_edit_dashlet(): visuals.render_context_specs(dashlet, context_specs) forms.end() - url = "wato.py?mode=edit_configvar&varname=user_localizations" - html.message("<sup>*</sup>" + _("These texts may be localized depending on the users' " - "language. You can configure the localizations <a href=\"%s\">in the global settings</a>.") % url) + html.show_localization_hint() html.button("save", _("Save")) html.hidden_fields() html.end_form() diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4b29b9d..6fc7da5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -36,6 +36,8 @@ # # - Fix names of message() show_error() show_warning() # +# - change naming of html.attrencode() to html.render() +# # - General rules: # 1. values of type str that are passed as arguments or # return values or are stored in datastructures most not contain @@ -44,7 +46,7 @@ # input to str or unicode must happen as early as possible, # directly when reading from file or URL. -import time, os, pwd, urllib, random, re +import time, os, pwd, urllib, random, re, __builtin__ from lib import * # Python 2.3 does not have 'set' in normal namespace. @@ -63,6 +65,19 @@ class InvalidUserInput(Exception): self.varname = varname self.text = text +# This is a simple class which wraps a string provided by the caller +# to make html.attrencode() know that this string should not be +# encoded, html.attrencode() will then return the unmodified value. +# +# This way we can implement encodings while still allowing HTML code +# processing for some special cases. This is useful when one needs +# to print out HTML tables in messages or help texts. +class HTML: + def __init__(self, value): + self.value = value + +__builtin__.HTML = HTML + class html: def __init__(self): self.user_errors = {} @@ -1002,6 +1017,13 @@ class html: else: self.write('%s: %s\n' % (prefix, self.strip_tags(msg))) + def show_localization_hint(self): + url = "wato.py?mode=edit_configvar&varname=user_localizations" + self.message(HTML("<sup>*</sup>" + + _("These texts may be localized depending on the users' " + "language. You can configure the localizations " + "<a href=\"%s\">in the global settings</a>.") % url)) + # Embed help box, whose visibility is controlled by a global # button in the page. def help(self, text): @@ -1285,6 +1307,8 @@ class html: ty = type(value) if ty == int: return str(value) + elif isinstance(value, HTML): + return value.value # This is HTML code which must not be escaped elif ty not in [str, unicode]: # also possible: type Exception! value = "%s" % value # Note: this allows Unicode. value might not have type str now diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index eb3cb62..4d9f88f 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -212,7 +212,7 @@ def page_notify(): handler(user_id, msg) num_success[method] = num_success[method] + 1 except MKInternalError, e: - errors.setdefault(method, []).append( (user_id, e) ) + errors.setdefault(method, []).append((user_id, e)) message = _('The notification has been sent via<br>') message += "<table>" @@ -221,19 +221,19 @@ def page_notify(): (notify_methods[method]["title"], num_success[method], num_recipients) message += "</table>" - message += ' <a href="%s">%s</a>' % (html.makeuri([]), _('Back to previous page')) message += _('<p>Sent notification to: %s</p>') % ', '.join(recipients) - html.message(message) + message += '<a href="%s">%s</a>' % (html.makeuri([]), _('Back to previous page')) + html.message(HTML(message)) if errors: error_message = "" - for key, values in errors.items(): - error_message += _("Failed to sent %s notifications to the following users") % key + for method, method_errors in errors.items(): + error_message += _("Failed to send %s notifications to the following users:") % method error_message += "<table>" - for user, error in values: - error_message += "<tr><td>%s</td><td>%s</td></tr>" % (user, error ) + for user, exception in method_errors: + error_message += "<tr><td><tt>%s</tt></td><td>%s</td></tr>" % (user, html.attrencode(exception)) error_message += "</table><br>" - html.show_error(error_message) + html.show_error(HTML(error_message)) html.footer() diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4972117..e35205e 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -730,9 +730,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, render_context_specs(visual, context_specs) forms.end() - url = "wato.py?mode=edit_configvar&varname=user_localizations" - html.message("<sup>*</sup>" + _("These texts may be localized depending on the users' " - "language. You can configure the localizations <a href=\"%s\">in the global settings</a>.") % url) + html.show_localization_hint() html.button("save", _("Save")) for nr, (title, pagename, icon) in enumerate(sub_pages): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cea3a10..2609339 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -962,7 +962,7 @@ def mode_folder(phase): render_folder_path() if not auth_read: - html.message('<img class=authicon src="images/icon_autherr.png"> %s' % auth_message) + html.message(HTML('<img class=authicon src="images/icon_autherr.png"> %s' % html.attrencode(auth_message))) lock_messages = [] if g_folder.get(".lock_hosts"): @@ -7238,7 +7238,7 @@ def mode_ldap_config(phase): html.write('<h2>' + _('Diagnostics') + '</h2>') if not html.var('_test'): - html.message('<p>%s</p><p>%s</p>' % + html.message(HTML('<p>%s</p><p>%s</p>' % (_('You can verify the single parts of your ldap configuration using this ' 'dialog. Simply make your configuration in the form on the left side and ' 'hit the "Save & Test" button to execute the tests. After ' @@ -7246,7 +7246,7 @@ def mode_ldap_config(phase): _('If you need help during configuration or experience problems, please refer ' 'to the Multisite <a target="_blank" ' 'href="http://mathias-kettner.de/checkmk_multisite_ldap_integration.html">' - 'LDAP Documentation</a>.'))) + 'LDAP Documentation</a>.')))) else: def test_connect(address): conn, msg = userdb.ldap_connect_server(address) @@ -12972,7 +12972,7 @@ def mode_edit_auxtag(phase): # Button and end forms.end() - show_localization_hint() + html.show_localization_hint() html.button("save", _("Save")) html.hidden_fields() html.end_form() @@ -13216,17 +13216,12 @@ def mode_edit_hosttag(phase): # Button and end forms.end() - show_localization_hint() + html.show_localization_hint() html.button("save", _("Save")) html.hidden_fields() html.end_form() -def show_localization_hint(): - url = "wato.py?mode=edit_configvar&varname=user_localizations" - html.message("<sup>*</sup>" + _("These texts may be localized depending on the users' " - "language. You can configure the localizations <a href=\"%s\">in the global settings</a>.") % url) - def format_php(data, lvl = 1): s = '' if isinstance(data, tuple) or isinstance(data, list): @@ -17330,7 +17325,7 @@ def mode_edit_custom_attr(phase, what): html.checkbox('add_custom_macro', attr.get('add_custom_macro', False)) forms.end() - show_localization_hint() + html.show_localization_hint() html.button("save", _("Save")) html.hidden_fields() html.end_form()

9 years, 8 months

Check_MK Git: check_mk: #1833 FIX jolokia_metrics.gc: fix recently introduced exception for missing variable

by Mathias Kettner

Module: check_mk Branch: master Commit: 55f77428509ebbf791b92ac56a3cbd57c1fc48de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55f77428509ebb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 7 14:38:57 2015 +0100 #1833 FIX jolokia_metrics.gc: fix recently introduced exception for missing variable --- .werks/1833 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/1833 b/.werks/1833 new file mode 100644 index 0000000..2e7d1c4 --- /dev/null +++ b/.werks/1833 @@ -0,0 +1,10 @@ +Title: jolokia_metrics.gc: fix recently introduced exception for missing variable +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420637894 + + diff --git a/ChangeLog b/ChangeLog index e984ca9..9ec4077 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 1818 FIX: dell_poweredge_cpu: Fix exception where BrandName is missing * 1819 FIX: dell_poweredge_temp: Make output and service description consistent with other temperature checks... NOTE: Please refer to the migration notes! + * 1833 FIX: jolokia_metrics.gc: fix recently introduced exception for missing variable Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index f5ef8c9..3485144 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -531,10 +531,10 @@ def check_jolokia_metrics_gc(item, params, info): status = 0 perf = [] - ttrate = get_rate("jvm.gc.time.%s" % (item), \ - time.time(), saveint(gc['CollectionTime'])) - ccrate = get_rate("jvm.gc.count.%s" % (item), \ - time.time(), saveint(gc['CollectionCount'])) + trate = get_rate("jvm.gc.time.%s" % (item), \ + time.time(), saveint(gc['CollectionTime'])) + crate = get_rate("jvm.gc.count.%s" % (item), \ + time.time(), saveint(gc['CollectionCount'])) trate = trate * 60.0 crate = crate * 60.0

9 years, 8 months

Check_MK Git: check_mk: #1832 FIX Fix "global name 'splitted'

by Mathias Kettner

is not defined" in bulk inventory Message-ID: <54ad2e77.beZbQeoqCTaNTXv4%mk(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: 32c07451489e71e645679ac2a0f8d2200d906953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32c07451489e71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 7 14:02:06 2015 +0100 #1832 FIX Fix "global name 'splitted' is not defined" in bulk inventory This happened in case of an unimplemented check. --- .werks/1832 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1832 b/.werks/1832 new file mode 100644 index 0000000..58a0488 --- /dev/null +++ b/.werks/1832 @@ -0,0 +1,10 @@ +Title: Fix "global name 'splitted' is not defined" in bulk inventory +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420635662 + +This happened in case of an unimplemented check. diff --git a/ChangeLog b/ChangeLog index 1f7f9fa..e984ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created... * 1792 FIX: Fix path to special agents in case of manual installation * 1797 FIX: Fix incomplete configuration during checking when using CMC... + * 1832 FIX: Fix "global name 'splitted' is not defined" in bulk inventory... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 8d577db..875a1ef 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3081,7 +3081,7 @@ def remove_autochecks_of(hostname, checktypes = None): # None = all else: removed += 1 if ct not in check_info: - sys.stderr.write('Removing unimplemented check %s.\n' % splitted[3]) + sys.stderr.write('Removing unimplemented check %s.\n' % ct) if len(kept_lines) == 0: if opt_verbose:

9 years, 8 months

Check_MK Git: check_mk: Cleaned up cmk --snmpwalk code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: c593838683907194c4ff9021d010ceef3ad48cde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5938386839071… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 7 14:02:20 2015 +0100 Cleaned up cmk --snmpwalk code a bit --- modules/check_mk.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a43cb60..8d577db 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4352,13 +4352,14 @@ def output_plain_hostinfo(hostname): sys.stdout.write(get_piggyback_info(hostname)) -def do_snmptranslate(walk): - walk = walk[0] +def do_snmptranslate(args): + if not args: + raise MKGeneralException("Please provide the name of a SNMP walk file") + walk_filename = args[0] - path_walk = "%s/%s" % (snmpwalks_dir, walk) - if not os.path.exists(path_walk): - print "Walk does not exist" - return + walk_path = "%s/%s" % (snmpwalks_dir, walk_filename) + if not os.path.exists(walk_path): + raise MKGeneralException("Walk does not exist") def translate(lines): result_lines = [] @@ -4387,7 +4388,7 @@ def do_snmptranslate(walk): entries_per_cycle = 500 translated_lines = [] - walk_lines = file(path_walk).readlines() + walk_lines = file(walk_path).readlines() sys.stderr.write("Processing %d lines.\n" % len(walk_lines)) i = 0

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015