Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5829 FIX Fixed calculation of time ranges when using disjunctions in queries.

by Sven Panne

Module: check_mk Branch: master Commit: 893d1b6ae657de5bc0f489b5acd37c6a8a34363b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=893d1b6ae657de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 16 11:51:18 2018 +0100 5829 FIX Fixed calculation of time ranges when using disjunctions in queries. Disjunctions (Or:, WaitConditionOr:, StatsOr:) were handled like conjuctions (And:, WaitConditionAnd:, StatsAnd:) when time ranges were calculated for the log and statehist tables. This has been fixed now. Note that the Check_MK GUI does not create such queries, so only people using hand-rolled queries in scripts etc. were affected. Change-Id: I0b1c10500e222c1c4c5ecf0bf43de6b16fc608eb --- .werks/5829 | 15 +++++++++++++++ livestatus/src/OringFilter.cc | 14 +++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/5829 b/.werks/5829 new file mode 100644 index 0000000..d2e3b24 --- /dev/null +++ b/.werks/5829 @@ -0,0 +1,15 @@ +Title: Fixed calculation of time ranges when using disjunctions in queries. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521197227 +Class: fix + +Disjunctions (Or:, WaitConditionOr:, StatsOr:) were handled like conjuctions +(And:, WaitConditionAnd:, StatsAnd:) when time ranges were calculated for +the log and statehist tables. This has been fixed now. + +Note that the Check_MK GUI does not create such queries, so only people +using hand-rolled queries in scripts etc. were affected. diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index 31ae207..506dd61 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -24,6 +24,7 @@ #include "OringFilter.h" #include <iterator> +#include <limits> #include <memory> #include <ostream> #include <vector> @@ -85,9 +86,20 @@ std::optional<std::string> OringFilter::stringValueRestrictionFor( void OringFilter::findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const { + if (_subfilters.empty()) { + return; // NOTE: Ugly special case necessary for correctness! + } + int current_lower = std::numeric_limits<int>::max(); + int current_upper = std::numeric_limits<int>::min(); for (const auto &filter : _subfilters) { - filter->findIntLimits(colum_nname, lower, upper, timezone_offset); + int lo = *lower; + int up = *upper; + filter->findIntLimits(colum_nname, &lo, &up, timezone_offset); + current_lower = std::min(current_lower, lo); + current_upper = std::max(current_upper, up); } + *lower = current_lower; + *upper = current_upper; } bool OringFilter::optimizeBitmask(const std::string &column_name,

6 years, 3 months

Fix broken testcase after adding dir

by Andreas Umbreit

Module: check_mk Branch: master Commit: c86d2eae20bcd4099992cf4f8697252cc328f3a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c86d2eae20bcd4… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Mar 16 11:27:37 2018 +0100 Fix broken testcase after adding dir Change-Id: Ic86b93fc75097c10321458e78fe4c233dbc94309 --- tests/git/test_permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index fcd331b..79e81a4 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -32,7 +32,7 @@ permissions = [ ('enterprise/bin/*', is_executable, []), ('enterprise/active_checks/*', is_executable, []), ('enterprise/agents/bakery/*', is_not_executable, []), - ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make", "chroot"]), + ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make", "chroot", "src"]), ('enterprise/alert_handlers/*', is_executable, []), ('enterprise/alert_handlers/*', is_executable, []), ]

6 years, 3 months

Bumped patch version to 2.7.6. Do not try to download sources. Minor Makefile cleanup.

by Sven Panne

Module: check_mk Branch: master Commit: 697223578d383b62d2d4e9e144c36f8c69638a95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=697223578d383b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 16 09:48:21 2018 +0100 Bumped patch version to 2.7.6. Do not try to download sources. Minor Makefile cleanup. Change-Id: I5b8ea15689ee47cb3355fdb773abea5f6364eca8 --- omd/packages/patch/.gitignore | 2 +- omd/packages/patch/Makefile | 7 +++---- omd/packages/patch/patch-2.6.tar.gz | Bin 300563 -> 0 bytes omd/packages/patch/patch-2.7.6.tar.gz | Bin 0 -> 1189934 bytes 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/omd/packages/patch/.gitignore b/omd/packages/patch/.gitignore index 3865945..06ecc88 100644 --- a/omd/packages/patch/.gitignore +++ b/omd/packages/patch/.gitignore @@ -1 +1 @@ -patch-2.6 +patch-2.*/ diff --git a/omd/packages/patch/Makefile b/omd/packages/patch/Makefile index b7d965f..0cec6fa 100644 --- a/omd/packages/patch/Makefile +++ b/omd/packages/patch/Makefile @@ -1,16 +1,15 @@ include ../../Makefile.omd NAME = patch -VERSION = 2.6 +VERSION = 2.7.6 DIR = patch-$(VERSION) -.PHONY: skel +.PHONY: build install skel clean build: - test -f patch-${VERSION}.tar.gz || wget "ftp://ftp.gnu.org/gnu/patch/patch-${VERSION}.tar.gz" tar xzf patch-$(VERSION).tar.gz cd $(DIR) && ./configure --prefix=$(OMD_ROOT) - cd $(DIR) && $(MAKE) + $(MAKE) -C $(DIR) install: $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install diff --git a/omd/packages/patch/patch-2.6.tar.gz b/omd/packages/patch/patch-2.6.tar.gz deleted file mode 100644 index cad383c..0000000 Binary files a/omd/packages/patch/patch-2.6.tar.gz and /dev/null differ diff --git a/omd/packages/patch/patch-2.7.6.tar.gz b/omd/packages/patch/patch-2.7.6.tar.gz new file mode 100644 index 0000000..5c8471c Binary files /dev/null and b/omd/packages/patch/patch-2.7.6.tar.gz differ

6 years, 3 months

make dist: Cleanup false positive error messages

by Lars Michelsen

Module: check_mk Branch: master Commit: 71f98efd07190aac04b7519ea51a59a255bd0ce5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f98efd07190a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 08:18:27 2018 +0100 make dist: Cleanup false positive error messages The excludes for the agent build directories were always applied while the directories did not exist all the time. This made the tar command exit with an error exit code (which was printed to the log, but ignored by the makefile). For better error handling the script would now fail in such a case. The tar command has been fixed by making the excludes be applied optionally only in case the directories in question exist. Future todo: Make the whole Makefile use stricter shell operation mode. Change-Id: Ieb3015fa1116990117bb1cc73ceb58da9d916801 --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2de2ea3..74c12eb 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,8 @@ DEMO_SUFFIX := OMD_VERSION := $(VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) SHELL := /bin/bash +# TODO: Be more strict - Add this: +#SHELL := /bin/bash -e -o pipefail NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin @@ -193,7 +195,7 @@ ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise agents/plugins/cmk-update-agent $(MAKE) -C enterprise agents/windows/plugins/cmk-update-agent.exe endif - @EXCLUDES= ; \ + @set -e -o pipefail ; EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ @@ -201,6 +203,10 @@ endif EXCLUDES+=" --exclude $${X%*/}" ; \ fi ; \ done ; \ + else \ + for F in $(DIST_ARCHIVE) enterprise/agents/plugins/{build,src} enterprise/agents/windows/{build64,build}; do \ + EXCLUDES+=" --exclude $$F" ; \ + done ; \ fi ; \ if [ -d check-mk-$(EDITION)-$(OMD_VERSION) ]; then \ rm -rf check-mk-$(EDITION)-$(OMD_VERSION) ; \ @@ -213,17 +219,14 @@ endif --exclude .gitignore \ --exclude .gitmodules \ --exclude .gitattributes \ - --exclude $(DIST_ARCHIVE) \ - --exclude enterprise/agents/plugins/{build,src} \ - --exclude enterprise/agents/windows/{build64,build} \ $$EXCLUDES \ - * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) ; \ + * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) if [ -f COMMIT ]; then \ rm COMMIT ; \ - fi ; \ + fi tar -cz --wildcards -f $(DIST_ARCHIVE) \ $(TAROPTS) \ - check-mk-$(EDITION)-$(OMD_VERSION) ; \ + check-mk-$(EDITION)-$(OMD_VERSION) rm -rf check-mk-$(EDITION)-$(OMD_VERSION) # This tar file is only used by "omd/packages/check_mk/Makefile"

6 years, 3 months

Minimal cleanup of the setup.sh script to make it complete without issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 750d6eb0ba298fe73c34219b62a7b54c222f5865 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=750d6eb0ba298f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 15 20:47:54 2018 +0100 Minimal cleanup of the setup.sh script to make it complete without issues The things that were jus removed were failing for a longer time silently without notice. This ancient setup mechanism is still used internally. Needs to be cleaned up soon. Change-Id: Idd7c5442749563aae8272b75f2d3762b825f8623 --- scripts/setup.sh | 60 -------------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 737a1af..93e432f 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -821,16 +821,6 @@ do mkdir -p $DESTDIR$confdir/multisite.d && mkdir -p $DESTDIR$confdir/conf.d && echo 'All files in this directory that end with .mk will be read in after main.mk' > $DESTDIR$confdir/conf.d/README && - mkdir -p $DESTDIR$bindir && - chmod 755 $DESTDIR$bindir/check_mk && - ln -snf check_mk $DESTDIR$bindir/cmk && - echo -e "#!/bin/sh\nexec python $bindir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && - chmod 755 $DESTDIR$bindir/mkp && - sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$sharedir/check_mk_templates.cfg && - sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$sharedir/check_mk_templates.cfg && - sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$sharedir/check_mk_templates.cfg && - sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$sharedir/check_mk_templates.cfg && - sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$sharedir/check_mk_templates.cfg && mkdir -p "$DESTDIR$nagconfdir" if [ ! -e $DESTDIR$nagconfdir/check_mk_templates.cfg ] ; then ln -s $sharedir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null @@ -928,53 +918,6 @@ Please install mod_python and restart Apache." </Directory> </IfModule> EOF - elif [ "$OMD_ROOT" ] ; then - ln -sfn ../../check_mk/apache-local.conf $OMD_ROOT/etc/apache/conf.d/check_mk.conf - cat <<EOF > $OMD_ROOT/etc/check_mk/apache-local.conf -# Local Apache configuration file for Check_MK -# This file has been created by a local ./setup.sh of Check_MK -# within the OMD site $OMD_SITE -# -# This shares the check_mk agents delivered with the OMD -# version via HTTP -Alias /$OMD_SITE/check_mk/agents $OMD_ROOT/local/share/check_mk/agents -<Directory $OMD_ROOT/local/share/check_mk/agents> - Options +Indexes - Order deny,allow - allow from all -</Directory> - -<IfModule mod_python.c> - - Alias /$OMD_SITE/check_mk $OMD_ROOT/local/share/check_mk/web/htdocs - <Directory $OMD_ROOT/local/share/check_mk/web/htdocs> - AddHandler mod_python .py - PythonHandler index - PythonInterpreter $OMD_SITE - DirectoryIndex index.py - - Order deny,allow - allow from all - - ErrorDocument 403 "<h1>Authentication Problem</h1>Either you've entered an invalid password or the authentication<br>configuration of your check_mk web pages is incorrect.<br>" - ErrorDocument 500 "<h1>Server or Configuration Problem</h1>A Server problem occurred. You'll find details in the error log of Apache. One possible reason is, that the file <tt>$OMD_ROOT/etc/htpasswd</tt> is missing. You can manage that file with <tt>htpasswd</tt> or <tt>htpasswd2</tt>." - </Directory> - # Automation is done without HTTP Auth - <Location "/$OMD_SITE/check_mk/automation.py"> - Order allow,deny - Allow from all - Satisfy any - </Location> -</IfModule> - -<IfModule !mod_python.c> - Alias /$OMD_SITE/check_mk $OMD_ROOT/local/share/check_mk/web/htdocs - <Directory $OMD_ROOT/local/share/check_mk/web/htdocs> - Deny from all - ErrorDocument 403 "<h1>Check_mk: Incomplete Apache2 Installation</h1>You need mod_python in order to run the web interface of check_mk.<br> Please install mod_python and restart Apache." - </Directory> -</IfModule> -EOF fi && for d in $DESTDIR$apache_config_dir/../*/*$NAME{,.conf} ; do if [ -e "$d" ] && ! grep -q "$web_dir/htdocs" $d ; then @@ -986,8 +929,6 @@ EOF # WATO. Also create an empty and Apache-writable auth.serials serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && touch "$serials_file" && - (chown $wwwuser "$serials_file" || true) && - (chown $wwwuser "$htpasswd_file" || true) && create_sudo_configuration && if [ "$enable_mkeventd" = yes ] then @@ -999,7 +940,6 @@ EOF install -m 755 bin/mkevent bin/mkeventd $DESTDIR$bindir && install -m 4754 bin/mkeventd_open514 -g $wwwgroup $DESTDIR$bindir && mkdir -p $DESTDIR$confdir/mkeventd.d/wato && - chown $wwwuser.$wwwgroup $DESTDIR$confdir/mkeventd.d/wato && if [ ! -e "$DESTDIR$confdir/multisite.d/mkeventd.mk" ] ; then mkdir -p $DESTDIR$confdir/multisite.d && echo 'mkeventd_enabled = True' > $DESTDIR$confdir/multisite.d/mkeventd.mk

6 years, 3 months

Win-agent: remove dead code

by Jukka Aro

Module: check_mk Branch: master Commit: 0e2985752703c4880d3c14c0b332841c2342a105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e2985752703c4… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 15 15:08:58 2018 +0100 Win-agent: remove dead code The member variable _realtime_support in class Section was never used. --- agents/windows/Section.cc | 5 ----- agents/windows/Section.h | 6 +----- agents/windows/SectionManager.cc | 7 +++---- agents/windows/build_version | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/agents/windows/Section.cc b/agents/windows/Section.cc index c863a2a..1f6c4d5 100644 --- a/agents/windows/Section.cc +++ b/agents/windows/Section.cc @@ -62,11 +62,6 @@ Section::Section(const std::string &outputName, const std::string &configName, , _show_header(show_header) , _separator(separator) {} -Section *Section::withRealtimeSupport() { - _realtime_support = true; - return this; -} - bool Section::produceOutput(std::ostream &out, const std::optional<std::string> &remoteIP, bool nested) { diff --git a/agents/windows/Section.h b/agents/windows/Section.h index 62ad087..c9ff16f 100644 --- a/agents/windows/Section.h +++ b/agents/windows/Section.h @@ -54,8 +54,6 @@ public: virtual ~Section() = default; - Section *withRealtimeSupport(); - virtual void postprocessConfig() {} /// TODO please implement me @@ -66,9 +64,8 @@ public: * used by the section. The caller will give the threads a chance * to complete **/ - virtual std::vector<HANDLE> stopAsync() { return std::vector<HANDLE>(); } + virtual std::vector<HANDLE> stopAsync() { return {}; } virtual bool isEnabled() const { return true; } - virtual bool realtimeSupport() const { return _realtime_support; } bool produceOutput(std::ostream &out, const std::optional<std::string> &remoteIP, @@ -92,7 +89,6 @@ protected: private: const bool _show_header; const char _separator; - bool _realtime_support{false}; }; #endif // Section_h diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 489267d..739f74a 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -132,9 +132,9 @@ void SectionManager::loadStaticSections(Configuration &config, addSection(new SectionCheckMK(config, only_from, _script_statistics, _logger, _winapi)); addSection(new SectionUptime(_env, _logger, _winapi)); - addSection((new SectionDF(_env, _logger, _winapi))->withRealtimeSupport()); + addSection((new SectionDF(_env, _logger, _winapi))); addSection(new SectionPS(config, _logger, _winapi)); - addSection((new SectionMem(_env, _logger, _winapi))->withRealtimeSupport()); + addSection((new SectionMem(_env, _logger, _winapi))); addSection(new SectionFileinfo(config, _logger, _winapi)); addSection(new SectionServices(_env, _logger, _winapi)); @@ -143,8 +143,7 @@ void SectionManager::loadStaticSections(Configuration &config, addSection( (new SectionWinperf("phydisk", _env, _logger, _winapi))->withBase(234)); addSection((new SectionWinperf("processor", _env, _logger, _winapi)) - ->withBase(238) - ->withRealtimeSupport()); + ->withBase(238)); addSection(new SectionEventlog(config, _logger, _winapi)); addSection(new SectionLogwatch(config, _logger, _winapi)); diff --git a/agents/windows/build_version b/agents/windows/build_version index 38c07f5..babf97e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3176 +3178

6 years, 3 months

Win-agent: reduce no of Section constructor params

by Jukka Aro

Module: check_mk Branch: master Commit: f2cd38cff521601d5261724817d45647c0399fc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2cd38cff52160… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 15 15:46:26 2018 +0100 Win-agent: reduce no of Section constructor params Implement separator() as virtual member function with default value in base class and special values overriden in derived classes. --- agents/windows/Section.cc | 10 ++++------ agents/windows/Section.h | 4 ++-- agents/windows/build_version | 2 +- agents/windows/sections/SectionDF.cc | 2 +- agents/windows/sections/SectionDF.h | 1 + agents/windows/sections/SectionFileinfo.cc | 2 +- agents/windows/sections/SectionFileinfo.h | 1 + agents/windows/sections/SectionGroup.cc | 6 +++--- agents/windows/sections/SectionGroup.h | 3 +++ agents/windows/sections/SectionPS.cc | 2 +- agents/windows/sections/SectionPS.h | 1 + agents/windows/sections/SectionPerfcounter.cc | 2 +- agents/windows/sections/SectionPerfcounter.h | 2 ++ agents/windows/sections/SectionWMI.cc | 2 +- agents/windows/sections/SectionWMI.h | 1 + 15 files changed, 24 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f2cd38cff5…

6 years, 3 months

5791 FIX Fixed broken calculation of correct host check command

by Andreas Boesl

Module: check_mk Branch: master Commit: 12330eb2c1054d6e290a591a07cc1a0881f19d48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12330eb2c1054d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 15 16:12:44 2018 +0100 5791 FIX Fixed broken calculation of correct host check command Change-Id: Ib068c725872e1ed106d57fb5ac19dca0969e037e --- .werks/5791 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5791 b/.werks/5791 new file mode 100644 index 0000000..d638151 --- /dev/null +++ b/.werks/5791 @@ -0,0 +1,10 @@ +Title: Fixed broken calculation of correct host check command +Level: 2 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1521126740 +Class: fix + +

6 years, 3 months

Win-agent: reduce no of constructor params 2

by Jukka Aro

Module: check_mk Branch: master Commit: 7b47edbb6ab3658f3ed165b6af61360711c004b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b47edbb6ab365… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 15 16:14:19 2018 +0100 Win-agent: reduce no of constructor params 2 Implement showHeader() as virtual member function with default value in base class and special values overriden in derived classes. --- agents/windows/Section.cc | 7 +++---- agents/windows/Section.h | 18 ++++++++---------- agents/windows/build_version | 2 +- agents/windows/sections/SectionDF.cc | 2 +- agents/windows/sections/SectionFileinfo.cc | 3 +-- agents/windows/sections/SectionGroup.cc | 5 +++-- agents/windows/sections/SectionGroup.h | 2 ++ agents/windows/sections/SectionPS.cc | 2 +- agents/windows/sections/SectionPerfcounter.cc | 2 +- agents/windows/sections/SectionPluginGroup.cc | 2 +- agents/windows/sections/SectionPluginGroup.h | 2 ++ agents/windows/sections/SectionSpool.cc | 2 +- agents/windows/sections/SectionSpool.h | 3 +++ agents/windows/sections/SectionWMI.cc | 2 +- 14 files changed, 29 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b47edbb6a…

6 years, 3 months

Added logging for string/time range restrictions.

by Sven Panne

Module: check_mk Branch: master Commit: 1b727576dd6af534350cd2de06929580e030ed49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b727576dd6af5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 15 14:14:14 2018 +0100 Added logging for string/time range restrictions. Change-Id: I837bb15bf8107e68bd68d742562ee8faef8d3060 --- livestatus/src/Query.cc | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index f691e81..2c7101e 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -35,6 +35,7 @@ #include <utility> #include "Aggregator.h" #include "AndingFilter.h" +#include "ChronoUtils.h" #include "Column.h" #include "Filter.h" #include "Logger.h" @@ -713,12 +714,29 @@ void Query::finish(QueryRenderer &q) { std::optional<std::string> Query::stringValueRestrictionFor( const std::string &column_name) const { - return _filter->stringValueRestrictionFor(column_name); + auto result = _filter->stringValueRestrictionFor(column_name); + if (result) { + Debug(_logger) << "column " << _table.name() << "." << column_name + << " is restricted to '" << *result << "'"; + } else { + Debug(_logger) << "column " << _table.name() << "." << column_name + << " is unrestricted"; + } + return result; } void Query::findIntLimits(const std::string &column_name, int *lower, int *upper) const { - return _filter->findIntLimits(column_name, lower, upper, timezoneOffset()); + _filter->findIntLimits(column_name, lower, upper, timezoneOffset()); + // NOTE: Despite of the name of this method, we always use it for time + // ranges. + Debug(_logger) + << "column " << _table.name() << "." << column_name + << " is restricted to [" + << FormattedTimePoint(std::chrono::system_clock::from_time_t(*lower)) + << ", " + << FormattedTimePoint(std::chrono::system_clock::from_time_t(*upper)) + << ") resp. [" << *lower << ", " << *upper << ")"; } void Query::optimizeBitmask(const std::string &column_name,

6 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018