Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Fully encapsulate the filter in Query. Improve logging.

by Sven Panne

Module: check_mk Branch: master Commit: a8f257da8558043c98b8749cc6333b3c9d2afe3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8f257da855804… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 16:22:53 2018 +0100 Fully encapsulate the filter in Query. Improve logging. Change-Id: I176b0095c80098e86109681785c182789c3ab8c8 --- livestatus/src/Query.cc | 8 ++++++++ livestatus/src/Query.h | 5 ++++- livestatus/src/TableStateHistory.cc | 15 ++++++++------- livestatus/src/TableStateHistory.h | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index b97e071..d2e8528 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -712,6 +712,14 @@ void Query::finish(QueryRenderer &q) { } } +std::unique_ptr<Filter> Query::partialFilter( + const std::string &message, + std::function<bool(const Column &)> predicate) const { + auto result = _filter->partialFilter(predicate); + Debug(_logger) << "partial filter for " << message << ": " << *result; + return result; +} + std::optional<std::string> Query::stringValueRestrictionFor( const std::string &column_name) const { auto result = _filter->stringValueRestrictionFor(column_name); diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 21ff169..f86c5a8 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -70,6 +70,9 @@ public: const contact *authUser() const { return _auth_user; } std::chrono::seconds timezoneOffset() const { return _timezone_offset; } + std::unique_ptr<Filter> partialFilter( + const std::string &message, + std::function<bool(const Column &)> predicate) const; std::optional<std::string> stringValueRestrictionFor( const std::string &column_name) const; std::optional<int32_t> greatestLowerBoundFor( @@ -78,7 +81,7 @@ public: const std::string &column_name) const; std::optional<std::bitset<32>> valueSetLeastUpperBoundFor( const std::string &column_name) const; - const Filter *filter() const { return _filter.get(); } + const std::unordered_set<std::shared_ptr<Column>> &allColumns() const { return _all_columns; } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 55a2560..53385bf 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -266,16 +266,17 @@ private: // static std::unique_ptr<Filter> TableStateHistory::createPartialFilter( - const Filter &f) { - return f.partialFilter([](const Column &column) { - return mk::starts_with(column.name(), "current_") || - mk::starts_with(column.name(), "host_") || - mk::starts_with(column.name(), "service_"); - }); + const Query &query) { + return query.partialFilter( + "current host/service columns", [](const Column &column) { + return mk::starts_with(column.name(), "current_") || + mk::starts_with(column.name(), "host_") || + mk::starts_with(column.name(), "service_"); + }); } void TableStateHistory::answerQuery(Query *query) { - auto object_filter = createPartialFilter(*query->filter()); + auto object_filter = createPartialFilter(*query); std::lock_guard<std::mutex> lg(_log_cache->_lock); if (!_log_cache->logCachePreChecks()) { return; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 29ddc87..ad6fbbb 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -55,7 +55,7 @@ public: void answerQuery(Query *query) override; bool isAuthorized(Row row, const contact *ctc) const override; std::shared_ptr<Column> column(std::string colname) const override; - static std::unique_ptr<Filter> createPartialFilter(const Filter &f); + static std::unique_ptr<Filter> createPartialFilter(const Query &query); protected: bool _abort_query;

6 years, 6 months

cmk_base .f12 deploy all editions by default (just like web .f12)

by Lars Michelsen

Module: check_mk Branch: master Commit: 27e8039a6e5e251c5856feeba5e04aa0c7270eb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27e8039a6e5e25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 18 14:36:08 2018 +0100 cmk_base .f12 deploy all editions by default (just like web .f12) Change-Id: I2983998a23e86dde8bddf8b4a1426c9cc38fb6c7 --- cmk_base/.f12 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmk_base/.f12 b/cmk_base/.f12 index 53e74ff..41b925a 100755 --- a/cmk_base/.f12 +++ b/cmk_base/.f12 @@ -5,9 +5,20 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE +echo "Update site $SITE..." + +echo "Copy CRE files..." sudo rsync \ --exclude=cee \ --exclude=cee.py \ -a * $ROOT/lib/python/cmk_base/ sudo pycompile -q $ROOT/lib/python/cmk_base/cmk_base -echo "Installed to $ROOT/lib/python/cmk_base/" + +# Also deploy all other directories of same type +if [ ${ALL_EDITIONS:-1} != 0 ]; then + for WHAT in enterprise managed; do + if [ -e ../$WHAT/cmk_base/.f12 ]; then + (cd ../$WHAT/cmk_base ; ONLY_COPY=1 ALL_EDITIONS=0 bash .f12) + fi + done +fi

6 years, 6 months

Fixed WATO folder search (only in daily builds)

by Lars Michelsen

Module: check_mk Branch: master Commit: 97632e29360b6932a1e0f29851fee83c567148db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97632e29360b69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 20 16:03:38 2018 +0100 Fixed WATO folder search (only in daily builds) Change-Id: Ic2668fdd1d42896661d71b090e0c689fa1229dd0 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5d7311a..89109c1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2600,7 +2600,7 @@ class SearchFolder(BaseFolder): if varname.startswith("host_search_") \ or varname.startswith("_change"): url_vars.append((varname, value)) - return self.parent().url(url_vars, filename="wato.py") + return self.parent().url(url_vars)

6 years, 6 months

Make smart constructors even smarter.

by Sven Panne

Module: check_mk Branch: master Commit: 7156acda5aab4d4c74225cf970297f9658c5b616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7156acda5aab4d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 10:49:15 2018 +0100 Make smart constructors even smarter. Change-Id: Ie650c4094e06b2fe68f5f54a20f74195729b8876 --- livestatus/src/AndingFilter.cc | 4 +++- livestatus/src/OringFilter.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 98d967d..2b03b5f 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -43,7 +43,9 @@ std::unique_ptr<Filter> AndingFilter::make(Kind kind, Filters subfilters) { std::make_move_iterator(conjuncts.begin()), std::make_move_iterator(conjuncts.end())); } - return std::make_unique<AndingFilter>(kind, std::move(filters), Secret()); + return filters.size() == 1 ? std::move(filters[0]) + : std::make_unique<AndingFilter>( + kind, std::move(filters), Secret()); } bool AndingFilter::accepts(Row row, const contact *auth_user, diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index d184014..04b0132 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -43,7 +43,9 @@ std::unique_ptr<Filter> OringFilter::make(Kind kind, Filters subfilters) { std::make_move_iterator(disjuncts.begin()), std::make_move_iterator(disjuncts.end())); } - return std::make_unique<OringFilter>(kind, std::move(filters), Secret()); + return filters.size() == 1 ? std::move(filters[0]) + : std::make_unique<OringFilter>( + kind, std::move(filters), Secret()); } bool OringFilter::accepts(Row row, const contact *auth_user,

6 years, 6 months

Simplified and extended calculation of possible values for integral columns.

by Sven Panne

Module: check_mk Branch: master Commit: cb1175e66ec32964cb5ddb80665564fee93b2f08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb1175e66ec329… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 20 10:14:54 2018 +0100 Simplified and extended calculation of possible values for integral columns. Change-Id: I69b44323c936d0e50e340f59460e035c6580f23c --- livestatus/src/AndingFilter.cc | 16 ++++--- livestatus/src/AndingFilter.h | 6 ++- livestatus/src/Filter.cc | 8 ++-- livestatus/src/Filter.h | 6 ++- livestatus/src/IntFilter.cc | 99 ++++++++++++--------------------------- livestatus/src/IntFilter.h | 6 ++- livestatus/src/OringFilter.cc | 22 ++++----- livestatus/src/OringFilter.h | 6 ++- livestatus/src/Query.cc | 16 +++++-- livestatus/src/Query.h | 5 +- livestatus/src/StringUtils.h | 18 ++++++++ livestatus/src/TableLog.cc | 10 ++-- livestatus/src/TimeFilter.cc | 102 +++++++++++++---------------------------- livestatus/src/TimeFilter.h | 6 ++- 14 files changed, 144 insertions(+), 182 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb1175e66e…

6 years, 6 months

Update win agent updater Make routine

by Andreas Umbreit

Module: check_mk Branch: master Commit: 5d8a942f92ba3445cf143c14d9bdf272b7af45e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d8a942f92ba34… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Mar 16 13:37:42 2018 +0100 Update win agent updater Make routine Change-Id: I3cde1eaf895c3fdc044190112de7dc87bbfcf830 --- .../windows/frozen_binaries/pyinstaller-deps.make | 24 ++++++++++++--------- agents/windows/frozen_binaries/src/.gitignore | 1 - .../src/pip/PyInstaller-3.2.1.tar.bz2 | Bin 0 -> 2441721 bytes .../src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl | Bin 0 -> 97896 bytes .../pip/certifi-2017.7.27.1-py2.py3-none-any.whl | Bin 0 -> 349554 bytes .../src/pip/cffi-1.10.0-cp27-cp27m-win32.whl | Bin 0 -> 147485 bytes .../src/pip/chardet-3.0.4-py2.py3-none-any.whl | Bin 0 -> 133356 bytes .../pip/cryptography-2.0.3-cp27-cp27m-win32.whl | Bin 0 -> 1106984 bytes .../src/pip/enum34-1.1.6-py2-none-any.whl | Bin 0 -> 12427 bytes .../frozen_binaries/src/pip/future-0.16.0.tar.gz | Bin 0 -> 824484 bytes .../src/pip/idna-2.6-py2.py3-none-any.whl | Bin 0 -> 56450 bytes .../src/pip/ipaddress-1.0.18-py2-none-any.whl | Bin 0 -> 17511 bytes .../src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl | Bin 0 -> 52643 bytes .../frozen_binaries/src/pip/pycparser-2.18.tar.gz | Bin 0 -> 245897 bytes .../src/pip/pypiwin32-219-cp27-none-win32.whl | Bin 0 -> 6651109 bytes .../src/pip/requests-2.18.4-py2.py3-none-any.whl | Bin 0 -> 88704 bytes .../src/pip/setuptools-36.2.7-py2.py3-none-any.whl | Bin 0 -> 477476 bytes .../src/pip/six-1.10.0-py2.py3-none-any.whl | Bin 0 -> 10341 bytes .../src/pip/urllib3-1.22-py2.py3-none-any.whl | Bin 0 -> 132332 bytes 19 files changed, 14 insertions(+), 11 deletions(-) diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index c4c9a11..1b0530a 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -1,4 +1,4 @@ -.PHONY: new_packages +.PHONY: new_packages actual_packages # Python 2.7.13 yields a bug concerning the LoadLibrary() function on windows, # see http://bugs.python.org/issue29082 . Use 2.7.12 instead. @@ -92,6 +92,18 @@ $(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe mkdir -p $(CURDIR)/src/pip && \ cp --no-clobber -r * $(CURDIR)/src/pip +current_packages: $(PYTHON_PACKAGES) + +src/vcredist_x86.exe: + mkdir -p src && \ + cd src && \ + curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… + +download_sources: src/python-$(PYTHON_VERSION).msi current_packages src/vcredist_x86.exe + +setup: + sudo apt-get install scons upx-ucl wine + new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe # Use this target to obtain the newest versions of the needed packages. # You should update the explicit dependencies afterwars because the automatic @@ -106,12 +118,4 @@ new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe wine c:\\Python27\\python.exe -m pip download pyinstaller && \ wine c:\\Python27\\python.exe -m pip download pyOpenSSL && \ mkdir -p $(CURDIR)/src/pip && \ - cp -r * $(CURDIR)/src/pip - -src/vcredist_x86.exe: - mkdir -p src && \ - cd src && \ - curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… - -setup: - sudo apt-get install scons upx-ucl wine + cp -r * $(CURDIR)/src/pip \ No newline at end of file diff --git a/agents/windows/frozen_binaries/src/.gitignore b/agents/windows/frozen_binaries/src/.gitignore index cfeb945..042fb59 100644 --- a/agents/windows/frozen_binaries/src/.gitignore +++ b/agents/windows/frozen_binaries/src/.gitignore @@ -1,4 +1,3 @@ -python-*.msi get-pip.py pyinstaller virtual-wine diff --git a/agents/windows/frozen_binaries/src/pip/PyInstaller-3.2.1.tar.bz2 b/agents/windows/frozen_binaries/src/pip/PyInstaller-3.2.1.tar.bz2 new file mode 100644 index 0000000..4731c05 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/PyInstaller-3.2.1.tar.bz2 differ diff --git a/agents/windows/frozen_binaries/src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl new file mode 100644 index 0000000..1f15e7e Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl new file mode 100644 index 0000000..df07fc0 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/cffi-1.10.0-cp27-cp27m-win32.whl b/agents/windows/frozen_binaries/src/pip/cffi-1.10.0-cp27-cp27m-win32.whl new file mode 100644 index 0000000..75240f8 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/cffi-1.10.0-cp27-cp27m-win32.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/chardet-3.0.4-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/chardet-3.0.4-py2.py3-none-any.whl new file mode 100644 index 0000000..d276977 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/chardet-3.0.4-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl b/agents/windows/frozen_binaries/src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl new file mode 100644 index 0000000..0f50180 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/enum34-1.1.6-py2-none-any.whl b/agents/windows/frozen_binaries/src/pip/enum34-1.1.6-py2-none-any.whl new file mode 100644 index 0000000..12be7c7 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/enum34-1.1.6-py2-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/future-0.16.0.tar.gz b/agents/windows/frozen_binaries/src/pip/future-0.16.0.tar.gz new file mode 100644 index 0000000..271b7e0 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/future-0.16.0.tar.gz differ diff --git a/agents/windows/frozen_binaries/src/pip/idna-2.6-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/idna-2.6-py2.py3-none-any.whl new file mode 100644 index 0000000..11cb414 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/idna-2.6-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/ipaddress-1.0.18-py2-none-any.whl b/agents/windows/frozen_binaries/src/pip/ipaddress-1.0.18-py2-none-any.whl new file mode 100644 index 0000000..8c2a276 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/ipaddress-1.0.18-py2-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl new file mode 100644 index 0000000..e282b6b Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/pycparser-2.18.tar.gz b/agents/windows/frozen_binaries/src/pip/pycparser-2.18.tar.gz new file mode 100644 index 0000000..1b29804 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/pycparser-2.18.tar.gz differ diff --git a/agents/windows/frozen_binaries/src/pip/pypiwin32-219-cp27-none-win32.whl b/agents/windows/frozen_binaries/src/pip/pypiwin32-219-cp27-none-win32.whl new file mode 100644 index 0000000..20cca17 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/pypiwin32-219-cp27-none-win32.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/requests-2.18.4-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/requests-2.18.4-py2.py3-none-any.whl new file mode 100644 index 0000000..cf3bdc0 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/requests-2.18.4-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/setuptools-36.2.7-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/setuptools-36.2.7-py2.py3-none-any.whl new file mode 100644 index 0000000..d63cdc7 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/setuptools-36.2.7-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/six-1.10.0-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/six-1.10.0-py2.py3-none-any.whl new file mode 100644 index 0000000..0887261 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/six-1.10.0-py2.py3-none-any.whl differ diff --git a/agents/windows/frozen_binaries/src/pip/urllib3-1.22-py2.py3-none-any.whl b/agents/windows/frozen_binaries/src/pip/urllib3-1.22-py2.py3-none-any.whl new file mode 100644 index 0000000..d446499 Binary files /dev/null and b/agents/windows/frozen_binaries/src/pip/urllib3-1.22-py2.py3-none-any.whl differ

6 years, 6 months

Win-agent: remove floating point I/O manipulators

by Jukka Aro

Module: check_mk Branch: master Commit: 06e4fd36471a455169c8893e46e83e57b6ea6157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06e4fd36471a45… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 20 12:58:36 2018 +0100 Win-agent: remove floating point I/O manipulators Clear some unnecessary floating point I/O manipulators as they were leftovers from previous commits as the output types were changed from floating point to integer types. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionFileinfo.cc | 4 ++-- agents/windows/sections/SectionSystemtime.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 517d20b..c8ae077 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3196 +3198 diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index 170d213..130c59a 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -41,7 +41,7 @@ SectionFileinfo::SectionFileinfo(Configuration &config, Logger *logger, bool SectionFileinfo::produceOutputInner(std::ostream &out, const std::optional<std::string> &) { Debug(_logger) << "SectionFileinfo::produceOutputInner"; - out << std::fixed << section_helpers::current_time() << "\n"; + out << section_helpers::current_time() << "\n"; for (const std::string &path : *_fileinfo_paths) { outputFileinfos(out, path.c_str()); @@ -149,7 +149,7 @@ bool SectionFileinfo::outputFileinfo(std::ostream &out, out << filename << "|" << fs::file_size(path) << "|"; const auto timeEntry = chrono::duration_cast<chrono::seconds>( fs::last_write_time(path).time_since_epoch()); - out << std::fixed << std::setprecision(0) << timeEntry.count() << "\n"; + out << timeEntry.count() << "\n"; return true; } catch (const fs::filesystem_error &e) { Error(_logger) << e.what(); diff --git a/agents/windows/sections/SectionSystemtime.cc b/agents/windows/sections/SectionSystemtime.cc index bbb59c3..afde771 100644 --- a/agents/windows/sections/SectionSystemtime.cc +++ b/agents/windows/sections/SectionSystemtime.cc @@ -33,6 +33,6 @@ SectionSystemtime::SectionSystemtime(const Environment &env, Logger *logger, bool SectionSystemtime::produceOutputInner(std::ostream &out, const std::optional<std::string> &) { Debug(_logger) << "SectionSystemtime::produceOutputInner"; - out << std::fixed << section_helpers::current_time(); + out << section_helpers::current_time(); return true; }

6 years, 6 months

Win_agent: use std library for file write time

by Jukka Aro

Module: check_mk Branch: master Commit: fc99702ccc2e615a3eb7092ae86875c369fdcee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc99702ccc2e61… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 20 12:00:48 2018 +0100 Win_agent: use std library for file write time std::experimental::filesystem::last_write_time does the trick easier than WinAPI FindFirstFile and conversions from the fields of the resulting WIN32_FIND_DATA struct. --- agents/windows/build_version | 2 +- agents/windows/sections/Section.cc | 15 ------------ agents/windows/sections/SectionFileinfo.cc | 24 +++++++++++-------- agents/windows/sections/SectionPS.cc | 20 +++++++++++++--- agents/windows/sections/SectionSpool.cc | 37 ++++++++++-------------------- 5 files changed, 44 insertions(+), 54 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b4ca7ef..517d20b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3194 +3196 diff --git a/agents/windows/sections/Section.cc b/agents/windows/sections/Section.cc index ea2380e..60cf4be 100644 --- a/agents/windows/sections/Section.cc +++ b/agents/windows/sections/Section.cc @@ -27,21 +27,6 @@ #include "Environment.h" #include "Logger.h" -namespace section_helpers { - -static const double SEC_TO_UNIX_EPOCH = 11644473600.0; -static const double WINDOWS_TICK = 10000000.0; - -double file_time(const FILETIME *filetime) { - ULARGE_INTEGER uli{0}; - uli.LowPart = filetime->dwLowDateTime; - uli.HighPart = filetime->dwHighDateTime; - - return (double(uli.QuadPart) / WINDOWS_TICK) - SEC_TO_UNIX_EPOCH; -} - -} // namespace section_helpers - Section::Section(const std::string &outputName, const std::string &configName, const Environment &env, Logger *logger, const WinApiAdaptor &winapi) diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index a3a51a1..170d213 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -23,11 +23,16 @@ // Boston, MA 02110-1301 USA. #include "SectionFileinfo.h" +#include <chrono> #include <cstring> +#include <experimental/filesystem> #include <iomanip> #include <sstream> #include "Logger.h" +namespace chrono = std::chrono; +namespace fs = std::experimental::filesystem; + SectionFileinfo::SectionFileinfo(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : Section("fileinfo", "fileinfo", config.getEnvironment(), logger, winapi) @@ -138,17 +143,16 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { bool SectionFileinfo::outputFileinfo(std::ostream &out, const std::string filename) { - WIN32_FIND_DATA findData; - SearchHandle findHandle{_winapi.FindFirstFile(filename.c_str(), &findData), - _winapi}; - if (findHandle) { - unsigned long long size = - (unsigned long long)findData.nFileSizeLow + - (((unsigned long long)findData.nFileSizeHigh) << 32); - out << filename << "|" << size << "|" << std::fixed - << std::setprecision(0) - << section_helpers::file_time(&findData.ftLastWriteTime) << "\n"; + const fs::path path{filename}; + + try { + out << filename << "|" << fs::file_size(path) << "|"; + const auto timeEntry = chrono::duration_cast<chrono::seconds>( + fs::last_write_time(path).time_since_epoch()); + out << std::fixed << std::setprecision(0) << timeEntry.count() << "\n"; return true; + } catch (const fs::filesystem_error &e) { + Error(_logger) << e.what(); } return false; } diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index df0598c..46966ed 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -29,6 +29,21 @@ #include "PerfCounter.h" #include "dynamic_func.h" +namespace { + +const unsigned long long SEC_TO_UNIX_EPOCH = 11644473600L; +const unsigned long WINDOWS_TICK = 10000000; + +inline unsigned long long sinceEpoch(const FILETIME &filetime) { + ULARGE_INTEGER uli{0}; + uli.LowPart = filetime.dwLowDateTime; + uli.HighPart = filetime.dwHighDateTime; + + return uli.QuadPart / WINDOWS_TICK - SEC_TO_UNIX_EPOCH; +} + +} // namespace + SectionPS::SectionPS(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : Section("ps", "ps", config.getEnvironment(), logger, winapi) @@ -308,9 +323,8 @@ bool SectionPS::outputNative(std::ostream &out) { } // Uptime - double ft = section_helpers::file_time(&createTime); - ULONGLONG uptime = - static_cast<ULONGLONG>(section_helpers::current_time() - ft); + auto uptime = static_cast<unsigned long long>( + section_helpers::current_time() - sinceEpoch(createTime)); // Note: CPU utilization is determined out of usermodetime and // kernelmodetime diff --git a/agents/windows/sections/SectionSpool.cc b/agents/windows/sections/SectionSpool.cc index efff191..105aa04 100644 --- a/agents/windows/sections/SectionSpool.cc +++ b/agents/windows/sections/SectionSpool.cc @@ -24,12 +24,14 @@ #include "SectionSpool.h" #include <sys/types.h> +#include <chrono> #include <experimental/filesystem> #include "Environment.h" #include "Logger.h" #include "WinApiAdaptor.h" #include "types.h" +namespace chrono = std::chrono; namespace fs = std::experimental::filesystem; SectionSpool::SectionSpool(const Environment &env, Logger *logger, @@ -43,37 +45,22 @@ bool SectionSpool::produceOutputInner(std::ostream &out, // the agent output. The name of the files may begin with a number // of digits. If this is the case then it is interpreted as a time // in seconds: the maximum allowed age of the file. Outdated files - // are simply being ignored. - // - time_t now = time(0); - + // are simply ignored. for (const auto &de : fs::directory_iterator(_env.spoolDirectory())) { const auto &path = de.path(); const auto filename = path.filename().string(); const int max_age = isdigit(filename[0]) ? atoi(filename.c_str()) : -1; if (max_age >= 0) { - WIN32_FIND_DATA filedata{0}; - SearchHandle searchHandle{ - _winapi.FindFirstFileEx(path.string().c_str(), - FindExInfoStandard, &filedata, - FindExSearchNameMatch, NULL, 0), - _winapi}; - if (searchHandle) { - double mtime = - section_helpers::file_time(&(filedata.ftLastWriteTime)); - int age = now - mtime; - if (age > max_age) { - Informational(_logger) - << " " << filename - << ": skipping outdated file: age is " << age - << " sec, " - << "max age is " << max_age << " sec."; - continue; - } - } else { - Warning(_logger) - << " " << filename << ": cannot determine file age"; + const auto age = + chrono::duration_cast<chrono::seconds>( + chrono::system_clock::now() - fs::last_write_time(path)) + .count(); + if (age > max_age) { + Informational(_logger) + << " " << filename << ": skipping outdated file: age is " + << age << " sec, " + << "max age is " << max_age << " sec."; continue; } }

6 years, 6 months

Win-agent: execute build commands in subshells

by Jukka Aro

Module: check_mk Branch: master Commit: 4a956de8262774589662ee6b407bf62c316680eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a956de8262774… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 16:36:53 2018 +0100 Win-agent: execute build commands in subshells Run build commands that need a cd to a subdirectory in a subshell. This also fixes the weird file manager pop-up with at least Cinnamon desktop env. --- agents/windows/build-agent | 104 +++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/agents/windows/build-agent b/agents/windows/build-agent index abd8437..fc7e68e 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -18,65 +18,67 @@ set -e . /$CHROOT_BUILD_DIR/agents/windows/build.sh parse-args "$@" -# For some weird reason, saving the target dir for 'cd' in an intermediate -# variable is necessary to prevent some desktop env's (at least Cinnamon) -# from opening a fresh file manager window! Please do not ask why... + windowsdir="/$CHROOT_BUILD_DIR/agents/windows" -cd "$windowsdir" +( + cd "/$CHROOT_BUILD_DIR/agents/windows" -autoreconf --install + autoreconf --install -build_archs=(32 64) + build_archs=(32 64) -if [[ " $targets " =~ " integrationtest " && "$targets" != integrationtest ]] ; then - echo "integrationtest cannot be combined with other targets" - exit 1 -fi + if [[ " $targets " =~ " integrationtest " && "$targets" != integrationtest ]] ; then + echo "integrationtest cannot be combined with other targets" + exit 1 + fi -if [[ " $targets " =~ " check " && "$targets" != check ]] ; then - echo "check cannot be combined with other targets" - exit 1 -fi + if [[ " $targets " =~ " check " && "$targets" != check ]] ; then + echo "check cannot be combined with other targets" + exit 1 + fi -if [[ "$targets" == unittest || "$targets" == integrationtest ]] ; then - # Only unittest or integrationtest - build_archs=() -elif [[ "$targets" == check ]] ; then - build_archs=(64) -elif [[ " $targets " =~ " unittest " ]] ; then - # unittest together with other target(s) - targets=${targets/unittest/} -fi + if [[ "$targets" == unittest || "$targets" == integrationtest ]] ; then + # Only unittest or integrationtest + build_archs=() + elif [[ "$targets" == check ]] ; then + build_archs=(64) + elif [[ " $targets " =~ " unittest " ]] ; then + # unittest together with other target(s) + targets=${targets/unittest/} + fi -# Build 32 and 64 bit in parallel, wait for child processes to terminate. -children=() -for arch in "${build_archs[@]}" ; do - build $arch & - children+=($!) -done + # Build 32 and 64 bit in parallel, wait for child processes to terminate. + children=() + for arch in "${build_archs[@]}" ; do + build $arch & + children+=($!) + done -for pid in "${children[@]}" ; do - # If any subprocess fails, wait for the rest to exit in a controlled way. - wait $pid || { wait; exit 1; } -done + for pid in "${children[@]}" ; do + # If any subprocess fails, wait for the rest to exit in a controlled way. + wait $pid || { wait; exit 1; } + done -# If no special targets given, produce msi installer as post-install step. -if [[ -z "$targets" ]] ; then - VERSION=$(grep PACKAGE_VERSION= configure | sed "s/.*\x27$.*$\x27/\1/g") - cd msibuild - make BUILD_VERSION=$(cat ../build_version) CHECK_MK_VERSION=$VERSION - chmod +x check_mk_agent.msi - mv check_mk_agent.msi .. - cd - -fi + # If no special targets given, produce msi installer as post-install step. + if [[ -z "$targets" ]] ; then + VERSION=$(grep PACKAGE_VERSION= configure | sed "s/.*\x27$.*$\x27/\1/g") + ( + cd msibuild + make BUILD_VERSION=$(cat ../build_version) CHECK_MK_VERSION=$VERSION + chmod +x check_mk_agent.msi + mv check_mk_agent.msi .. + cd - + ) + fi -if [[ ! "$targets" =~ clean && "$targets" != integrationtest ]] ; then - # Run unittest only in 64 bit - targets=unittest - build 64 -fi + if [[ ! "$targets" =~ clean && "$targets" != integrationtest ]] ; then + # Run unittest only in 64 bit + targets=unittest + build 64 + fi -if [[ " $targets " =~ " integrationtest " ]] ; then - targets=integrationtest - build 64 -fi + if [[ " $targets " =~ " integrationtest " ]] ; then + targets=integrationtest + build 64 + fi +)

6 years, 6 months

Win-agent: remove GetSystemTime from WinApi

by Jukka Aro

Module: check_mk Branch: master Commit: d679c7187e2749a462d378561d7e87aa2fcadcc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d679c7187e2749… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 19 16:39:17 2018 +0100 Win-agent: remove GetSystemTime from WinApi The WinAPI call is no longer used, remove it from WinApi*. --- agents/windows/WinApi.cc | 4 ---- agents/windows/WinApi.h | 1 - agents/windows/WinApiAdaptor.h | 1 - agents/windows/build_version | 2 +- agents/windows/test/MockWinApi.h | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/agents/windows/WinApi.cc b/agents/windows/WinApi.cc index b68051d..6c2bb66 100644 --- a/agents/windows/WinApi.cc +++ b/agents/windows/WinApi.cc @@ -411,10 +411,6 @@ VOID WinApi::GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const { return ::GetSystemInfo(lpSystemInfo); } -VOID WinApi::GetSystemTime(LPSYSTEMTIME lpSystemTime) const { - return ::GetSystemTime(lpSystemTime); -} - WINBOOL WinApi::GetVersionEx(LPOSVERSIONINFO lpVersionInformation) const { return ::GetVersionExA(lpVersionInformation); } diff --git a/agents/windows/WinApi.h b/agents/windows/WinApi.h index 719f4a0..7d84d6a 100644 --- a/agents/windows/WinApi.h +++ b/agents/windows/WinApi.h @@ -197,7 +197,6 @@ public: LPFILETIME lpUserTime) const override; virtual VOID GetStartupInfo(LPSTARTUPINFO lpStartupInfo) const override; virtual VOID GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const override; - virtual VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) const override; virtual WINBOOL GetVersionEx( LPOSVERSIONINFO lpVersionInformation) const override; virtual WINBOOL GetVolumeInformation( diff --git a/agents/windows/WinApiAdaptor.h b/agents/windows/WinApiAdaptor.h index 788eef9..9b57695 100644 --- a/agents/windows/WinApiAdaptor.h +++ b/agents/windows/WinApiAdaptor.h @@ -245,7 +245,6 @@ public: LPFILETIME lpUserTime) const = 0; virtual VOID GetStartupInfo(LPSTARTUPINFO lpStartupInfo) const = 0; virtual VOID GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) const = 0; - virtual VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) const = 0; virtual WINBOOL GetVersionEx( LPOSVERSIONINFO lpVersionInformation) const = 0; virtual WINBOOL GetVolumeInformation( diff --git a/agents/windows/build_version b/agents/windows/build_version index 19d718c..b4ca7ef 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3192 +3194 diff --git a/agents/windows/test/MockWinApi.h b/agents/windows/test/MockWinApi.h index 9a5c749..f0168cc 100644 --- a/agents/windows/test/MockWinApi.h +++ b/agents/windows/test/MockWinApi.h @@ -222,7 +222,6 @@ public: LPFILETIME lpUserTime)); MOCK_CONST_METHOD1(GetStartupInfo, VOID(LPSTARTUPINFO lpStartupInfo)); MOCK_CONST_METHOD1(GetSystemInfo, VOID(LPSYSTEM_INFO lpSystemInfo)); - MOCK_CONST_METHOD1(GetSystemTime, VOID(LPSYSTEMTIME lpSystemTime)); MOCK_CONST_METHOD1(GetVersionEx, WINBOOL(LPOSVERSIONINFO lpVersionInformation)); MOCK_CONST_METHOD8(

6 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
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