Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

5458 FIX Enable filtering on columns with macros when the Nagios core is used

by Sven Panne

Module: check_mk Branch: master Commit: 992f13575686d7f83b9a837353ed7e7c47e7fb49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=992f13575686d7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 14 08:19:29 2017 +0100 5458 FIX Enable filtering on columns with macros when the Nagios core is used Some host/service columns (check_command, notes, notes_url, action_url, icon_image) can contain macros, and they have a corresponding "..._expanded" column with those macros already expanded. Previously, it was not possible to use filters on those expanded columns when the Nagios core was used. This has been fixed. Change-Id: Id8d6a43c4420cb5be20a12498e7c7a857af76566 --- .werks/5458 | 14 +++++++++++ livestatus/src/OffsetStringMacroColumn.cc | 40 ++++++++++--------------------- livestatus/src/OffsetStringMacroColumn.h | 21 +++++----------- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/.werks/5458 b/.werks/5458 new file mode 100644 index 0000000..3ebdc2b --- /dev/null +++ b/.werks/5458 @@ -0,0 +1,14 @@ +Title: Enable filtering on columns with macros when the Nagios core is used +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510645640 +Class: fix + +Some host/service columns (check_command, notes, notes_url, action_url, +icon_image) can contain macros, and they have a corresponding "..._expanded" +column with those macros already expanded. Previously, it was not possible +to use filters on those expanded columns when the Nagios core was used. +This has been fixed. diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index adc8bfb..2af859d 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -25,36 +25,25 @@ #include "OffsetStringMacroColumn.h" #include <cstdlib> #include <cstring> -#include <memory> -#include <vector> -#include "AndingFilter.h" #include "Column.h" -#include "Filter.h" -#include "Logger.h" -#include "Renderer.h" #include "Row.h" -extern char *macro_user[MAX_USER_MACROS]; - std::string OffsetStringMacroColumn::getValue(Row row) const { if (auto p = columnData<void>(row)) { auto s = offset_cast<const char *>(p, _string_offset); - return *s == nullptr ? "" : *s; + return *s == nullptr ? "" + : expandMacros(*s, getHost(row), getService(row)); } return ""; } -void OffsetStringMacroColumn::output( - Row row, RowRenderer &r, const contact * /*auth_user*/, - std::chrono::seconds /*timezone_offset*/) const { - std::string raw = getValue(row); - const host *hst = getHost(row); - const service *svc = getService(row); - +// static +std::string OffsetStringMacroColumn::expandMacros(const std::string &raw, + const host *hst, + const service *svc) { // search for macro names, beginning with $ std::string result; const char *scan = raw.c_str(); - while (*scan != 0) { const char *dollar = strchr(scan, '$'); if (dollar == nullptr) { @@ -78,20 +67,13 @@ void OffsetStringMacroColumn::output( } scan = otherdollar + 1; } - r.output(result); -} - -std::unique_ptr<Filter> OffsetStringMacroColumn::createFilter( - RelationalOperator /*unused */, const std::string & /*unused*/) const { - Informational(logger()) - << "Sorry. No filtering on macro columns implemented yet"; - return std::make_unique<AndingFilter>( - std::vector<std::unique_ptr<Filter>>()); + return result; } +// static const char *OffsetStringMacroColumn::expandMacro(const char *macroname, const host *hst, - const service *svc) const { + const service *svc) { // host macros if (strcmp(macroname, "HOSTNAME") == 0) { return hst->name; @@ -158,6 +140,7 @@ const char *OffsetStringMacroColumn::expandMacro(const char *macroname, if (strncmp(macroname, "USER", 4) == 0) { int n = atoi(macroname + 4); if (n > 0 && n <= MAX_USER_MACROS) { + extern char *macro_user[MAX_USER_MACROS]; return macro_user[n - 1]; } } @@ -165,8 +148,9 @@ const char *OffsetStringMacroColumn::expandMacro(const char *macroname, return nullptr; } +// static const char *OffsetStringMacroColumn::expandCustomVariables( - const char *varname, const customvariablesmember *custvars) const { + const char *varname, const customvariablesmember *custvars) { for (; custvars != nullptr; custvars = custvars->next) { if (strcasecmp(varname, custvars->variable_name) == 0) { return custvars->variable_value; diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index 5421b8a..0530db4 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -26,15 +26,10 @@ #define OffsetStringMacroColumn_h #include "config.h" // IWYU pragma: keep -#include <chrono> -#include <memory> #include <string> #include "StringColumn.h" #include "nagios.h" -#include "opids.h" -class Filter; class Row; -class RowRenderer; class OffsetStringMacroColumn : public StringColumn { public: @@ -48,22 +43,18 @@ public: std::string getValue(Row row) const override; - void output(Row row, RowRenderer &r, const contact *auth_user, - std::chrono::seconds timezone_offset) const override; - std::unique_ptr<Filter> createFilter( - RelationalOperator relOp, const std::string &value) const override; - - // overriden by host and service macro columns virtual const host *getHost(Row) const = 0; virtual const service *getService(Row) const = 0; private: const int _string_offset; - const char *expandMacro(const char *macroname, const host *hst, - const service *svc) const; - const char *expandCustomVariables( - const char *varname, const customvariablesmember *custvars) const; + static std::string expandMacros(const std::string &raw, const host *hst, + const service *svc); + static const char *expandMacro(const char *macroname, const host *hst, + const service *svc); + static const char *expandCustomVariables( + const char *varname, const customvariablesmember *custvars); }; #endif // OffsetStringMacroColumn_h

6 years, 10 months

Reserved 20 Werk IDS.

by Sven Panne

Module: check_mk Branch: master Commit: d1a658b6099028074805c8cf06843472be8ae2e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1a658b6099028… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 14 08:56:22 2017 +0100 Reserved 20 Werk IDS. Change-Id: Ie826da73aefbf71586d4ff77652f4a0142945fed --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ec296f1..7bcda5b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5458 +5478

6 years, 10 months

Build agent updater for windows during dist

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c0d3f7e9d1098158c6170ae00f7c29ccdae78ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0d3f7e9d1098… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 14 08:35:06 2017 +0100 Build agent updater for windows during dist Change-Id: I7ab980829e9d0c2377191b51bc276387c6c336df --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f20de9d..f23f3c0 100644 --- a/Makefile +++ b/Makefile @@ -198,6 +198,7 @@ check-version: dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise agents/plugins/cmk-update-agent + $(MAKE) -C enterprise agents/windows/plugins/cmk-update-agent.exe endif @EXCLUDES= ; \ if [ -d .git ]; then \

6 years, 10 months

Removed old test

by Lars Michelsen

Module: check_mk Branch: master Commit: 7503a1a9a283313bb890e4b8ce8351b70cc3aba7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7503a1a9a28331… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 14 08:37:38 2017 +0100 Removed old test Change-Id: I7246def195b22266eed02e9538912f867dc13884 --- tests/git/test_precompiled_cmk_update_agent.py | 42 -------------------------- 1 file changed, 42 deletions(-) diff --git a/tests/git/test_precompiled_cmk_update_agent.py b/tests/git/test_precompiled_cmk_update_agent.py deleted file mode 100644 index 82baa47..0000000 --- a/tests/git/test_precompiled_cmk_update_agent.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/python -# encoding: utf-8 - -import os -import glob -import pytest -from testlib import cmc_path - -# Mark all tests in this file to be executed in the git context -pytestmark = pytest.mark.git - -precompiled_files = [ - 'plugins/cmk-update-agent.exe' -] - - -def test_precompiled_files_present(): - for filename in precompiled_files: - path = "%s/agents/windows/%s" % (cmc_path(), filename) - assert os.path.exists(path) - - -def test_precompiled_file_ages(): - newest_source_file, newest_source_time = find_newest_source_file() - - for filename in precompiled_files: - path = "%s/agents/windows/%s" % (cmc_path(), filename) - commit_time = last_commit_time(path) - assert commit_time >= newest_source_time, \ - "%s is older than source code file %s" % (path, newest_source_file) - - -def find_newest_source_file(): - path = "%s/agents/plugins/cmk-update-agent" % cmc_path() - return path, last_commit_time(path) - - -def last_commit_time(path): - lines = os.popen('unset GIT_DIR ; cd "%s" ; ' - 'git log -n 1 --date=raw -- "%s"' % (os.path.dirname(path), path)).readlines() - timestamp = int(lines[2].split()[1]) - return timestamp

6 years, 10 months

5325 mssql_counters.cache_hits: Discover services for which the agent plugins does not provide any base for the counter 'cache_hits'

by Simon Betz

Module: check_mk Branch: master Commit: 1aebaff13726f5e8fd30d9481566e6f0ecc5308b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1aebaff13726f5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 24 13:50:29 2017 +0200 5325 mssql_counters.cache_hits: Discover services for which the agent plugins does not provide any base for the counter 'cache_hits' Some base values for counters might be zero or None if they are currently not available, eg. MSSQL_FOOBAR:Databases log_cache_hit_ratio ANY-PATH 0 MSSQL_FOOBAR:Databases log_cache_hit_ratio_base ANY-PATH 0 This may lead to a flapping state of the {{Check_MK Discovery Service}} which reports vanished services. Change-Id: I86209ba8e32da035b4550d9f3572750792511011 --- .werks/5325 | 15 +++++++++++++++ checks/mssql_counters | 13 +++++++++---- web/plugins/wato/check_parameters.py | 11 +++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.werks/5325 b/.werks/5325 new file mode 100644 index 0000000..9b887f3 --- /dev/null +++ b/.werks/5325 @@ -0,0 +1,15 @@ +Title: mssql_counters.cache_hits: Discover services for which the agent plugins does not provide any base for the counter 'cache_hits' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508845164 +Class: feature + +Some base values for counters might be zero or None +if they are currently not available, eg. +MSSQL_FOOBAR:Databases log_cache_hit_ratio ANY-PATH 0 +MSSQL_FOOBAR:Databases log_cache_hit_ratio_base ANY-PATH 0 +This may lead to a flapping state of the +{{Check_MK Discovery Service}} which reports vanished services. diff --git a/checks/mssql_counters b/checks/mssql_counters index acab476..a60a6df 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -54,12 +54,15 @@ def mssql_counters_item(line, add_counter_name): return obj + ' ' + instance -def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, dflt = None): +inventory_mssql_counters_rules = [] + + +def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, dflt=None): + rules = host_extra_conf_merged(host_name(), inventory_mssql_counters_rules) inventory = [] for line in info: if line[1] in want_counters: this_counter = line[1] - # Get the base value for perc values if perc_w_base: base = 0.0 @@ -68,8 +71,10 @@ def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, mssql_counters_item(line, add_counter_name) + '_base': base = float(line2[-1]) break - if base == 0.0: - continue # Skip counters where base is "0" + if base == 0.0 and not rules.get('add_zero_based_services', False): + # Skip counters where base is "0" + # Only cache_hits could have counters with base == 0.0 + continue inventory.append((mssql_counters_item(line, add_counter_name), dflt)) return inventory diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4bd76ed..8ee2ce3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1561,6 +1561,17 @@ register_rule(group + '/' + subgroup_inventory, match = "dict", ) +register_rule(group + '/' + subgroup_inventory, + varname = "inventory_mssql_counters_rules", + title = _("Include MSSQL Counters services"), + valuespec = Dictionary(elements=[ + ("add_zero_based_services", Checkbox(title=_("Include service with zero base."))), + ], + optional_keys = [] + ), + match = "dict", +) + #. # .--Applications--------------------------------------------------------. # | _ _ _ _ _ |

6 years, 10 months

Removed VariadicFilter.

by Sven Panne

Module: check_mk Branch: master Commit: 1cbc652319cd6a610912e5e2554c3c583bab19e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cbc652319cd6a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 13 12:51:57 2017 +0100 Removed VariadicFilter. We strictly distinguish between a filter stack at query construction time and the resulting filter later. The latter is immutable now. Change-Id: I13e55d801fa24606a03c6a627d968b1a57f825c3 --- livestatus/src/AndingFilter.cc | 21 +++--- livestatus/src/AndingFilter.h | 17 ++--- livestatus/src/OffsetStringMacroColumn.cc | 4 +- livestatus/src/OringFilter.cc | 21 +++--- livestatus/src/OringFilter.h | 11 ++- livestatus/src/Query.cc | 110 ++++++++++++++++++------------ livestatus/src/Query.h | 24 ++++--- livestatus/src/VariadicFilter.h | 43 ------------ 8 files changed, 117 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1cbc652319…

6 years, 10 months

5243 WATO: improved "Activate Changes" performance

by Andreas Boesl

Module: check_mk Branch: master Commit: b0d3dc52442a4bec9defa407c23876674419069b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d3dc52442a4b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 13 12:09:48 2017 +0100 5243 WATO: improved "Activate Changes" performance Change-Id: I8d9afedcfcc35c2fb4ef97d7e4ec94443992b150 --- .werks/5243 | 13 ++ lib/store.py | 10 +- web/htdocs/multitar.py | 255 +++++++++++++++++------------ web/htdocs/userdb.py | 19 ++- web/htdocs/wato.py | 6 +- web/htdocs/watolib.py | 172 +++++++++++-------- web/plugins/config/wato.py | 1 + web/plugins/wato/check_mk_configuration.py | 15 +- 8 files changed, 304 insertions(+), 187 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b0d3dc5244…

6 years, 10 months

Fixed recently introduced bug where rrdcached got the WATO lock

by Lars Michelsen

Module: check_mk Branch: master Commit: 77f9d794c432e42fbed7730fb11acdec1ae14d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77f9d794c432e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 15:33:59 2017 +0100 Fixed recently introduced bug where rrdcached got the WATO lock Change-Id: Iea46ab461cb6f3533809e42f5f2ed75dff268bce --- web/plugins/wato/omd_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index 81561fd..db81e5e 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -340,7 +340,7 @@ class ConfigDomainApache(watolib.ConfigDomain): self._write_config_file() p = subprocess.Popen(["omd", "reload", "apache"], shell=False, stdin=open(os.devnull), - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) stdout = p.communicate()[0] if p.returncode != 0: @@ -444,7 +444,7 @@ class ConfigDomainRRDCached(watolib.ConfigDomain): self._write_config_file() p = subprocess.Popen(["omd", "restart", "rrdcached"], shell=False, stdin=open(os.devnull), - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) stdout = p.communicate()[0] if p.returncode != 0:

6 years, 10 months

5445 FIX apc_symmetra_output: Fixed exception ' could not convert string to float' during discovery

by Simon Betz

Module: check_mk Branch: master Commit: a124575b39361e2b1922f8ecb53f4945f8a5298d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a124575b39361e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 13 15:26:57 2017 +0100 5445 FIX apc_symmetra_output: Fixed exception 'could not convert string to float' during discovery Some devices do not provide all values for 'voltage', 'current' or 'output load' and might be empty strings. This caused above exception during discovery. Fixed that. Change-Id: Ie6a0b6a51d171c4e66c8730c5c7caeb2f296045b --- .werks/5445 | 13 +++++++++++++ checks/apc_symmetra_output | 17 +++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/5445 b/.werks/5445 new file mode 100644 index 0000000..33b3e7c --- /dev/null +++ b/.werks/5445 @@ -0,0 +1,13 @@ +Title: apc_symmetra_output: Fixed exception 'could not convert string to float' during discovery +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510583090 + +Some devices do not provide all values for 'voltage', +'current' or 'output load' and might be empty strings. +This caused above exception during discovery. Fixed that. diff --git a/checks/apc_symmetra_output b/checks/apc_symmetra_output index 9e94d93..00637ac 100644 --- a/checks/apc_symmetra_output +++ b/checks/apc_symmetra_output @@ -38,12 +38,17 @@ factory_settings["apc_symmetra_output_default_levels"] = { def parse_apc_symmetra_output(info): if not info: return {} - voltage, current, load = map(float, info[0]) - return { "Output" : { - "voltage" : voltage, - "current" : current, - "output_load" : load, - }} + + data = {} + for key, value_str in zip(["voltage", "current", "output_load"], info[0]): + try: + value = float(value_str) + except ValueError: + continue + else: + data.setdefault("Output", {}) + data["Output"].setdefault(key, value) + return data check_info['apc_symmetra_output'] = {

6 years, 10 months

cmk-update-agent: Improve windows agent updater build

by Andreas Umbreit

Module: check_mk Branch: master Commit: e5bf1ed4300b24b1584c9a41996eef3ef003b0b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5bf1ed4300b24… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Nov 13 13:44:28 2017 +0100 cmk-update-agent: Improve windows agent updater build - Avoid reinstalling Python windows version on every build Change-Id: I88ad8e9ac94c4a4978117134504d689ce988eb69 --- agents/windows/frozen_binaries/pyinstaller-deps.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index 9768246..12580fd 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -69,13 +69,13 @@ src/python-$(PYTHON_VERSION).msi: cd src && \ curl -O https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… -$(BUILD_DIR)/drive_c/python.exe: src/python-$(PYTHON_VERSION).msi +$(BUILD_DIR)/drive_c/Python27/python.exe: src/python-$(PYTHON_VERSION).msi mkdir -p $(BUILD_DIR) && \ export WINEPREFIX=$(BUILD_DIR) && \ cd $(BUILD_DIR) && \ cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ - cd $(CURDIR) + touch $(BUILD_DIR)/drive_c/Python27/python.exe $(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe # Download needed python packages including depencencies. This has to be done

6 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017