Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3441 FIX ps: Added missing graph for number of processes

by Lars Michelsen

Module: check_mk Branch: master Commit: b564406d911541dcb3052ce135e4c5cdf9923a41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b564406d911541… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 11:36:21 2016 +0200 3441 FIX ps: Added missing graph for number of processes --- .werks/3441 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/3441 b/.werks/3441 new file mode 100644 index 0000000..56f4f4a --- /dev/null +++ b/.werks/3441 @@ -0,0 +1,10 @@ +Title: ps: Added missing graph for number of processes +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461749769 + + diff --git a/ChangeLog b/ChangeLog index 8852cec..d54f426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -190,6 +190,7 @@ * 3465 FIX: df: Fix displayed vertical range of graph of all filesystem checks... * 3427 FIX: mssql_counters.sqlstats: fixed rate calculation * 3438 FIX: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported + * 3441 FIX: ps: Added missing graph for number of processes Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f49bb73..ad3acc4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6099,6 +6099,13 @@ graph_info.append({ }) graph_info.append({ + "title" : _("Number of processes"), + "metrics" : [ + ( "processes", "area" ), + ] +}) + +graph_info.append({ "title" : _("Size of processes"), "metrics" : [ ( "process_resident_size", "area" ),

8 years, 2 months

3440 FIX Fixed possible BI exception "Unknown BI aggregation group ..."

by Lars Michelsen

Module: check_mk Branch: master Commit: a17e41f76e14d8d0dc25cda9b36b86aaf8b52e7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17e41f76e14d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 11:23:48 2016 +0200 3440 FIX Fixed possible BI exception "Unknown BI aggregation group ..." An exception has been fixed which could occur when using "multi host" aggregations together with the "precompile on demand" feature. It could happen that a BI ajax fold/unfold request was the first BI request in an apache process which had not yet initialized the BI cache yet. --- .werks/3440 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 7 +------ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.werks/3440 b/.werks/3440 new file mode 100644 index 0000000..f8ce205 --- /dev/null +++ b/.werks/3440 @@ -0,0 +1,13 @@ +Title: Fixed possible BI exception "Unknown BI aggregation group ..." +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461748936 + +An exception has been fixed which could occur when using "multi host" aggregations +together with the "precompile on demand" feature. It could happen that a BI ajax +fold/unfold request was the first BI request in an apache process which had not +yet initialized the BI cache yet. diff --git a/ChangeLog b/ChangeLog index f1c3f66..8852cec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -333,6 +333,7 @@ * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled * 3439 FIX: Fixed processing of BI aggregations containing umlauts + * 3440 FIX: Fixed possible BI exception "Unknown BI aggregation group ..."... Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 546e12b..b5d8c34 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -303,12 +303,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): num_new_host_aggrs = 0 num_new_multi_aggrs = 0 - # When only_hosts is given only use the single host aggregations for further processing. - # The only_hosts variable is only populated for single host tables. - if only_hosts: - aggr_list = [(AGGR_HOST, config.host_aggregations)] - else: - aggr_list = [(AGGR_MULTI, config.aggregations), (AGGR_HOST, config.host_aggregations)] + aggr_list = [(AGGR_MULTI, config.aggregations), (AGGR_HOST, config.host_aggregations)] single_affected_hosts = [] for aggr_type, aggregations in aggr_list:

8 years, 2 months

Fixed processing of BI aggregations containing umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: c1bb6da00f83d442c632f4e9e280d1910170b9e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1bb6da00f83d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 11:15:46 2016 +0200 Fixed processing of BI aggregations containing umlauts --- web/htdocs/bi.py | 2 +- web/plugins/visuals/bi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index dc935d9..546e12b 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -498,7 +498,7 @@ def compile_rule_node(aggr_type, calllist, lvl): if rulename not in config.aggregation_rules: raise MKConfigError(_("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>") % - (rulename, "</tt>, </tt>".join(config.aggregation_rules.keys()))) + (rulename, "</tt>, <tt>".join(config.aggregation_rules.keys()))) rule = config.aggregation_rules[rulename] # Execute FOREACH: iterate over matching hosts/services. diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index d565093..6bc8cdd 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -39,7 +39,7 @@ class BIGroupFilter(Filter): html.select(htmlvar, [ ("", "") ] + [(g, g) for g in bi.aggregation_groups()]) def selected_group(self): - return html.var(self.htmlvars[0]) + return html.get_unicode_input(self.htmlvars[0]) def filter_table(self, rows): group = self.selected_group() @@ -49,7 +49,7 @@ class BIGroupFilter(Filter): return [ row for row in rows if row[self.column] == group ] def heading_info(self): - return html.var(self.htmlvars[0]) + return html.get_unicode_input(self.htmlvars[0]) declare_filter( 90, BIGroupFilter())

8 years, 2 months

3439 FIX Fixed processing of BI aggregations containing umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e8e5eedab03ff0db43d73630558e92f649adf2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e8e5eedab03ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 11:16:00 2016 +0200 3439 FIX Fixed processing of BI aggregations containing umlauts --- .werks/3439 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3439 b/.werks/3439 new file mode 100644 index 0000000..9e9667e --- /dev/null +++ b/.werks/3439 @@ -0,0 +1,10 @@ +Title: Fixed processing of BI aggregations containing umlauts +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461748551 + + diff --git a/ChangeLog b/ChangeLog index ce16822..f1c3f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -332,6 +332,7 @@ * 3232 FIX: BI: Only querying site of host for specific host status info... * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled + * 3439 FIX: Fixed processing of BI aggregations containing umlauts Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"...

8 years, 2 months

pylint can now be called from cmk git base directory manually too

by Lars Michelsen

Module: check_mk Branch: master Commit: 713a04c9c1e8a1ce0135391bfcdb837a6c88e4b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=713a04c9c1e8a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 07:40:07 2016 +0200 pylint can now be called from cmk git base directory manually too --- agents/plugins/mk_tinkerforge | 2 ++ pylint/pylintrc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_tinkerforge b/agents/plugins/mk_tinkerforge index 8bfbd1c..7eb8a17 100755 --- a/agents/plugins/mk_tinkerforge +++ b/agents/plugins/mk_tinkerforge @@ -60,6 +60,8 @@ # Currently the bricklets included in the Starter Kit: Server Room Monitoring are # implemented +# Don't have tinkerforge module during tests. So disable those checks +# pylint: disable=import-error import sys import os diff --git a/pylint/pylintrc b/pylint/pylintrc index ba825cf..63f9a2b 100644 --- a/pylint/pylintrc +++ b/pylint/pylintrc @@ -1,6 +1,6 @@ [MASTER] # Use the OMD default version lib dir to add the mod_python modules -init-hook='import sys; sys.path.insert(0, os.environ.get("PYLINT_PATH"))' +init-hook='import sys; sys.path = [ ".", os.environ.get("PYLINT_PATH", "pylint") ] + sys.path' load-plugins=pylint_cmk persistent=yes # We only want to see errors for the moment. Disable this one day. But prepare to cleanup a lot of stuff.

8 years, 2 months

pylint: Disable import error checking for python <2.5 compat code

by Lars Michelsen

Module: check_mk Branch: master Commit: f16a9fabdb2bccd72943624eb3639b07000bc4e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f16a9fabdb2bcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 17:54:57 2016 +0200 pylint: Disable import error checking for python <2.5 compat code --- notifications/mail | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/notifications/mail b/notifications/mail index 015902a..0c01952 100755 --- a/notifications/mail +++ b/notifications/mail @@ -47,6 +47,7 @@ try: from email.mime.image import MIMEImage except ImportError: # python <2.5 compat + # pylint: disable=no-name-in-module,import-error from email.MIMEMultipart import MIMEMultipart from email.MIMEText import MIMEText from email.MIMEImage import MIMEImage @@ -392,7 +393,7 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content part = MIMEApplication(contents, name = name) else: # python <2.5 compat - part = MimeBase('application', 'octet-stream') + part = MimeBase('application', 'octet-stream') # pylint: disable=undefined-variable part.set_payload(contents) Encoders.encode_base64(part)

8 years, 2 months

3438 FIX mk_mongodb: Fixed agent plugin handling when pymongo can not be imported

by Lars Michelsen

Module: check_mk Branch: master Commit: 77ec204e0f9af130032358fd2272a668ad3c35e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ec204e0f9af1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 17:52:40 2016 +0200 3438 FIX mk_mongodb: Fixed agent plugin handling when pymongo can not be imported --- .werks/3438 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_mongodb | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3438 b/.werks/3438 new file mode 100644 index 0000000..374ab85 --- /dev/null +++ b/.werks/3438 @@ -0,0 +1,10 @@ +Title: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461685910 + + diff --git a/ChangeLog b/ChangeLog index d6f5372..ce16822 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,7 @@ * 3425 FIX: Fixed extra section handling if no related check plugin exists * 3465 FIX: df: Fix displayed vertical range of graph of all filesystem checks... * 3427 FIX: mssql_counters.sqlstats: fixed rate calculation + * 3438 FIX: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index a61e8ad..0a70d0a 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -20,7 +20,7 @@ import datetime try: import pymongo except ImportError, e: - sys.stderr("unable to import pymongo") + sys.stderr.write("ERROR: Unable to import pymongo module\n") sys.exit(2) # TODO: might be implemented in the future..

8 years, 2 months

Fixed some typos

by Mathias Kettner

Module: check_mk Branch: master Commit: bfe495208ff6797c5238a7856108e633c6b8e870 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfe495208ff679… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 18:53:22 2016 +0200 Fixed some typos --- web/plugins/metrics/check_mk.py | 4 ++-- web/plugins/views/mkeventd.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 5e31cab..f49bb73 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -209,7 +209,7 @@ unit_info["pa"] = { } unit_info["l/s"] = { - "title" : _("Liter per second"), + "title" : _("Liters per second"), "symbol" : _("l/s"), "render" : lambda v: physical_precision(v, 3, _("l/s")), } @@ -1861,7 +1861,7 @@ metric_info["fc_invalid_tx_words"] = { } metric_info["fc_invalid_crcs"] = { - "title" : _("Invalid crcs"), + "title" : _("Invalid CRCs"), "unit" : "1/s", "color" : "15/a", } diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 135829b..6dbe462 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -749,7 +749,7 @@ if mkeventd_enabled: for action_id, title in mkeventd.action_choices(omit_hidden = True): if html.var("_action_" + action_id): return "ACTION;%s;%s;%s" % (row["event_id"], config.user_id, action_id), \ - (_("execute that action \"%s\"") % title) + (_("execute the action \"%s\"") % title) multisite_commands.append({ "tables" : [ "event" ], diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 98695eb..d5e6c04 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -406,7 +406,7 @@ register_configvar(group, Checkbox( title = _("Enable BI compilation diagnostics"), label = _("Activate logging of BI compilations"), - help = _("If this option is enabled, Check_MK BI will create a log details " + help = _("If this option is enabled, Check_MK BI will create a log with details " "about compiling BI aggregations. This includes statistics and " "details for each executed compilation. The logs are written to " "<tt>%s</tt>") % site_neutral_path(defaults.log_dir + "/web.log"), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ce6a5fc..06001e7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4417,7 +4417,7 @@ register_check_parameters( title = _("Operating speed"), help = _("If you use this parameter then the check goes warning if the " "interface is not operating at the expected speed (e.g. it " - "is working with 8Gbit/s instead of 16Gbit/s."), + "is working with 8Gbit/s instead of 16Gbit/s)."), choices = [ ( None, _("ignore speed") ), ( 4000000000, "4 Gbit/s" ), @@ -7834,7 +7834,7 @@ register_rule( label = _("use alias"), help = _("If a multipath device has an alias then you can use it for specifying " "the device instead of the UUID. The alias will then be part of the service " - "description. The UUID will be displayed in the pluging output.")) + "description. The UUID will be displayed in the plugin output.")) ), ], help = _("This rule controls whether the UUID or the alias is used in the service description during " @@ -11310,7 +11310,7 @@ register_check_parameters( )), ], help = _("This rule is used to configure thresholds for duration values read from " - "Siemens PLC devices."), + "Siemens PLC devices."), title = _("Duration levels"), ), TextAscii(

8 years, 2 months

Improved wording

by Konstantin Büttner

Module: check_mk Branch: master Commit: c0c7926edd132e4ad8332ff8a2b4516fcf63d4fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0c7926edd132e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Apr 26 18:36:30 2016 +0200 Improved wording --- web/plugins/wato/datasource_programs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 730cda7..0a79132 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -456,9 +456,9 @@ register_rule(group, FixedValue( {}, title = _("Check ACME Session Border Controller"), - help = _("This rule activates an expect based agent who connects" + help = _("This rule activates an agent who connects" "to an ACME Session Border Controller (SBC). This agent uses SSH, this" - "means that you have to exchange a SSH key to make a password less" + "means that you have to exchange an SSH key to make a passwordless" "connect possible"), totext = _("Connect to ACME SBC"), ),

8 years, 2 months

Fixed spelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: aa38f2ea5cf9a58bbcf90fafbc89aa42fa82f379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa38f2ea5cf9a5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Apr 26 17:42:29 2016 +0200 Fixed spelling --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 41a601c..59649c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7006,7 +7006,7 @@ def vs_notification_rule(userid = None): ), RegExp( title = _("Required match (regular expression)"), - help = _("This expression must complete match the value of the variable"), + help = _("This expression must match the value of the variable"), allow_empty = False, ), ]

8 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016