Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 3be8462b961a5d1b3e80f1adbb3a4b05cecdcec2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be8462b961a5d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 13 11:31:51 2018 +0200 Pass grepping filters from CMC to EC. Change-Id: I048e86414175a8dc292f8e5e504b7c791836b5fd --- livestatus/src/TableEventConsole.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index f3135b6..e9b9c7f 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -37,6 +37,14 @@ #include "auth.h" namespace { +// NOTE: Keep this in sync with EC code. Ugly... +std::vector<std::string> grepping_filters = { + "event_text", "event_comment", "event_host", "event_host_regex", + "event_contact", "event_application", "event_rule_id", "event_owner", + "event_ipaddress", "event_core_host" + +}; + class ECTableConnection : public EventConsoleConnection { public: ECTableConnection(MonitoringCore *mc, const Table &table, Query *query) @@ -53,6 +61,7 @@ private: emitOutputFormat(os); emitColumnsHeader(os); emitTimeRangeFilter(os); + emitGreppingFilter(os); os << std::endl; } @@ -102,6 +111,14 @@ private: } } + void emitGreppingFilter(std::ostream &os) { + for (const auto &column_name : grepping_filters) { + if (auto svr = _query->stringValueRestrictionFor(column_name)) { + os << "\nFilter: " << column_name << " = " << *svr; + } + } + } + void receiveReply(std::istream &is) override { bool is_header = true; std::vector<std::string> headers;

6 years, 2 months

Win-agent: collect unit testing coverage

by Jukka Aro

Module: check_mk Branch: master Commit: dc6c8efc51fbf683bdc1ca22879160cf103f8eec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc6c8efc51fbf6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Apr 9 16:05:43 2018 +0200 Win-agent: collect unit testing coverage Add make target for generating a HTML report of unit test coverage. --- .gitignore | 2 ++ agents/windows/.gitignore | 1 + agents/windows/Makefile.am | 24 +++++++++++++++++++++--- agents/windows/build-agent | 10 ++++++---- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 2 ++ agents/windows/chroot_version | 2 +- agents/windows/make-chroot | 1 + 8 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cff1690..39f389c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ tags tests/web/data/* .idea/ .venv +*.gcov +htmlcov/ diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 3f77551..f65651a 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -20,3 +20,4 @@ chroot /*.msi Makefile.in junit.xml +coverage.info diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 7a468a6..f2ab0de 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = check_mk_agent -check_PROGRAMS = WindowsAgentTest wmitest -noinst_LIBRARIES = libcheck_mk_agent.a +check_PROGRAMS = WindowsAgentTest WindowsAgentCoverage wmitest +noinst_LIBRARIES = libcheck_mk_agent.a libcheck_mk_agent_coverage.a noinst_PROGRAMS = MontyPython AUTOMAKE_OPTIONS = foreign @@ -15,6 +15,11 @@ check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) WindowsAgentTest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) +WindowsAgentCoverage_CPPFLAGS = $(WindowsAgentTest_CPPFLAGS) -fprofile-arcs -ftest-coverage +WindowsAgentCoverage_LDFLAGS = $(AM_LDFLAGS) -lgcov --coverage +WindowsAgentCoverage_LDADD = libcheck_mk_agent_coverage.a -lgtest -lgmock $(LD_COMMON) +libcheck_mk_agent_coverage_a_CPPFLAGS = -D main=check_mk_agent_main $(WindowsAgentCoverage_CPPFLAGS) + wmitest_LDADD = $(LD_COMMON) pytest = /usr/bin/env pytest @@ -47,7 +52,7 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico # Using Xvfb does not work properly, either. Simply send those stderr warnings # to /dev/null as the test output will go to stdout (and/or xml file) anyway. unittest: WindowsAgentTest$(EXEEXT) - DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) 2>/dev/null + DISPLAY="$$DISPLAY xterm" wine $< 2>/dev/null integrationtest: install-strip cd $(bindir)/it ; \ @@ -60,6 +65,13 @@ integrationtest: install-strip fi ; \ cd - +coverage.info: WindowsAgentCoverage$(EXEEXT) ; \ + DISPLAY="$$DISPLAY xterm" wine $< 2>/dev/null ; \ + lcov --capture --rc lcov_branch_coverage=1 --directory . --output-file $@ + +unittest-coverage-html: coverage.info + genhtml $< --rc lcov_branch_coverage=1 --output-directory htmlcov + libcheck_mk_agent_a_SOURCES = \ Configuration.cc \ CrashHandler.cc \ @@ -108,6 +120,8 @@ libcheck_mk_agent_a_SOURCES = \ check_mk_agent_SOURCES = check_mk_agent.cc +libcheck_mk_agent_coverage_a_SOURCES = $(libcheck_mk_agent_a_SOURCES) $(check_mk_agent_SOURCES) + MontyPython_SOURCES = it/MontyPython.cc WindowsAgentTest_SOURCES = \ @@ -128,10 +142,14 @@ WindowsAgentTest_SOURCES = \ test/sections/SectionLogwatchTest.cc \ test/sections/SectionMRPETest.cc +WindowsAgentCoverage_SOURCES = $(WindowsAgentTest_SOURCES) + wmitest_SOURCES = Logger.cc WinApi.cc stringutil.cc wmiHelper.cc wmitest.cc CLEANFILES = \ *.ico *.res *.rc config.* stamp-* Makefile \ + $$(find . -name "*.gc*") \ + $$(find . -name "*.html") \ $$(find . -name .dirstamp) \ $$(find .deps/ sections/.deps test/.deps test/sections/.deps it/.deps -type f) \ $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ diff --git a/agents/windows/build-agent b/agents/windows/build-agent index fc7e68e..c28ac1f 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -37,8 +37,9 @@ windowsdir="/$CHROOT_BUILD_DIR/agents/windows" exit 1 fi - if [[ "$targets" == unittest || "$targets" == integrationtest ]] ; then - # Only unittest or integrationtest + if [[ "$targets" == unittest || "$targets" == integrationtest \ + || "$targets" == unittest-coverage-html ]] ; then + # Only unittest, integrationtest or unittest-coverage-html build_archs=() elif [[ "$targets" == check ]] ; then build_archs=(64) @@ -72,8 +73,9 @@ windowsdir="/$CHROOT_BUILD_DIR/agents/windows" fi if [[ ! "$targets" =~ clean && "$targets" != integrationtest ]] ; then - # Run unittest only in 64 bit - targets=unittest + if [[ "$targets" != unittest-coverage-html ]] ; then + targets=unittest + fi build 64 fi diff --git a/agents/windows/build_version b/agents/windows/build_version index b2ad126..c092de8 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3245 +3246 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 71f0506..7824630 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1074,4 +1074,6 @@ int main(int argc, char **argv) { else { RunImmediate(argv[1], argc - 2, argv + 2); } + + return 0; } diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index f599e28..b4de394 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -10 +11 diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 8e509fe..c084dba 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -64,6 +64,7 @@ package_names=( gettext language-pack-en lcab + lcov libauthen-sasl-perl libc6-dev libencode-locale-perl

6 years, 2 months

5275 FIX cmk-update-agent: Fix run-as-plugin mode ( Regression since 1.5.0b1)

by Andreas Umbreit

Module: check_mk Branch: master Commit: 2a200f2079f841b88a3ff6616fc39f9ac4639551 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a200f2079f841… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Apr 13 10:17:27 2018 +0200 5275 FIX cmk-update-agent: Fix run-as-plugin mode (Regression since 1.5.0b1) Due to an erroneous call to a non-existant method, the Agent Updater crashes when run as plugin. As a result, automatic updates would not work with an Agent Updater 1.5.0b1. Manual updates are still working, so it is possible to replace the erroneous Agent Updater with a fixed one by doing a manual Update to a newly baked agent. Change-Id: I941d868bca1df06e5a097e84c34c180fa09b3699 --- .werks/5275 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5275 b/.werks/5275 new file mode 100644 index 0000000..ee9db15 --- /dev/null +++ b/.werks/5275 @@ -0,0 +1,13 @@ +Title: cmk-update-agent: Fix run-as-plugin mode (Regression since 1.5.0b1) +Level: 2 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1523606519 + +Due to an erroneous call to a non-existant method, the Agent Updater crashes when run as plugin. + +As a result, automatic updates would not work with an Agent Updater 1.5.0b1. Manual updates are still working, so it is possible to replace the erroneous Agent Updater with a fixed one by doing a manual Update to a newly baked agent.

6 years, 2 months

Fixed semantic errors

by Simon Betz

Module: check_mk Branch: master Commit: 08a95a7b860dcde69f17db18362a8e41b70bad88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08a95a7b860dcd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 13 10:24:23 2018 +0200 Fixed semantic errors Change-Id: I12ed24530a5da27fb2d7bf3c2fd0fbd32b675e68 --- agents/plugins/mk_oracle | 603 +++++++++++++++++++++++------------------------ 1 file changed, 294 insertions(+), 309 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08a95a7b86…

6 years, 2 months

Fixed typo in debug message.

by Sven Panne

Module: check_mk Branch: master Commit: 799100e309f892ec6754e9bd69227dfa115d50de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799100e309f892… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 13 10:29:48 2018 +0200 Fixed typo in debug message. Change-Id: I130f837b3d6d595c00f57fc54d079d817780d905 --- livestatus/src/Query.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 00a8752..bba16f9 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -760,7 +760,7 @@ std::optional<int32_t> Query::leastUpperBoundFor( << ")"; } else { Debug(_logger) << "column " << _table.name() << "." << column_name - << " has least upper bound"; + << " has no least upper bound"; } return result; }

6 years, 2 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 09f56d27288c0e2510c1758447894a6645afb457 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f56d27288c0e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 13 09:21:05 2018 +0200 Reserved 20 Werk IDS Change-Id: I1c7590d5c761830a5f2df0d697ef9d72e1874f4c --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 86278f6..41f2d30 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5989 +6009

6 years, 2 months

Updated werk

by Lars Michelsen

Module: check_mk Branch: master Commit: e53a498b905cde8ef27930a2423c21f55d5ffe8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e53a498b905cde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 08:24:36 2018 +0200 Updated werk Change-Id: Icf036bdf738191626fccb1aa1fa7532faa544936 --- .werks/5958 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/5958 b/.werks/5958 index a1033cc..8ca9899 100644 --- a/.werks/5958 +++ b/.werks/5958 @@ -1,11 +1,12 @@ Title: Introduce docker monitoring with Check_MK Level: 2 Component: checks +Class: feature Compatible: compat Edition: cre -Version: 1.5.0b1 +State: unknown +Version: 1.6.0i1 Date: 1523350439 -Class: feature With this change we prepare Check_MK for monitoring docker environments out of the box. These checks work in different layers (node, container). @@ -30,6 +31,7 @@ hosts in your Check_MK use the short container ID as name. For the docker container hosts please use the following configuration: <ul> +<li>Set the "Check_MK Agent" option to "No agent".</li> <li>Set the "IP address family" to "No IP" for only processing the piggyback data.</li> <li>Set the docker node as parent.</li> <li>Enable HW/SW inventory for the node and the containers</li>

6 years, 2 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: cb9d94f233c7d9a03d0b70245a340ef8876e40d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb9d94f233c7d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 07:58:57 2018 +0200 Fixed typo Change-Id: If6e2af19053292ce30af0bf91cb8a7eb827e4972 --- web/plugins/wato/ac_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index ba7779a..02ca080 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -274,7 +274,7 @@ class ACTestBackupConfigured(ACTest): "reliably backed up or not up-to-date in the moment of the backup.</p>" "<p>It is recommended to use the Check_MK backup to create a backup of the runnning " "site to be sure that the data is consistent. If you need to, you can then use " - "the 4rd party tool to archive the Check_MK backups.</p>") + "the 3rd party tool to archive the Check_MK backups.</p>") def is_relevant(self):

6 years, 2 months

Integration tests: Fixed handing over build info to process in site

by Lars Michelsen

Module: check_mk Branch: master Commit: 05538909c462e4987728d3ad1fcd9364d1b875e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05538909c462e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 07:42:42 2018 +0200 Integration tests: Fixed handing over build info to process in site The reuse flag influences port selection of site services. It was skipped by accident during recent restructuring of the tests. Change-Id: I53ed0110b849eeaecc914d9f23f7ebb9f65e7aeb --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 832f374..675689f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -759,7 +759,8 @@ class Site(object): # executed this way. def switch_to_site_user(self): env_vars = { - "VERSION": self.version._version, + "VERSION" : self.version._version, + "REUSE" : "1" if self.reuse else "0", } for varname in [ "WORKSPACE", "PYTEST_ADDOPTS", "BANDIT_OUTPUT_ARGS", "SHELLCHECK_OUTPUT_ARGS", "PYLINT_ARGS"]: if varname in os.environ:

6 years, 2 months

5973 FIX Fixed broken SNMP walk download via GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: a2a3109397aa79aa806a5acc6d969f30543bab83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2a3109397aa79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 20:50:57 2018 +0200 5973 FIX Fixed broken SNMP walk download via GUI When clicking on the context menu of a SNMP host, the SNMP walk can be downloaded from the GUI. This function broke with one the last innovation releases. Change-Id: Ic502f02a55b3c947a812a2e4e40b23f88fc72dd8 --- .werks/5973 | 13 ++++++++++++ cmk_base/automations/check_mk.py | 22 +++++++++++++++---- cmk_base/snmp.py | 46 ++++++++++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 20 deletions(-) diff --git a/.werks/5973 b/.werks/5973 new file mode 100644 index 0000000..03a4474 --- /dev/null +++ b/.werks/5973 @@ -0,0 +1,13 @@ +Title: Fixed broken SNMP walk download via GUI +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523558726 + +When clicking on the context menu of a SNMP host, the SNMP walk +can be downloaded from the GUI. This function broke with one the +last innovation releases. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 80c8aa4..0901dc4 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1290,7 +1290,6 @@ class AutomationGetAgentOutput(Automation): try: if ty == "agent": - data_sources.abstract.DataSource.set_may_use_cache_file(not data_sources.abstract.DataSource.is_agent_cache_disabled()) ipaddress = ip_lookup.lookup_ip_address(hostname) @@ -1310,9 +1309,24 @@ class AutomationGetAgentOutput(Automation): success = False output += "[%s] %s\n" % (source.id(), source_output) else: - path = cmk.paths.snmpwalks_dir + "/" + hostname - snmp.do_snmpwalk_on({}, hostname, path) - info = file(path).read() + access_data = { + "hostname" : hostname, + "ipaddress" : ip_lookup.lookup_ipv4_address(hostname), + "credentials" : config.snmp_credentials_of(hostname), + } + + lines = [] + for oid in snmp.oids_to_walk(): + try: + for oid, value in snmp.walk_for_export(access_data, oid): + lines.append("%s %s\n" % (oid, value)) + except Exception, e: + if cmk.debug.enabled(): + raise + success = False + output += "OID '%s': %s\n" % (oid, e) + + info = "".join(lines) except Exception, e: success = False output = "Failed to fetch data from %s: %s\n" % (hostname, e) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index e8cab12..840ee91 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -793,31 +793,45 @@ def do_snmpwalk(options, hostnames): def do_snmpwalk_on(options, access_data, filename): hostname = access_data["hostname"] console.verbose("%s:\n" % hostname) + + oids = oids_to_walk(options) + + with open(filename, "w") as out: + for rows in _execute_walks_for_dump(hostname, access_data, oids): + for oid, value in rows: + out.write("%s %s\n" % (oid, value)) + console.verbose("%d variables.\n" % len(rows)) + + console.verbose("Wrote fetched data to %s%s%s.\n" % (tty.bold, filename, tty.normal)) + + +def _execute_walks_for_dump(hostname, access_data, oids_to_walk): + for oid in oids_to_walk: + try: + console.verbose("Walk on \"%s\"..." % oid) + yield walk_for_export(access_data, oid) + except Exception, e: + console.error("Error: %s\n" % e) + if cmk.debug.enabled(): + raise + + +def oids_to_walk(options=None): + if options is None: + options = {} + oids_to_walk = [ ".1.3.6.1.2.1", # SNMPv2-SMI::mib-2 ".1.3.6.1.4.1" # SNMPv2-SMI::enterprises ] + if "oids" in options: oids_to_walk = options["oids"] + elif "extraoids" in options: oids_to_walk += options["extraoids"] - with open(filename, "w") as out: - for oid in sorted(oids_to_walk, key = lambda x: map(int, x.strip(".").split("."))): - try: - console.verbose("Walk on \"%s\"..." % oid) - - rows = walk_for_export(access_data, oid) - for oid, value in rows: - out.write("%s %s\n" % (oid, value)) - - console.verbose("%d variables.\n" % len(rows)) - except Exception, e: - console.error("Error: %s\n" % e) - if cmk.debug.enabled(): - raise - - console.verbose("Successfully wrote %s%s%s.\n" % (tty.bold, filename, tty.normal)) + return sorted(oids_to_walk, key = lambda x: map(int, x.strip(".").split("."))) def do_snmpget(*args):

6 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018