Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Use scm.branches[0].name to get the branch name

by Alex Zurhake

Module: check_mk Branch: master Commit: 503accdc73f3a13191fe92a81d187055d9d2b5b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=503accdc73f3a1… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Apr 12 07:49:09 2019 +0200 Use scm.branches[0].name to get the branch name The variable BRANCH_NAME does only exist in Multibranch Pipleines, in normal Pipelines this variable needs to be used and the usage needs to be authorized (gui). Change-Id: I9e2b5daade9acf9dfcf1832465d9ddd502f55447 --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 6e31e87..d24562d 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -24,7 +24,7 @@ def DOCKER_BUILDS = [:] def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERS = dateFormat.format(date) -def DAILY_DATA = '/var/jenkins_home/daily-data/' + BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS +def DAILY_DATA = '/var/jenkins_home/daily-data/' + env.BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS def PACKAGE_DIR = '/bauwelt/download' def GPG_KEY_DIR = '/bauwelt/etc/.gnupg'

5 years, 5 months

Synched expected package sizes once again.

by Sven Panne

Module: check_mk Branch: master Commit: 9d88d8b7c5a18c0d56570ca0f4b00d3ce686e984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d88d8b7c5a18c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 17:14:52 2019 +0200 Synched expected package sizes once again. Change-Id: Ie3f248c2531bad7a7a74c8e1fff78566153cde0f --- tests/packaging/test_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 7dab14b..584af05 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -28,7 +28,7 @@ def _get_package_paths(version_path, what): @pytest.mark.parametrize("what,min_size,max_size", [ ("rpm", 168 * 1024 * 1024, 203 * 1024 * 1024), ("deb", 132 * 1024 * 1024, 144 * 1024 * 1024), - ("cma", 243 * 1024 * 1024, 253 * 1024 * 1024), + ("cma", 235 * 1024 * 1024, 245 * 1024 * 1024), ("tar.gz", 401 * 1024 * 1024, 443 * 1024 * 1024), ]) def test_package_sizes(version_path, what, min_size, max_size):

5 years, 5 months

Untie the knot between Store and NagiosCore, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: 665267687fef050c28985ea9ab9cd4a6b18e13b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=665267687fef05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 16:19:55 2019 +0200 Untie the knot between Store and NagiosCore, part 3. Change-Id: I18bbe87ace688052dc97e1dd45a5423829b4e724 --- livestatus/src/DynamicLogwatchFileColumn.cc | 4 +++- livestatus/src/HostFileColumn.cc | 10 ++++++---- livestatus/src/HostFileColumn.h | 6 ++++-- livestatus/src/TableHosts.cc | 9 +++++---- livestatus/src/test/test_OffsetStringMacroColumn.cc | 9 +++++++++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/livestatus/src/DynamicLogwatchFileColumn.cc b/livestatus/src/DynamicLogwatchFileColumn.cc index 21f2831..197bec5 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.cc +++ b/livestatus/src/DynamicLogwatchFileColumn.cc @@ -63,7 +63,9 @@ std::unique_ptr<Column> DynamicLogwatchFileColumn::createColumn( "': file name '" + arguments + "' contains slash"); } + auto mc = _mc; + auto suffix = "/" + unescape_filename(arguments); return std::make_unique<HostFileColumn>( name, "Contents of logwatch file", _indirect_offset, _extra_offset, -1, - 0, _mc->mkLogwatchPath(), "/" + unescape_filename(arguments)); + 0, [mc]() { return mc->mkLogwatchPath(); }, suffix); } diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index c201343..62437ec 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -43,14 +43,16 @@ HostFileColumn::HostFileColumn(const std::string& name, const std::string& description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset, - std::string base_dir, std::string suffix) + std::function<std::string()> get_base_dir, + std::string suffix) : BlobColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) - , _base_dir(std::move(base_dir)) + , _get_base_dir(std::move(get_base_dir)) , _suffix(std::move(suffix)) {} std::unique_ptr<std::vector<char>> HostFileColumn::getValue(Row row) const { - if (_base_dir.empty()) { + auto base_dir = _get_base_dir(); + if (base_dir.empty()) { return nullptr; // Path is not configured } @@ -68,7 +70,7 @@ std::unique_ptr<std::vector<char>> HostFileColumn::getValue(Row row) const { std::string host_name = hst->name; #endif - std::string path = _base_dir + "/" + host_name + _suffix; + std::string path = base_dir + "/" + host_name + _suffix; int fd = open(path.c_str(), O_RDONLY); if (fd == -1) { // It is OK when inventory/logwatch files do not exist. diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index d122c98..f242843 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -26,6 +26,7 @@ #define HostFileColumn_h #include "config.h" // IWYU pragma: keep +#include <functional> #include <memory> #include <string> #include <vector> @@ -36,13 +37,14 @@ class HostFileColumn : public BlobColumn { public: HostFileColumn(const std::string& name, const std::string& description, int indirect_offset, int extra_offset, - int extra_extra_offset, int offset, std::string base_dir, + int extra_extra_offset, int offset, + std::function<std::string()> get_base_dir, std::string suffix); std::unique_ptr<std::vector<char>> getValue(Row row) const override; private: - std::string _base_dir; + std::function<std::string()> _get_base_dir; std::string _suffix; }; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index d3e7de8..c1e7c44 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -75,6 +75,7 @@ std::string TableHosts::namePrefix() const { return "host_"; } // static void TableHosts::addColumns(Table *table, const std::string &prefix, int indirect_offset, int extra_offset) { + auto mc = table->core(); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "name", "Host name", indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, name))); @@ -643,17 +644,17 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<HostFileColumn>( prefix + "mk_inventory", "The file content of the Check_MK HW/SW-Inventory", indirect_offset, - extra_offset, -1, 0, table->core()->mkInventoryPath(), "")); + extra_offset, -1, 0, [mc]() { return mc->mkInventoryPath(); }, "")); table->addColumn(std::make_unique<HostFileColumn>( prefix + "mk_inventory_gz", "The gzipped file content of the Check_MK HW/SW-Inventory", - indirect_offset, extra_offset, -1, 0, table->core()->mkInventoryPath(), - ".gz")); + indirect_offset, extra_offset, -1, 0, + [mc]() { return mc->mkInventoryPath(); }, ".gz")); table->addColumn(std::make_unique<HostFileColumn>( prefix + "structured_status", "The file content of the structured status of the Check_MK HW/SW-Inventory", indirect_offset, extra_offset, -1, 0, - table->core()->structuredStatusPath(), "")); + [mc]() { return mc->structuredStatusPath(); }, "")); table->addColumn(std::make_unique<LogwatchListColumn>( prefix + "mk_logwatch_files", diff --git a/livestatus/src/test/test_OffsetStringMacroColumn.cc b/livestatus/src/test/test_OffsetStringMacroColumn.cc index b98766c..ca721b3 100644 --- a/livestatus/src/test/test_OffsetStringMacroColumn.cc +++ b/livestatus/src/test/test_OffsetStringMacroColumn.cc @@ -6,9 +6,18 @@ #include "OffsetStringHostMacroColumn.h" #include "OffsetStringServiceMacroColumn.h" #include "Row.h" +#include "Store.h" #include "gtest/gtest.h" #include "nagios.h" +// TODO(sp) Move this to a better place. +TEST(Store, dont_use_mc) { + // Make sure that the MonitoringCore abstraction is not accessed during the + // construction of Store. This is a bit fragile, but it is needed to tie the + // knot between NagiosCore and Store. + Store store{nullptr}; +} + extern char *macro_user[MAX_USER_MACROS]; namespace {

5 years, 5 months

Untie the knot between Store and NagiosCore, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: 25341cc2cdb07774798e4efd6ce15da5bb3658c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25341cc2cdb077… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 13:58:24 2019 +0200 Untie the knot between Store and NagiosCore, part 2. Change-Id: I2f6ff7d6a08c78708f78250c6f7d1940b2204ca4 --- livestatus/src/DynamicColumn.cc | 5 ++--- livestatus/src/DynamicColumn.h | 4 +--- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 4 ++-- livestatus/src/DynamicLogwatchFileColumn.h | 7 +++---- livestatus/src/Store.h | 9 ++++++--- livestatus/src/TableHosts.cc | 4 ++-- livestatus/src/TableStatus.h | 7 +++++++ 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index fd1423f..8992dbf 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -26,11 +26,10 @@ #include <utility> DynamicColumn::DynamicColumn(std::string name, std::string description, - Logger *logger, int indirect_offset, - int extra_offset, int extra_extra_offset) + int indirect_offset, int extra_offset, + int extra_extra_offset) : _name(std::move(name)) , _description(std::move(description)) - , _logger(logger) , _indirect_offset(indirect_offset) , _extra_offset(extra_offset) , _extra_extra_offset(extra_extra_offset) {} diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index 493cfe4..d39d5f7 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -29,11 +29,10 @@ #include <memory> #include <string> class Column; -class Logger; class DynamicColumn { public: - DynamicColumn(std::string name, std::string description, Logger *logger, + DynamicColumn(std::string name, std::string description, int indirect_offset, int extra_offset, int extra_extra_offset); virtual ~DynamicColumn(); @@ -44,7 +43,6 @@ public: protected: const std::string _name; const std::string _description; // Note: Currently unused! - Logger *const _logger; const int _indirect_offset; const int _extra_offset; const int _extra_extra_offset; diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index eadcde3..f7fc2d1 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -74,8 +74,8 @@ private: DynamicEventConsoleReplicationColumn::DynamicEventConsoleReplicationColumn( const std::string &name, const std::string &description, MonitoringCore *mc, int indirect_offset, int extra_offset, int extra_extra_offset) - : DynamicColumn(name, description, mc->loggerLivestatus(), indirect_offset, - extra_offset, extra_extra_offset) + : DynamicColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset) , _mc(mc) {} std::unique_ptr<Column> DynamicEventConsoleReplicationColumn::createColumn( diff --git a/livestatus/src/DynamicLogwatchFileColumn.h b/livestatus/src/DynamicLogwatchFileColumn.h index e071935..476a558 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.h +++ b/livestatus/src/DynamicLogwatchFileColumn.h @@ -30,17 +30,16 @@ #include <string> #include "DynamicColumn.h" class Column; -class Logger; class MonitoringCore; class DynamicLogwatchFileColumn : public DynamicColumn { public: DynamicLogwatchFileColumn(const std::string &name, - const std::string &description, Logger *logger, + const std::string &description, MonitoringCore *mc, int indirect_offset, int extra_offset, int extra_extra_offset) - : DynamicColumn(name, description, logger, indirect_offset, - extra_offset, extra_extra_offset) + : DynamicColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset) , _mc(mc) {} ~DynamicLogwatchFileColumn() override = default; std::unique_ptr<Column> createColumn(const std::string &name, diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index f107a23..03c02bf 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -67,7 +67,7 @@ class OutputBuffer; #ifdef CMC #include <cstdint> #include "TableCachedStatehist.h" -class GlobalConfig; +class Core; class Object; #else #include <mutex> @@ -77,8 +77,8 @@ class Object; class Store { public: - explicit Store(MonitoringCore *mc); #ifdef CMC + Store(MonitoringCore *mc, Core *core); LogCache *logCache() { return &_log_cache; }; bool answerRequest(InputBuffer *, OutputBuffer *); bool answerGetRequest(const std::list<std::string> &lines, @@ -94,6 +94,7 @@ public: void addDowntimeToStatehistCache(Object *object, bool started); void addFlappingToStatehistCache(Object *object, bool started); #else + explicit Store(MonitoringCore *mc); bool answerRequest(InputBuffer &input, OutputBuffer &output); void registerDowntime(nebstruct_downtime_data *data); @@ -111,6 +112,9 @@ private: }; MonitoringCore *_mc; +#ifdef CMC + Core *_core; +#endif #ifndef CMC // TODO(sp) These fields should better be somewhere else, e.g. module.cc public: @@ -159,7 +163,6 @@ private: void addTable(Table &table); Table &findTable(OutputBuffer &output, const std::string &name); #ifdef CMC - const GlobalConfig *config() const; uint32_t horizon() const; #else void logRequest(const std::string &line, diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 14e8f3e..d3e7de8 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -662,8 +662,8 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addDynamicColumn(std::make_unique<DynamicLogwatchFileColumn>( prefix + "mk_logwatch_file", - "This contents of a logfile fetched via mk_logwatch", table->logger(), - table->core(), indirect_offset, extra_offset, -1)); + "This contents of a logfile fetched via mk_logwatch", table->core(), + indirect_offset, extra_offset, -1)); table->addColumn(std::make_unique<HostSpecialDoubleColumn>( prefix + "staleness", "Staleness indicator for this host", diff --git a/livestatus/src/TableStatus.h b/livestatus/src/TableStatus.h index bceafbd..f9bea1a 100644 --- a/livestatus/src/TableStatus.h +++ b/livestatus/src/TableStatus.h @@ -29,12 +29,19 @@ #include <string> #include "Table.h" #include "global_counters.h" +#ifdef CMC +class Core; +#endif class MonitoringCore; class Query; class TableStatus : public Table { public: +#ifdef CMC + TableStatus(MonitoringCore *mc, Core *core); +#else explicit TableStatus(MonitoringCore *mc); +#endif std::string name() const override; std::string namePrefix() const override;

5 years, 5 months

Replace shipped opsgenie client with the official opsgenie-sdk

by Lars Michelsen

Module: check_mk Branch: master Commit: 897bc51d743689c8685a03cd67217c248b1e742f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=897bc51d743689… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 14:15:18 2019 +0200 Replace shipped opsgenie client with the official opsgenie-sdk Change-Id: I354a7388a398ff9b778a59358affcb1e3bc5a6c0 --- Pipfile | 2 +- Pipfile.lock | 21 ++++++++++++++------- omd/packages/python-modules/python-modules.make | 4 +++- .../python-modules/src/opsgenie-sdk-0.3.1.tar.gz | Bin 0 -> 53697 bytes .../src/opsgenie_swagger-0.3.2.tar.gz | Bin 579638 -> 0 bytes omd/packages/python-modules/src/pytz-2019.1.tar.gz | Bin 0 -> 308148 bytes 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index 382cc79..3a0bbe1 100644 --- a/Pipfile +++ b/Pipfile @@ -115,7 +115,7 @@ defusedxml = "==0.5.0" requests-toolbelt = "==0.9.1" jira = "==2.0.0" # Has been added for opsgenie notification plugin -opsgenie_swagger = "==0.3.2" +opsgenie-sdk = "==0.3.1" [requires] python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock index 526eb35..f385dc3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "59e4fd8bc93b820ba89ce46c0dc2606244c09b6b5326c474036188ec84f09ffa" + "sha256": "83a7380c34db5a6b6c328bdb8653925a3329bbe21942d086bc01b01841e9e59e" }, "pipfile-spec": 6, "requires": { @@ -420,12 +420,12 @@ "index": "pypi", "version": "==2.1.0" }, - "opsgenie-swagger": { + "opsgenie-sdk": { "hashes": [ - "sha256:099baa2c6a4db309b449387cca075f8ad4b9404de0d5d3ae25e3baadda193225" + "sha256:ceb42240d6a42ee81cb6fba818b4048e49c718b925bc97c3b2646022b170adc1" ], "index": "pypi", - "version": "==0.3.2" + "version": "==0.3.1" }, "ordereddict": { "hashes": [ @@ -751,6 +751,13 @@ "index": "pypi", "version": "==0.10" }, + "pytz": { + "hashes": [ + "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", + "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141" + ], + "version": "==2019.1" + }, "pyyaml": { "hashes": [ "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", @@ -979,10 +986,10 @@ "develop": { "astroid": { "hashes": [ - "sha256:0ef2bf9f07c3150929b25e8e61b5198c27b0dca195e156f0e4d5bdd89185ca1a", - "sha256:fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a" + "sha256:87de48a92e29cedf7210ffa853d11441e7ad94cb47bacd91b023499b51cbc756", + "sha256:d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7" ], - "version": "==1.6.5" + "version": "==1.6.6" }, "atomicwrites": { "hashes": [ diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index e2b0d95..8c5b02c 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -195,7 +195,9 @@ PYTHON_MODULES_LIST += kubernetes-8.0.0.tar.gz PYTHON_MODULES_LIST += defusedxml-0.5.0.tar.gz PYTHON_MODULES_LIST += requests-toolbelt-0.9.1.tar.gz PYTHON_MODULES_LIST += jira-2.0.0.tar.gz -PYTHON_MODULES_LIST += opsgenie_swagger-0.3.2.tar.gz +# Has been added for opsgenie notification plugin +PYTHON_MODULES_LIST += opsgenie-sdk-0.3.1.tar.gz +PYTHON_MODULES_LIST += pytz-2019.1.tar.gz # NOTE: Cruel hack below! We need to have a recent GCC visible in the PATH diff --git a/omd/packages/python-modules/src/opsgenie-sdk-0.3.1.tar.gz b/omd/packages/python-modules/src/opsgenie-sdk-0.3.1.tar.gz new file mode 100644 index 0000000..4e6d110 Binary files /dev/null and b/omd/packages/python-modules/src/opsgenie-sdk-0.3.1.tar.gz differ diff --git a/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz b/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz deleted file mode 100644 index a901efa..0000000 Binary files a/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/pytz-2019.1.tar.gz b/omd/packages/python-modules/src/pytz-2019.1.tar.gz new file mode 100644 index 0000000..d98049a Binary files /dev/null and b/omd/packages/python-modules/src/pytz-2019.1.tar.gz differ

5 years, 5 months

Synched expected sizes with reality.

by Sven Panne

Module: check_mk Branch: master Commit: 470c7de4067b38dcf1b85e31d03fa8aa68be6aa8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=470c7de4067b38… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 13:45:25 2019 +0200 Synched expected sizes with reality. Change-Id: Iea63fe368ff54e30259737845985fda41641ef00 --- tests/packaging/test_files.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 2dc9075..7dab14b 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -17,16 +17,19 @@ def test_package_built(version_path, what): def _get_package_paths(version_path, what): for filename in os.listdir(version_path): - if filename.startswith("check-mk-") and filename.endswith(".%s" % what): + if filename.startswith("check-mk-") and \ + filename.endswith(".%s" % what) and \ + not "-dbgsym_" in filename: yield os.path.join(version_path, filename) # In case packages grow/shrink this check has to be changed. +# TODO: Handle Docker tar.gz differently? @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 160 * 1024 * 1024, 235 * 1024 * 1024), - ("deb", 128 * 1024 * 1024, 139 * 1024 * 1024), - ("cma", 230 * 1024 * 1024, 241 * 1024 * 1024), - ("tar.gz", 358 * 1024 * 1024, 428 * 1024 * 1024), + ("rpm", 168 * 1024 * 1024, 203 * 1024 * 1024), + ("deb", 132 * 1024 * 1024, 144 * 1024 * 1024), + ("cma", 243 * 1024 * 1024, 253 * 1024 * 1024), + ("tar.gz", 401 * 1024 * 1024, 443 * 1024 * 1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

5 years, 5 months

Untie the knot between Store and NagiosCore.

by Sven Panne

Module: check_mk Branch: master Commit: b6159a7981e8eacf6e4382f2046f2f0aaecd6490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6159a7981e8ea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 10:58:41 2019 +0200 Untie the knot between Store and NagiosCore. We should really fix this is a nicer and less fragile way... Change-Id: I066ad29d8d03c7c8e4b9606d6b860efc988baee7 --- livestatus/src/LogCache.cc | 4 +--- livestatus/src/LogCache.h | 12 ++++++++++-- livestatus/src/Store.cc | 5 ++++- livestatus/src/Store.h | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 094a233..16e5c59 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -37,9 +37,7 @@ constexpr unsigned long check_mem_cycle = 1000; } // namespace LogCache::LogCache(MonitoringCore *mc) - : _mc(mc), _num_cached_log_messages(0), _num_at_last_check(0) { - update(); -} + : _mc(mc), _num_cached_log_messages(0), _num_at_last_check(0) {} void LogCache::update() { if (!_logfiles.empty() && diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 79cd9f2..2be3331 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -37,14 +37,22 @@ class MonitoringCore; using logfiles_t = std::map<time_t, std::unique_ptr<Logfile>>; +// TODO(sp) Split this class into 2 parts: One is really only a cache for the +// logfiles to monitor, the other part is about the lines in them. class LogCache { public: + // TODO(sp) Using this class requires a very tricky and fragile protocol: + // You have to get the lock and call update() before you use any of the + // other methods. Furthermore, the constructor is not allowed to call any + // method of the MonitoringCore it gets, because there is a knot between the + // Store and the NagiosCore classes, so the MonitoringCore is not yet fully + // constructed. :-P std::mutex _lock; - explicit LogCache(MonitoringCore *mc); + void update(); + size_t numCachedLogMessages() const; void logLineHasBeenAdded(Logfile *logfile, unsigned logclasses); - void update(); auto begin() { return _logfiles.begin(); } auto end() { return _logfiles.end(); } diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index cd2c3ad..6984400 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -25,6 +25,7 @@ #include "Store.h" #include <ctime> #include <memory> +#include <mutex> #include <sstream> #include <stdexcept> #include <utility> @@ -308,6 +309,8 @@ bool Store::answerGetRequest(const std::list<std::string> &lines, Logger *Store::logger() const { return _mc->loggerLivestatus(); } -size_t Store::numCachedLogMessages() const { +size_t Store::numCachedLogMessages() { + std::lock_guard<std::mutex> lg(_log_cache._lock); + _log_cache.update(); return _log_cache.numCachedLogMessages(); } diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 9230d8c..f107a23 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -100,7 +100,7 @@ public: void registerComment(nebstruct_comment_data *data); #endif Logger *logger() const; - size_t numCachedLogMessages() const; + size_t numCachedLogMessages(); private: struct TableDummy : public Table {

5 years, 5 months

Added note about a clang-format bug.

by Sven Panne

Module: check_mk Branch: master Commit: 22c3ac85b9c0fa7aa5691b51472d1ccf995ce1e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22c3ac85b9c0fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 11 11:33:09 2019 +0200 Added note about a clang-format bug. Change-Id: I5614ccaee00b8357d6ff2f96f73e806bee354b71 --- agents/windows/Configurable.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/windows/Configurable.h b/agents/windows/Configurable.h index 7e97082..4af4989 100644 --- a/agents/windows/Configurable.h +++ b/agents/windows/Configurable.h @@ -183,6 +183,10 @@ public: virtual void output(const std::string &key, std::ostream &out) const override { + // NOTE: Funnily enough, clang-format thinks this header contains + // Objective-C because of the structured binding declaration with a "&" + // reference operator, see: https://bugs.llvm.org/show_bug.cgi?id=37433 + // clang-format-9 onwards will contain a fix for this. for (const auto &[var, value] : this->values()) { out << key << " " << var << " = " << value << "\n"; }

5 years, 5 months

CMK-1918: dynamic rrdtool version in toplevel Make

by Alex Zurhake

Module: check_mk Branch: master Commit: 1a36ec7c00ba358e478d90dcce8c2efe393ba881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a36ec7c00ba35… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 10 15:09:02 2019 +0200 CMK-1918: dynamic rrdtool version in toplevel Make Change-Id: Ic8c1596cdd0fe7afbca618efdfe1cd8d8172524f --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5944705..800e851 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/j PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons managed/web/htdocs/images managed/web/htdocs/images/icons)) +RRDTOOL_VERS := $(shell egrep -h "RRDTOOL_VERS\s:=\s" omd/packages/rrdtool/rrdtool.make | sed 's/RRDTOOL_VERS\s:=\s//') .PHONY: all analyze build check check-binaries check-permissions check-version \ clean compile-neb-cmc cppcheck dist documentation format format-c \ @@ -404,8 +405,8 @@ config.status: $(CONFIG_DEPS) else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "omd/rrdtool-1.7.1/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.1/src/.libs)" ; \ + if test -d "omd/rrdtool-$(RRDTOOL_VERS)/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-$(RRDTOOL_VERS)/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \

5 years, 5 months

7397 oracle_tablespaces: Inventory is now sorted by SID, then name.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8db81646dcc31163f3316134226e9bd494791f7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db81646dcc311… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 10 15:17:58 2019 +0200 7397 oracle_tablespaces: Inventory is now sorted by SID, then name. Change-Id: I2e343a5e4ce316e3a2e1511c0b164e0b2f9d815e --- .werks/7397 | 10 ++++++++++ inventory/oracle_tablespaces | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/7397 b/.werks/7397 new file mode 100644 index 0000000..cefd8d5 --- /dev/null +++ b/.werks/7397 @@ -0,0 +1,10 @@ +Title: oracle_tablespaces: Inventory is now sorted by SID, then name. +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554902231 +Class: feature + + diff --git a/inventory/oracle_tablespaces b/inventory/oracle_tablespaces index 57c42b8..246c73f 100644 --- a/inventory/oracle_tablespaces +++ b/inventory/oracle_tablespaces @@ -54,7 +54,7 @@ def inv_oracle_tablespaces(parsed, inventory_tree, status_data_tree): status_node = status_data_tree.get_list(path) tablespaces, _error_sids = parsed - for tablespace, attrs in tablespaces.items(): + for tablespace, attrs in sorted(tablespaces.items()): sid, name = tablespace db_version = attrs["db_version"] num_files = 0

5 years, 5 months

← Newer
1
...
27
28
29
30
31
32
33
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019