Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 328665d4e8e19ea29f22c238a43ab4cc628c3a26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=328665d4e8e19e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 07:43:02 2019 +0100 Reserved 20 Werk IDS Change-Id: I075002555a2373fa8353bfde3c1bd036c27a318b --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 190d201..4bfde66 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7174 +7194

5 years, 7 months

6760 gude_temp, gude_humidity: Added support for Gude Sensor Box 7213

by Marcel Arentz

Module: check_mk Branch: master Commit: d62aa2a0bf9f394db80c7458c48d7319fede8422 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d62aa2a0bf9f39… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 19 14:36:18 2019 +0100 6760 gude_temp, gude_humidity: Added support for Gude Sensor Box 7213 Check_MK is able to monitor Gude Sensor Box 7213 beginning with this werk release. Change-Id: I0033816299285c314bb0aacf36accc5fae8c4676 --- .werks/6760 | 11 +++++++++++ checks/gude_humidity | 5 +++-- checks/gude_temp | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/6760 b/.werks/6760 new file mode 100644 index 0000000..ad519e6 --- /dev/null +++ b/.werks/6760 @@ -0,0 +1,11 @@ +Title: gude_temo, gude_humidity: Added support for Gude Sensor Box 7213 +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550582721 +Class: feature + +Check_MK is now able to monitor also the Gude Sensor Box 7213 beginning with +this werk release. diff --git a/checks/gude_humidity b/checks/gude_humidity index 218ab27..8dfa103 100644 --- a/checks/gude_humidity +++ b/checks/gude_humidity @@ -50,12 +50,13 @@ check_info['gude_humidity'] = { 'check_function' : check_gude_humidity, 'service_description' : 'Humidity %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ + 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38", "66" ], [ OID_END, "1.6.1.1.3", # GUDEADS-EPC****-MIB::epc****HygroSensor ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.19") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38"), + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.66"), 'group' : 'humidity', 'includes' : [ 'humidity.include' ], } diff --git a/checks/gude_temp b/checks/gude_temp index 67fd356..f90d7ab 100644 --- a/checks/gude_temp +++ b/checks/gude_temp @@ -52,12 +52,13 @@ check_info['gude_temp'] = { 'check_function' : check_gude_temp, 'service_description' : 'Temperature %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ + 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38", "66" ], [ OID_END, "1.6.1.1.2", # GUDEADS-EPC****-MIB::epc****TempSensor ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.19") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38"), + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.38") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.28507.66"), 'group' : 'temperature', 'default_levels_variable' : 'gude_temp_default_levels', 'includes' : [ 'temperature.include' ],

5 years, 7 months

added WK6706: BI availability no longer creates N/ A periods if an elements within the BI was not known at the time

by Andreas Boesl

Module: check_mk Branch: master Commit: 4b43881447220e9fa7fe033d001217df4241e1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b43881447220e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 19 16:00:07 2019 +0100 added WK6706: BI availability no longer creates N/A periods if an elements within the BI was not known at the time Change-Id: Id5cb9661e006ffe8d8d01c30394152ffc93c61c0 --- .werks/6706 | 18 ++++++++++++++++++ cmk/gui/availability.py | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/.werks/6706 b/.werks/6706 new file mode 100644 index 0000000..b9cfc91 --- /dev/null +++ b/.werks/6706 @@ -0,0 +1,18 @@ +Title: BI availability no longer creates N/A periods if an element within the BI was not known at the time +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1550580832 + +WK:4202 introduced some special handling for BI aggregations: + +<tt> +When computing the availability of a BI aggregation for a time range during which new hosts or services were added to the monitoring the state of these objects would be displayed as PEND before point of time they were added. But this is not correct. These objects where not pending but simply not yet existing and thus not contained in the aggregation tree at all at that time. +</tt> + +This introduced an side effect, so that some availability reports of an aggregation still shows N/A even when the +user has explicitly switched off <tt>Include unmonitored time</tt>. diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py index 2759b87..da057d1 100644 --- a/cmk/gui/availability.py +++ b/cmk/gui/availability.py @@ -820,6 +820,10 @@ def compute_availability(what, av_rawdata, avoptions): s = "unmonitored" if not avoptions["consider"]["unmonitored"]: consider = False + elif state is None: + # state is None means that this element was not known at this given time + # So there is no reason for creating a fake pending state + consider = False elif span["in_notification_period"] == 0 and avoptions[ "notification_period"] == "exclude": consider = False

5 years, 7 months

agent_aws: Unified ID in get_metric_data API call

by Simon Betz

Module: check_mk Branch: master Commit: 13b41da4dcbf9b356f4a2ae15462e2dc3ec12300 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13b41da4dcbf9b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 19 13:26:50 2019 +0100 agent_aws: Unified ID in get_metric_data API call Change-Id: I6024c44880f34194fd47ccf54bf4026451d6da2a --- agents/special/agent_aws | 20 +++++++++++++++----- checks/aws.include | 6 ++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index ab8b456..54eeb90 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -345,6 +345,15 @@ class AWSSectionCloudwatch(AWSSection): def _get_metrics(self, colleague_contents): pass + def _create_id_for_metric_data_query(self, index, metric_name, *args): + """ + ID field must be unique in a single call. + The valid characters are letters, numbers, and underscore. + The first character must be a lowercase letter. + Regex: ^[a-z][a-zA-Z0-9_]*$ + """ + return "_".join(["id", str(index)] + list(args) + [metric_name]) + #. # .--costs/usage---------------------------------------------------------. @@ -546,7 +555,7 @@ class EC2(AWSSectionCloudwatch): ("StatusCheckFailed_System", "Count"), ]: metrics.append({ - 'Id': "%s_%s" % (metric_name.lower(), idx), + 'Id': self._create_id_for_metric_data_query(idx, metric_name), 'Label': instance_name, 'MetricStat': { 'Metric': { @@ -709,7 +718,8 @@ class S3(AWSSectionCloudwatch): ]: for storage_class in storage_classes: metrics.append({ - 'Id': "%s_%s_%s" % (metric_name.lower(), storage_class.lower(), idx), + 'Id': self._create_id_for_metric_data_query(idx, metric_name, + storage_class), 'Label': bucket_name, 'MetricStat': { 'Metric': { @@ -905,7 +915,7 @@ class ELB(AWSSectionCloudwatch): ("BackendConnectionErrors", "Sum"), ]: metrics.append({ - 'Id': "%s_%s" % (metric_name.lower(), idx), + 'Id': self._create_id_for_metric_data_query(idx, metric_name), 'Label': load_balancer_dns_name, 'MetricStat': { 'Metric': { @@ -1063,7 +1073,7 @@ class EBS(AWSSectionCloudwatch): if volume_types and volume_type not in volume_types: continue metric = { - 'Id': "%s_%s" % (metric_name.lower(), idx), + 'Id': self._create_id_for_metric_data_query(idx, metric_name), 'Label': instance_name, 'MetricStat': { 'Metric': { @@ -1197,7 +1207,7 @@ class RDS(AWSSectionCloudwatch): #("MaximumUsedTransactionIDs", "Count"), ]: metric = { - 'Id': "%s_%s" % (metric_name.lower(), idx), + 'Id': self._create_id_for_metric_data_query(idx, metric_name), 'Label': instance_id, 'MetricStat': { 'Metric': { diff --git a/checks/aws.include b/checks/aws.include index b20ea65..55af9da 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -80,11 +80,13 @@ def _extract_aws_metrics_by_labels(expected_metric_names, parsed, extra_keys=Non extra_keys = [] values_by_labels = {} for row in parsed: - row_id = row['Id'] + row_id = row['Id'].lower() row_label = row['Label'] row_values = row['Values'] for expected_metric_name in expected_metric_names: - if not row_id.startswith(expected_metric_name.lower()): + expected_metric_name_lower = expected_metric_name.lower() + if not row_id.startswith(expected_metric_name_lower)\ + and not row_id.startswith(expected_metric_name_lower): continue try:

5 years, 7 months

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 2fc8fb3b92138db69a207721c231e15bb3436d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc8fb3b92138d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 19 15:59:23 2019 +0100 Fixed typo Change-Id: I8590278dac1e1e61d1caeec6a1ff129ed03fab74 --- checks/aws.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/aws.include b/checks/aws.include index 55af9da..9c17955 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -86,7 +86,7 @@ def _extract_aws_metrics_by_labels(expected_metric_names, parsed, extra_keys=Non for expected_metric_name in expected_metric_names: expected_metric_name_lower = expected_metric_name.lower() if not row_id.startswith(expected_metric_name_lower)\ - and not row_id.startswith(expected_metric_name_lower): + and not row_id.endswith(expected_metric_name_lower): continue try:

5 years, 7 months

Don't build OHM when only config.status is needed.

by Sven Panne

Module: check_mk Branch: master Commit: 35f6671b3ac7545c0651bc628a448ca546cd6db2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35f6671b3ac754… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 19 15:20:04 2019 +0100 Don't build OHM when only config.status is needed. Change-Id: I47f44a730924a883f85d921e9e534fde95229040 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f055f0..4c40074 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,10 @@ export BEAR := bear M4_DEPS := $(wildcard m4/*) configure.ac CONFIGURE_DEPS := $(M4_DEPS) aclocal.m4 -DIST_DEPS := ar-lib compile config.guess config.sub install-sh missing depcomp configure omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll +CONFIG_DEPS := ar-lib compile config.guess config.sub install-sh missing depcomp configure +DIST_DEPS := $(CONFIG_DEPS) \ + omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe \ + omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ @@ -385,7 +388,7 @@ ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac touch ar-lib compile config.guess config.sub install-sh missing depcomp # TODO(sp): We should really detect and use our own packages in a less hacky way... -config.status: $(DIST_DEPS) +config.status: $(CONFIG_DEPS) @echo "Build $@ (newer targets: $?)" @if test -f config.status; then \ echo "update config.status by reconfiguring in the same conditions" ; \

5 years, 7 months

7035 FIX lnx_thermal: Fixed crash caused to unusual outputs

by Florian Kromer

Module: check_mk Branch: master Commit: 8ad746bf41e25679de6c61a71c61859ba8dbefb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad746bf41e256… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Feb 18 16:14:33 2019 +0100 7035 FIX lnx_thermal: Fixed crash caused to unusual outputs Previously the check crashed in case the agent dlivered thermal zone data with various degrees of details. This werk takes into account that these heterogeneous formats can occur and prevents the check additionally to crash due to invalid or currently unknown data formats. CMK-1506 Commit ab8068a5a45 Change-Id: I68ca53f3076199892f2bdafc099c35f0f698140c --- .werks/7035 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/7035 b/.werks/7035 new file mode 100644 index 0000000..d167a27 --- /dev/null +++ b/.werks/7035 @@ -0,0 +1,17 @@ +Title: lnx_thermal: Fixed crash caused to unusual outputs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550502831 +Class: fix + +Previously the check crashed in case the agent delivered thermal zone data with +various degrees of details. This werk takes into account that these +heterogeneous formats can occur and prevents the check additionally to crash +due to invalid or currently unknown data formats. + +CMK-1506 +Commit ab8068a5a45 +

5 years, 7 months

WATO: Cleaned up module global state

by Lars Michelsen

Module: check_mk Branch: master Commit: 339634e6f9998aed13c8693f15fcde199d8966a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339634e6f9998a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 19:42:36 2019 +0100 WATO: Cleaned up module global state The sidebar reload state is now held by the request global need_sidebar_reload instead of a module global variable. Change-Id: Ie8b51ecc526b95624e4c18ec47b59afd961f6f7f --- cmk/gui/watolib/__init__.py | 2 -- cmk/gui/watolib/sidebar_reload.py | 13 +++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 45273c7..16d377f 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -314,8 +314,6 @@ def load_watolib_plugins(): # robust way for doing something like this. If it is locked before, it can now happen # that this call unlocks the wider locking when calling this funktion in a wrong way. def init_wato_datastructures(with_wato_lock=False): - cmk.gui.watolib.sidebar_reload.reset() - if os.path.exists(ConfigDomainCACertificates.trusted_cas_file) and\ not _need_to_create_sample_config(): return diff --git a/cmk/gui/watolib/sidebar_reload.py b/cmk/gui/watolib/sidebar_reload.py index f13198a..d4f7e7b 100644 --- a/cmk/gui/watolib/sidebar_reload.py +++ b/cmk/gui/watolib/sidebar_reload.py @@ -24,19 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# TODO: Cleanup this module level state -_need_sidebar_reload = None - - -def reset(): - global _need_sidebar_reload - _need_sidebar_reload = None +from cmk.gui.globals import current_app def need_sidebar_reload(): - global _need_sidebar_reload - _need_sidebar_reload = True + current_app.g["need_sidebar_reload"] = True def is_sidebar_reload_needed(): - return _need_sidebar_reload + return current_app.g.get("need_sidebar_reload", False)

5 years, 7 months

WATO Git: Cleaned up module global state

by Lars Michelsen

Module: check_mk Branch: master Commit: b1d1c33621f60241a84f5da78811e31f895a4bfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1d1c33621f602… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 19:39:11 2019 +0100 WATO Git: Cleaned up module global state The git commit messages are now held by the request global wato_git_messages entry instead of a module global variable. Change-Id: Idc095e7f5dd2c76b239c759b62a0d5c1859be5c4 --- cmk/gui/watolib/__init__.py | 7 ------- cmk/gui/watolib/git.py | 16 +++++++--------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 096d96a..45273c7 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -314,9 +314,6 @@ def load_watolib_plugins(): # robust way for doing something like this. If it is locked before, it can now happen # that this call unlocks the wider locking when calling this funktion in a wrong way. def init_wato_datastructures(with_wato_lock=False): - if config.wato_use_git: - cmk.gui.watolib.git.prepare_git_commit() - cmk.gui.watolib.sidebar_reload.reset() if os.path.exists(ConfigDomainCACertificates.trusted_cas_file) and\ @@ -357,10 +354,6 @@ def _create_sample_config(): if not _need_to_create_sample_config(): return - # Just in case. If any of the following functions try to write Git messages - if config.wato_use_git: - cmk.gui.watolib.git.prepare_git_commit() - # Global configuration settings save_global_settings({ "use_new_descriptions_for": [ diff --git a/cmk/gui/watolib/git.py b/cmk/gui/watolib/git.py index 21c7372..cf0e4bb 100644 --- a/cmk/gui/watolib/git.py +++ b/cmk/gui/watolib/git.py @@ -31,21 +31,19 @@ import subprocess import cmk.utils import cmk.gui.config as config +from cmk.gui.globals import current_app from cmk.gui.i18n import _ from cmk.gui.exceptions import MKGeneralException from cmk.gui.log import logger -# TODO: Clean this up -_messages = [] # type: List[str] - -def prepare_git_commit(): - global _messages - _messages = [] +def add_message(message): + _git_messages().append(message) -def add_message(message): - _messages.append(message) +def _git_messages(): + """Initializes the request global data structure and returns it""" + return current_app.g.setdefault("wato_git_messages", []) def do_git_commit(): @@ -77,7 +75,7 @@ def do_git_commit(): logger.debug("GIT: Still has pending changes") _git_add_files() - message = ", ".join(_messages) + message = ", ".join(_git_messages()) if not message: message = _("Unknown configuration change")

5 years, 7 months

Fixed comment.

by Sven Panne

Module: check_mk Branch: master Commit: 6de37a7937191c6e3f6c2cdc7deb61c40f95e841 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de37a7937191c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 19 09:52:24 2019 +0100 Fixed comment. Change-Id: I589ec2916bead2142db47a2be478cf34c8b9caf2 --- livestatus/src/LogEntry.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 13999f2..fe1d19c 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -248,14 +248,14 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions{ {Param::HostName, Param::ServiceDescription, Param::CommandName, Param::ServiceState, Param::PluginOutput}}, //////////////// - // NOTE: Nobody seems to write such lines?! + // NOTE: Only Nagios writes such lines if configured to do so. LogDef{"PASSIVE SERVICE CHECK", Class::passivecheck, LogEntryKind::none, {Param::HostName, Param::ServiceDescription, Param::State, Param::PluginOutput}}, //////////////// - // NOTE: Nobody seems to write such lines?! + // NOTE: Only Nagios writes such lines if configured to do so. LogDef{"PASSIVE HOST CHECK", Class::passivecheck, LogEntryKind::none,

5 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019