Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 7949ac833fd48fc2f0ee9497c4fbd90382275ae5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7949ac833fd48f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 11:34:34 2018 +0200 Reserved 20 Werk IDS Change-Id: Ie60336ed9bbff2a8c6c8dfae041f16f766708118 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 385e1b5..26aa63a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6089 +6109

6 years, 4 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: c87617ace1b83ae82941a9be80ce06e225a5a52a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c87617ace1b83a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 14 10:53:50 2018 +0200 Minor cleanup Change-Id: Ifad007c254455cdc67a989665440a4d9ee654219 --- checks/postgres_sessions | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/postgres_sessions b/checks/postgres_sessions index ac7283e..50ea51a 100644 --- a/checks/postgres_sessions +++ b/checks/postgres_sessions @@ -45,7 +45,10 @@ def parse_postgres_sessions(info): if line[0].startswith("[[[") and line[0].endswith("]]]"): instance_name = line[0][3:-3].upper() continue - instance = parsed.setdefault(instance_name, {}) + instance = parsed.setdefault(instance_name, { + "total": 0, + "running": 0, + }) if line[0].startswith("t"): instance["total"] = int(line[1]) elif line[0].startswith("f"): @@ -65,8 +68,8 @@ def check_postgres_sessions(item, params, parsed): raise MKCounterWrapped("Login into database failed") data = parsed[item] - idle = data.get('total', 0) - running = data.get('running', 0) + idle = data['total'] + running = data['running'] total = idle + running for key, val in [

6 years, 4 months

Fix bugs in ScaleIO checks and cleanup the checks a bit

by Tom Baerwinkel

Module: check_mk Branch: master Commit: fd30295827bead41acb787a4541a31615fd2e98d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd30295827bead… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Apr 24 16:10:39 2018 +0200 Fix bugs in ScaleIO checks and cleanup the checks a bit Change-Id: I7cea78cd50ceb040655c9c56641c320e4d962bd2 --- agents/plugins/mk_scaleio | 2 +- checks/scaleio.include | 9 ++--- checks/scaleio_mdm | 90 ++++++++++++++++++++++++++----------------- checks/scaleio_pd | 46 ++++++++++++---------- checks/scaleio_sds | 94 +++++++++++++++++++++++++++++++-------------- checks/scaleio_storage_pool | 72 +++++++++++++++++++--------------- checks/scaleio_system | 25 ++++++++---- checks/scaleio_volume | 47 +++++++++++++++-------- 8 files changed, 240 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fd30295827…

6 years, 4 months

6065 FIX fileinfo.groups: Fixed broken discovery " Invalid output from webservice (malformed string)"

by Lars Michelsen

Module: check_mk Branch: master Commit: 10f3ef29cb1a7d7aacc43c50c4191a7b8c3527c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10f3ef29cb1a7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 10:01:27 2018 +0200 6065 FIX fileinfo.groups: Fixed broken discovery "Invalid output from webservice (malformed string)" When this check was used to create a grouped file check and rediscovered with 1.5.*, this lead to an error message like "Invalid output from webservice (malformed string)". Change-Id: I965f7ab26d59cc144f0e8aab0bdab576924e2b17 --- .werks/6065 | 12 ++++++++++++ checks/fileinfo | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6065 b/.werks/6065 new file mode 100644 index 0000000..b5c30d3 --- /dev/null +++ b/.werks/6065 @@ -0,0 +1,12 @@ +Title: fileinfo.groups: Fixed broken discovery "Invalid output from webservice (malformed string)" +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526284756 + +When this check was used to create a grouped file check and rediscovered with 1.5.*, this lead +to an error message like "Invalid output from webservice (malformed string)". diff --git a/checks/fileinfo b/checks/fileinfo index 1ddac54..2b743e1 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -103,7 +103,8 @@ def fileinfo_groups_get_group_name(group_patterns, filename, reftime): found_these_groups.setdefault(this_group_name, set()) found_these_groups[this_group_name].add(this_pattern) - return found_these_groups + # Convert pattern containers to lists (sets are not possible in autochecks) + return dict([ (k, list(v)) for k, v in found_these_groups.items() ]) def inventory_fileinfo_common(info, case):

6 years, 4 months

6064 FIX Fixed possible hanging updates from 1.5 versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 85fb3af03546de958fe5f8d764b27468f1b8c3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85fb3af03546de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 09:21:34 2018 +0200 6064 FIX Fixed possible hanging updates from 1.5 versions When the "omd update" is executed as root user for a site, the update might hang in case the default OMD version on the system is a 1.5 version. To workaround this issue you may execute the "omd update" command as site user. Change-Id: I8677df8ff5f8799db735853749f15f4d32f3ac26 --- .werks/6064 | 14 ++++++++++++++ omd/packages/omd/omd | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6064 b/.werks/6064 new file mode 100644 index 0000000..914f8c3 --- /dev/null +++ b/.werks/6064 @@ -0,0 +1,14 @@ +Title: Fixed possible hanging updates from 1.5 versions +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526282366 + +When the "omd update" is executed as root user for a site, the update +might hang in case the default OMD version on the system is a 1.5 version. + +To workaround this issue you may execute the "omd update" command as site user. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index fec9cb0..e16bc09 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -31,7 +31,8 @@ # python libraries. Newer versions unset these variables before, so this # additional execv() is only needed when updating from older versions. import os, sys -if len(sys.argv) > 1 and sys.argv[1] == "update" and sys.version_info[2] != 14: +if len(sys.argv) > 1 and sys.argv[1] == "update" \ + and (sys.version_info[0] == 2 and sys.version_info[1] == 7 and sys.version_info[2] < 14): # Prevent inheriting environment variables from this versions/site environment # into the execed omd call. The OMD call must import the python version related # modules and libaries. This only works when PYTHONPATH and LD_LIBRARY_PATH are

6 years, 4 months

6078 FIX check_mk_agent.openwrt: Fixed invalid syntax in nfsmounts section

by Simon Betz

Module: check_mk Branch: master Commit: 2297dc2fb6a7a9edf117d3bfd8cdd2c485569862 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2297dc2fb6a7a9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 14 09:13:14 2018 +0200 6078 FIX check_mk_agent.openwrt: Fixed invalid syntax in nfsmounts section Change-Id: I472cfdfc20906532cafb8d41edffc84df070430c --- .werks/6078 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6078 b/.werks/6078 new file mode 100644 index 0000000..42ed3bc --- /dev/null +++ b/.werks/6078 @@ -0,0 +1,11 @@ +Title: check_mk_agent.openwrt: Fixed invalid syntax in nfsmounts section +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526281962 + +

6 years, 4 months

5926 FIX Agent Bakery options for WMI and full path with Windows processes

by Jukka Aro

Module: check_mk Branch: master Commit: e2d953f25090183972f5e965ac9e4984751b919f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2d953f2509018… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri May 11 13:30:50 2018 +0200 5926 FIX Agent Bakery options for WMI and full path with Windows processes Werk #2656 added the options to use WMI for retrieving information about process on Windows and to display the full path of the process. These new configuration options were left without the counterpart for configuring them in the Agent Bakery. This deficit is now fixed so that the option use_wmi for the ps section is also configurable through the Agent Bakery. The full path option is now also configurable, nevertheless enabling it only takes effect if use_wmi is also enabled. Change-Id: Ie55c511ccb6ee8fd3cc90c63e14b62c3f07d2928 --- .werks/5926 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/5926 b/.werks/5926 new file mode 100644 index 0000000..98adb2e --- /dev/null +++ b/.werks/5926 @@ -0,0 +1,20 @@ +Title: Agent Bakery options for WMI and full path with Windows processes +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1526037609 +Class: fix + +Werk #2656 added the options to use WMI for retrieving information +about process on Windows and to display the full path of the process. +These new configuration options were left without the counterpart for +configuring them in the Agent Bakery. + +This deficit is now fixed so that the option use_wmi for the ps section +is also configurable through the Agent Bakery. The full path option is +now also configurable, nevertheless enabling it only takes effect if +use_wmi is also enabled. + +

6 years, 4 months

5326 fileinfo.groups: Shows inclusion and exclusion patterns in long output

by Simon Betz

Module: check_mk Branch: master Commit: ea73754541a646d7084c4c8bec76b7c9e6964aaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea73754541a646… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 24 14:09:31 2017 +0200 5326 fileinfo.groups: Shows inclusion and exclusion patterns in long output Change-Id: If26b7b8fec904af39cd164988f1512a02ccc9e8e --- .werks/5326 | 10 ++++++++++ checks/fileinfo | 13 +++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/5326 b/.werks/5326 new file mode 100644 index 0000000..c08fbc6 --- /dev/null +++ b/.werks/5326 @@ -0,0 +1,10 @@ +Title: fileinfo.groups: Shows inclusion and exclusion patterns in long output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508846964 +Class: feature + + diff --git a/checks/fileinfo b/checks/fileinfo index cba70c1..1ddac54 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -215,7 +215,8 @@ def fileinfo_groups_precompile(hostname, item, params): def check_fileinfo_groups(item, params, info): if not info: - return 3, "No information sent by agent" + yield 3, "No information sent by agent" + return outof_range_txt = fileinfo_check_timeranges(params) reftime = None @@ -226,6 +227,8 @@ def check_fileinfo_groups(item, params, info): size_smallest = None size_largest = 0 date_inclusion = "" + include_patterns = set([]) + exclude_patterns = set([]) # Start counting values on all files for line in info: @@ -248,6 +251,8 @@ def check_fileinfo_groups(item, params, info): pattern = (pattern, '') inclusion, exclusion = pattern + include_patterns.add(inclusion) + exclude_patterns.add(exclusion) inclusion_is_regex = False exclusion_is_regex = False @@ -311,7 +316,11 @@ def check_fileinfo_groups(item, params, info): if date_inclusion: check_definition.append(("Date pattern", "date pattern", date_inclusion, str)) - return fileinfo_check_function(check_definition, params, outof_range_txt) + yield fileinfo_check_function(check_definition, params, outof_range_txt) + if include_patterns: + yield 0, "\nInclude patterns: %s" % ", ".join(include_patterns) + if exclude_patterns: + yield 0, "\nExclude patterns: %s" % ", ".join(exclude_patterns) def fileinfo_check_function(check_definition, params, outof_range_txt):

6 years, 4 months

Removed duplicate parameters

by Simon Betz

Module: check_mk Branch: master Commit: 2b71d2c2fe146de7b2d2d44fed977c228be707df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b71d2c2fe146d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 11 11:00:39 2018 +0200 Removed duplicate parameters Change-Id: I6d562c97dbbcafccb6fd308048dc0cbf4a5ab0b9 --- web/plugins/wato/check_parameters.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 18328ab..875b364 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1345,22 +1345,6 @@ process_level_elements = [ ), ], )), - ('process_info', DropdownChoice( - title = _("Enable per-process details in long-output"), - label = _("Enable per-process details"), - help = _("If active, the long output of this service will contain a list of " - "all the matching processes and their details (i.e. PID, CPU usage, memory usage). " - "Please note that HTML output will only work if \"Escape HTML codes in plugin output\" is " - "disabled in global settings. This might expose you to Cross-Site-Scripting (everyone " - "with write-access to checks could get scripts executed on the monitoring site in the context " - "of the user of the monitoring site) so please do this if you understand the consequences."), - choices = [ - (None, _("Disable")), - ("text", _("Text output")), - ("html", _("HTML output")) - ], - default_value = "disable", - )), ("use_linux_cpu_cores", Checkbox( title=_("Use number of cores sent by agent (Linux)"), label=_("Enable")

6 years, 4 months

6077 FIX ps: Using number of cores sent by Linux agent is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: e8cdc365bc57ef65455ddff71fb5203a18812909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8cdc365bc57ef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 11 10:56:32 2018 +0200 6077 FIX ps: Using number of cores sent by Linux agent is now configurable Change-Id: Id41bc32f82c1a41f3a49a116f3fe3a50f57c4182 --- .werks/6077 | 11 +++++++++++ checks/ps | 2 +- web/plugins/wato/check_parameters.py | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.werks/6077 b/.werks/6077 new file mode 100644 index 0000000..ecd0ba9 --- /dev/null +++ b/.werks/6077 @@ -0,0 +1,11 @@ +Title: ps: Using number of cores sent by Linux agent is now configurable +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0b4 +Date: 1526028276 + + diff --git a/checks/ps b/checks/ps index 9489fc7..52eec64 100644 --- a/checks/ps +++ b/checks/ps @@ -242,7 +242,7 @@ def inventory_ps(info): def check_ps(item, params, info): (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info - if cpu_info and len(cpu_info[0]) == 6: + if cpu_info and len(cpu_info[0]) == 6 and params.get('use_linux_cpu_cores'): cpu_cores = int(cpu_info[0][5]) if mem_info: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2092288..18328ab 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1361,6 +1361,26 @@ process_level_elements = [ ], default_value = "disable", )), + ("use_linux_cpu_cores", Checkbox( + title=_("Use number of cores sent by agent (Linux)"), + label=_("Enable") + )), + ('process_info', DropdownChoice( + title = _("Enable per-process details in long-output"), + label = _("Enable per-process details"), + help = _("If active, the long output of this service will contain a list of " + "all the matching processes and their details (i.e. PID, CPU usage, memory usage). " + "Please note that HTML output will only work if \"Escape HTML codes in plugin output\" is " + "disabled in global settings. This might expose you to Cross-Site-Scripting (everyone " + "with write-access to checks could get scripts executed on the monitoring site in the context " + "of the user of the monitoring site) so please do this if you understand the consequences."), + choices = [ + (None, _("Disable")), + ("text", _("Text output")), + ("html", _("HTML output")) + ], + default_value = "disable", + )), ] # In version 1.2.4 the check parameters for the resulting ps check

6 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018