Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Simon Betz

Module: check_mk Branch: master Commit: b2f646347e00f2d96be9dfa47750579aabb8d782 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2f646347e00f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 7 10:20:13 2017 +0100 Moved port_match function out of loop Change-Id: I56aad7bd7937d8c77886f794892de298beaeec39 --- checks/if.include | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/if.include b/checks/if.include index 5b76a66..afbc61b 100644 --- a/checks/if.include +++ b/checks/if.include @@ -295,6 +295,14 @@ def inventory_if_common(info, has_nodeinfo = False): # if there are no settings, use defaults settings_sets.append({}) + def port_match(name, what): + if what == None: + return True + for r in what: + if regex(r).match(name): + return True + return False + for settings in settings_sets: uses_description = settings.get('use_desc', if_inventory_uses_description) uses_alias = settings.get('use_alias', if_inventory_uses_alias) @@ -306,14 +314,6 @@ def inventory_if_common(info, has_nodeinfo = False): match_desc = settings.get('match_desc') pad_portnumbers = settings.get('pad_portnumbers', if_inventory_pad_portnumbers) - def port_match(name, what): - if what == None: - return True - for r in what: - if regex(r).match(name): - return True - return False - # Allow main check to set no port type (e.g. hitachi_hnas_fc_if) porttypes.append("")

6 years, 10 months

Be more explicit about aggregations.

by Sven Panne

Module: check_mk Branch: master Commit: a0899360aebb67cb65caa5a6df23a960634a08ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0899360aebb67… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 7 08:42:34 2017 +0100 Be more explicit about aggregations. Change-Id: Ieb763c04e9bd1dc60b0f45193da736ac86666614 --- livestatus/src/BlobColumn.cc | 5 +++++ livestatus/src/BlobColumn.h | 3 +++ livestatus/src/Column.cc | 5 ----- livestatus/src/Column.h | 2 +- livestatus/src/CustomVarsDictColumn.cc | 5 +++++ livestatus/src/CustomVarsDictColumn.h | 3 +++ livestatus/src/ListColumn.cc | 5 +++++ livestatus/src/ListColumn.h | 3 +++ livestatus/src/NullColumn.cc | 5 +++++ livestatus/src/NullColumn.h | 3 +++ livestatus/src/StringColumn.cc | 5 +++++ livestatus/src/StringColumn.h | 11 +++++++++-- 12 files changed, 47 insertions(+), 8 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index b9c7814..ec2a6e5 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -41,3 +41,8 @@ std::unique_ptr<Filter> BlobColumn::createFilter( throw std::runtime_error("filtering on blob column " + name() + " not supported"); } + +std::unique_ptr<Aggregator> BlobColumn::createAggregator( + StatsOperation /*operation*/) const { + return nullptr; +} diff --git a/livestatus/src/BlobColumn.h b/livestatus/src/BlobColumn.h index 8d8dea6..9643dfa 100644 --- a/livestatus/src/BlobColumn.h +++ b/livestatus/src/BlobColumn.h @@ -53,6 +53,9 @@ public: std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + std::unique_ptr<Aggregator> createAggregator( + StatsOperation operation) const override; + virtual std::unique_ptr<std::vector<char>> getValue(Row row) const = 0; }; diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index a3675f7..7338e62 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -55,8 +55,3 @@ const void *Column::shiftPointer(Row row) const { _extra_extra_offset), _offset); } - -std::unique_ptr<Aggregator> Column::createAggregator( - StatsOperation /*unused*/) const { - return nullptr; -} diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 9a2ec06..60a7b18 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -69,7 +69,7 @@ public: RelationalOperator relOp, const std::string &value) const = 0; virtual std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation) const; + StatsOperation operation) const = 0; Logger *logger() const { return _logger; } diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index ea8c85a..24b198f 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -50,6 +50,11 @@ std::unique_ptr<Filter> CustomVarsDictColumn::createFilter( return std::make_unique<CustomVarsDictFilter>(*this, relOp, value); } +std::unique_ptr<Aggregator> CustomVarsDictColumn::createAggregator( + StatsOperation /*operation*/) const { + return nullptr; +} + std::unordered_map<std::string, std::string> CustomVarsDictColumn::getValue( Row row) const { std::unordered_map<std::string, std::string> dict; diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index ebed4b0..00699aa 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -53,6 +53,9 @@ public: std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + std::unique_ptr<Aggregator> createAggregator( + StatsOperation operation) const override; + std::unordered_map<std::string, std::string> getValue(Row row) const; }; diff --git a/livestatus/src/ListColumn.cc b/livestatus/src/ListColumn.cc index 832911d..030c909 100644 --- a/livestatus/src/ListColumn.cc +++ b/livestatus/src/ListColumn.cc @@ -40,3 +40,8 @@ std::unique_ptr<Filter> ListColumn::createFilter( RelationalOperator relOp, const std::string &value) const { return std::make_unique<ListFilter>(*this, relOp, value); } + +std::unique_ptr<Aggregator> ListColumn::createAggregator( + StatsOperation /*operation*/) const { + return nullptr; +} diff --git a/livestatus/src/ListColumn.h b/livestatus/src/ListColumn.h index 56b5632..6085ca1 100644 --- a/livestatus/src/ListColumn.h +++ b/livestatus/src/ListColumn.h @@ -53,6 +53,9 @@ public: std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + std::unique_ptr<Aggregator> createAggregator( + StatsOperation operation) const override; + // TODO(sp) What we actually want here is a stream of strings, not a // concrete container. virtual std::vector<std::string> getValue( diff --git a/livestatus/src/NullColumn.cc b/livestatus/src/NullColumn.cc index 7201b79..6099e27 100644 --- a/livestatus/src/NullColumn.cc +++ b/livestatus/src/NullColumn.cc @@ -38,3 +38,8 @@ std::unique_ptr<Filter> NullColumn::createFilter( RelationalOperator /*unused*/, const std::string& /*unused*/) const { throw std::runtime_error("filtering on null column not supported"); } + +std::unique_ptr<Aggregator> NullColumn::createAggregator( + StatsOperation /*operation*/) const { + return nullptr; +} diff --git a/livestatus/src/NullColumn.h b/livestatus/src/NullColumn.h index dc2f816..847ff72 100644 --- a/livestatus/src/NullColumn.h +++ b/livestatus/src/NullColumn.h @@ -51,6 +51,9 @@ public: std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + + std::unique_ptr<Aggregator> createAggregator( + StatsOperation operation) const override; }; #endif // NullColumn_h diff --git a/livestatus/src/StringColumn.cc b/livestatus/src/StringColumn.cc index 244cf27..5613016 100644 --- a/livestatus/src/StringColumn.cc +++ b/livestatus/src/StringColumn.cc @@ -38,3 +38,8 @@ std::unique_ptr<Filter> StringColumn::createFilter( RelationalOperator relOp, const std::string &value) const { return std::make_unique<StringFilter>(*this, relOp, value); } + +std::unique_ptr<Aggregator> StringColumn::createAggregator( + StatsOperation /*operation*/) const { + return nullptr; +} diff --git a/livestatus/src/StringColumn.h b/livestatus/src/StringColumn.h index e269270..e3b1970 100644 --- a/livestatus/src/StringColumn.h +++ b/livestatus/src/StringColumn.h @@ -43,12 +43,19 @@ public: int offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} - virtual std::string getValue(Row row) const = 0; + + ColumnType type() const override { return ColumnType::string; } + void output(Row row, RowRenderer &r, const contact *auth_user, std::chrono::seconds timezone_offset) const override; - ColumnType type() const override { return ColumnType::string; } + std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + + std::unique_ptr<Aggregator> createAggregator( + StatsOperation operation) const override; + + virtual std::string getValue(Row row) const = 0; }; #endif // StringColumn_h

6 years, 10 months

Log incorrect Stats: queries.

by Sven Panne

Module: check_mk Branch: master Commit: 8ee8f6f37c88e80d5b624d50721abfc145766433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ee8f6f37c88e8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 7 09:09:25 2017 +0100 Log incorrect Stats: queries. Change-Id: I1cbc92383f5b8e7c23272aa2b2c8654675274174 --- livestatus/src/BlobColumn.cc | 7 ++++--- livestatus/src/BlobColumn.h | 1 + livestatus/src/CustomVarsDictColumn.cc | 4 +++- livestatus/src/CustomVarsDictColumn.h | 1 + livestatus/src/ListColumn.cc | 4 +++- livestatus/src/ListColumn.h | 1 + livestatus/src/NullColumn.cc | 2 +- livestatus/src/NullColumn.h | 1 + livestatus/src/Query.cc | 14 ++++++++++++-- livestatus/src/Query.h | 2 ++ livestatus/src/StatsColumn.cc | 16 +++++++--------- livestatus/src/StatsColumn.h | 3 ++- livestatus/src/StringColumn.cc | 4 +++- livestatus/src/StringColumn.h | 1 + 14 files changed, 42 insertions(+), 19 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index ec2a6e5..ea1fa18 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -38,11 +38,12 @@ void BlobColumn::output(Row row, RowRenderer &r, const contact * /*auth_user*/, std::unique_ptr<Filter> BlobColumn::createFilter( RelationalOperator /*unused*/, const std::string & /*unused*/) const { - throw std::runtime_error("filtering on blob column " + name() + - " not supported"); + throw std::runtime_error("filtering on blob column '" + name() + + "' not supported"); } std::unique_ptr<Aggregator> BlobColumn::createAggregator( StatsOperation /*operation*/) const { - return nullptr; + throw std::runtime_error("aggregating on blob column '" + name() + + "' not supported"); } diff --git a/livestatus/src/BlobColumn.h b/livestatus/src/BlobColumn.h index 9643dfa..658e63b 100644 --- a/livestatus/src/BlobColumn.h +++ b/livestatus/src/BlobColumn.h @@ -30,6 +30,7 @@ #include <memory> #include <string> #include <vector> +#include "Aggregator.h" #include "Column.h" #include "contact_fwd.h" #include "opids.h" diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index 24b198f..53a9b27 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "CustomVarsDictColumn.h" +#include <stdexcept> #include <utility> #include "CustomVarsDictFilter.h" #include "Filter.h" @@ -52,7 +53,8 @@ std::unique_ptr<Filter> CustomVarsDictColumn::createFilter( std::unique_ptr<Aggregator> CustomVarsDictColumn::createAggregator( StatsOperation /*operation*/) const { - return nullptr; + throw std::runtime_error("aggregating on dictionary column '" + name() + + "' not supported"); } std::unordered_map<std::string, std::string> CustomVarsDictColumn::getValue( diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index 00699aa..3a0eb8f 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -30,6 +30,7 @@ #include <memory> #include <string> #include <unordered_map> +#include "Aggregator.h" #include "Column.h" #include "contact_fwd.h" #include "opids.h" diff --git a/livestatus/src/ListColumn.cc b/livestatus/src/ListColumn.cc index 030c909..459ca77 100644 --- a/livestatus/src/ListColumn.cc +++ b/livestatus/src/ListColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "ListColumn.h" +#include <stdexcept> #include "Filter.h" #include "ListFilter.h" #include "Renderer.h" @@ -43,5 +44,6 @@ std::unique_ptr<Filter> ListColumn::createFilter( std::unique_ptr<Aggregator> ListColumn::createAggregator( StatsOperation /*operation*/) const { - return nullptr; + throw std::runtime_error("aggregating on list column '" + name() + + "' not supported"); } diff --git a/livestatus/src/ListColumn.h b/livestatus/src/ListColumn.h index 6085ca1..4b4b6b5 100644 --- a/livestatus/src/ListColumn.h +++ b/livestatus/src/ListColumn.h @@ -30,6 +30,7 @@ #include <memory> #include <string> #include <vector> +#include "Aggregator.h" #include "Column.h" #include "contact_fwd.h" #include "opids.h" diff --git a/livestatus/src/NullColumn.cc b/livestatus/src/NullColumn.cc index 6099e27..d496ef8 100644 --- a/livestatus/src/NullColumn.cc +++ b/livestatus/src/NullColumn.cc @@ -41,5 +41,5 @@ std::unique_ptr<Filter> NullColumn::createFilter( std::unique_ptr<Aggregator> NullColumn::createAggregator( StatsOperation /*operation*/) const { - return nullptr; + throw std::runtime_error("aggregating on null column not supported"); } diff --git a/livestatus/src/NullColumn.h b/livestatus/src/NullColumn.h index 847ff72..6251a4b 100644 --- a/livestatus/src/NullColumn.h +++ b/livestatus/src/NullColumn.h @@ -29,6 +29,7 @@ #include <chrono> #include <memory> #include <string> +#include "Aggregator.h" #include "Column.h" #include "contact_fwd.h" #include "opids.h" diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 4976f89..525b1ce 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -451,7 +451,7 @@ void Query::parseColumnsLine(char *line) { // But not failing has the advantage that an updated GUI, that // expects new columns, will be able to keep compatibility with // older Livestatus versions. - Informational(_logger) << "Replacing non-existing column '" + Informational(_logger) << "replacing non-existing column '" << column_name << "' with null column"; column = std::make_shared<NullColumn>( column_name, "non-existing column", -1, -1, -1, 0); @@ -796,13 +796,23 @@ void Query::optimizeBitmask(const std::string &column_name, _filter.optimizeBitmask(column_name, bitmask, timezoneOffset()); } +std::unique_ptr<Aggregator> Query::createAggregator( + const StatsColumn &sc) const { + try { + return sc.createAggregator(); + } catch (const std::runtime_error &e) { + Informational(_logger) << e.what() << ", falling back to counting"; + return sc.createCountAggregator(); + } +} + const std::vector<std::unique_ptr<Aggregator>> &Query::getAggregatorsFor( const RowFragment &groupspec) { auto it = _stats_groups.find(groupspec); if (it == _stats_groups.end()) { std::vector<std::unique_ptr<Aggregator>> aggrs; for (const auto &sc : _stats_columns) { - aggrs.push_back(sc->createAggregator()); + aggrs.push_back(createAggregator(*sc)); } it = _stats_groups.emplace(groupspec, move(aggrs)).first; } diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index b7d663b..ac09085 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -140,6 +140,8 @@ private: void start(QueryRenderer &q); void finish(QueryRenderer &q); + std::unique_ptr<Aggregator> createAggregator(const StatsColumn &sc) const; + // NOTE: We cannot make this 'const' right now, it adds entries into // _stats_groups. const std::vector<std::unique_ptr<Aggregator>> &getAggregatorsFor( diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index e644774..3cd614b 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -33,14 +33,12 @@ StatsColumn::StatsColumn(Column *c, std::unique_ptr<Filter> f, StatsOperation o) std::unique_ptr<Filter> StatsColumn::stealFilter() { return move(_filter); } -std::unique_ptr<Aggregator> StatsColumn::createAggregator() { - if (_operation == StatsOperation::count) { - return std::make_unique<CountAggregator>(_filter.get()); - } - if (std::unique_ptr<Aggregator> aggr = - _column->createAggregator(_operation)) { - return aggr; - } - // unaggregateble column +std::unique_ptr<Aggregator> StatsColumn::createAggregator() const { + return _operation == StatsOperation::count + ? createCountAggregator() + : _column->createAggregator(_operation); +} + +std::unique_ptr<Aggregator> StatsColumn::createCountAggregator() const { return std::make_unique<CountAggregator>(_filter.get()); } diff --git a/livestatus/src/StatsColumn.h b/livestatus/src/StatsColumn.h index a2acb9f..b89b79c 100644 --- a/livestatus/src/StatsColumn.h +++ b/livestatus/src/StatsColumn.h @@ -37,7 +37,8 @@ public: Column *column() const { return _column; } StatsOperation operation() const { return _operation; } std::unique_ptr<Filter> stealFilter(); - std::unique_ptr<Aggregator> createAggregator(); + std::unique_ptr<Aggregator> createAggregator() const; + std::unique_ptr<Aggregator> createCountAggregator() const; private: Column *_column; diff --git a/livestatus/src/StringColumn.cc b/livestatus/src/StringColumn.cc index 5613016..490eb27 100644 --- a/livestatus/src/StringColumn.cc +++ b/livestatus/src/StringColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "StringColumn.h" +#include <stdexcept> #include "Filter.h" #include "Renderer.h" #include "Row.h" @@ -41,5 +42,6 @@ std::unique_ptr<Filter> StringColumn::createFilter( std::unique_ptr<Aggregator> StringColumn::createAggregator( StatsOperation /*operation*/) const { - return nullptr; + throw std::runtime_error("aggregating on string column '" + name() + + "' not supported"); } diff --git a/livestatus/src/StringColumn.h b/livestatus/src/StringColumn.h index e3b1970..ecc8358 100644 --- a/livestatus/src/StringColumn.h +++ b/livestatus/src/StringColumn.h @@ -29,6 +29,7 @@ #include <chrono> #include <memory> #include <string> +#include "Aggregator.h" #include "Column.h" #include "contact_fwd.h" #include "opids.h"

6 years, 10 months

Simplified class hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: 30b7fe556b85bd5001c5bd49fdd9cf10e10a1c94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30b7fe556b85bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 7 08:24:10 2017 +0100 Simplified class hierarchy. Change-Id: If507c9fc3e83f22f6f49f6453b1d37cd4e7958e1 --- livestatus/src/OffsetBoolColumn.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/OffsetBoolColumn.h b/livestatus/src/OffsetBoolColumn.h index 848d950..c1bf3f2 100644 --- a/livestatus/src/OffsetBoolColumn.h +++ b/livestatus/src/OffsetBoolColumn.h @@ -28,17 +28,17 @@ #include "config.h" // IWYU pragma: keep #include <sys/types.h> #include <string> -#include "OffsetIntColumn.h" +#include "IntColumn.h" #include "contact_fwd.h" class Row; -class OffsetBoolColumn : public OffsetIntColumn { +class OffsetBoolColumn : public IntColumn { public: OffsetBoolColumn(const std::string& name, const std::string& description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset) - : OffsetIntColumn(name, description, indirect_offset, extra_offset, - extra_extra_offset, offset) {} + : IntColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset, offset) {} int32_t getValue(Row row, const contact* auth_user) const override; };

6 years, 10 months

5433 Bulk notifications can now be made using Event Console comments

by Lars Michelsen

Module: check_mk Branch: master Commit: 177cf1a0db05062dd186ade83594f4522ad2bdd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=177cf1a0db0506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 7 09:32:29 2017 +0100 5433 Bulk notifications can now be made using Event Console comments Change-Id: I43fd3b447317795e3c66b6aa6199db5ce267d043 --- .werks/5433 | 10 ++++++++++ cmk_base/notify.py | 4 ++++ web/htdocs/wato.py | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/5433 b/.werks/5433 new file mode 100644 index 0000000..0e1bf68 --- /dev/null +++ b/.werks/5433 @@ -0,0 +1,10 @@ +Title: Bulk notifications can now be made using Event Console comments +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510043526 +Class: feature + + diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 5e697b0..ff01fc5 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1428,6 +1428,10 @@ def do_bulk_notify(plugin, params, plugin_context, bulk): ec_contact = plugin_context.get("EC_CONTACT", "") bulk_path += ("ec_contact", ec_contact) + if "ec_comment" in bulkby: + ec_comment = plugin_context.get("EC_COMMENT", "") + bulk_path += ("ec_comment", ec_comment) + if "bulk_subject" in bulk: plugin_context["PARAMETER_BULK_SUBJECT"] = bulk["bulk_subject"] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 584eb8f..acb7a8c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7578,7 +7578,8 @@ def vs_notification_bulkby(): ( "sl", _("Service level") ), ( "check_type", _("Check type") ), ( "state", _("Host/Service state") ), - ( "ec_contact", _("Event console contact") ), + ( "ec_contact", _("Event Console contact") ), + ( "ec_comment", _("Event Console comment") ), ], default_value = [ "host" ], )

6 years, 10 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 961caf2360db861dd3d796c0a41f840f8ba6b036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=961caf2360db86… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 16:00:45 2017 +0100 IWYU fixes. Change-Id: I9b3202881527c23ab6a529710b402f9380384ae4 --- livestatus/src/ServiceSpecialIntColumn.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestatus/src/ServiceSpecialIntColumn.cc b/livestatus/src/ServiceSpecialIntColumn.cc index 40ddb99..0b92005 100644 --- a/livestatus/src/ServiceSpecialIntColumn.cc +++ b/livestatus/src/ServiceSpecialIntColumn.cc @@ -27,14 +27,12 @@ #ifdef CMC #include "Core.h" -#include "Host.h" #include "MonitoringCore.h" #include "Object.h" #include "RRDBackend.h" #include "RRDInfoCache.h" #include "State.h" #include "cmc.h" -#include "mk_inventory.h" #else #include "nagios.h" #include "pnp4nagios.h"

6 years, 10 months

Unify special double column implementations.

by Sven Panne

Module: check_mk Branch: master Commit: 19e8f0b63b685298fa9eba50674ddc57cc3e95a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e8f0b63b6852… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 15:16:11 2017 +0100 Unify special double column implementations. Change-Id: I00d64bff1dfbf80c890fe26ac327fd0c5d6e71f9 --- livestatus/src/HostSpecialDoubleColumn.cc | 100 ++++++++++++++++++++++++++- livestatus/src/HostSpecialDoubleColumn.h | 11 ++- livestatus/src/ServiceSpecialDoubleColumn.cc | 29 ++++++-- livestatus/src/ServiceSpecialDoubleColumn.h | 3 +- 4 files changed, 131 insertions(+), 12 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index aca26bd..9ff0c44 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -23,21 +23,115 @@ // Boston, MA 02110-1301 USA. #include "HostSpecialDoubleColumn.h" -#include <ctime> #include "Row.h" -#include "nagios.h" -extern int interval_length; +#ifdef CMC +// duration_cast uses enable_if as an implementation detail, similar bug as +// https://github.com/include-what-you-use/include-what-you-use/issues/434 +// IWYU pragma: no_include <type_traits> +#include <chrono> +#include <ratio> +#include "Object.h" +#include "State.h" +#include "Timeperiod.h" +#else +#include <ctime> +#include "nagios.h" +#endif double HostSpecialDoubleColumn::getValue(Row row) const { +#ifdef CMC + if (auto object = columnData<Object>(row)) { + switch (_type) { + case Type::staleness: + return staleness(object); + } + } +#else if (auto hst = columnData<host>(row)) { switch (_type) { case Type::staleness: { + extern int interval_length; return (time(nullptr) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * interval_length); } } } +#endif return 0; } + +#ifdef CMC +// static +double HostSpecialDoubleColumn::staleness(const Object *object) { + auto state = object->state(); + std::chrono::system_clock::duration check_result_age; + Timeperiod *check_period = object->_check_period; + std::chrono::system_clock::time_point last_period_change = + check_period->lastStateChange(); + std::chrono::system_clock::time_point last_check = state->_last_check; + + // Compute the age of the check result. When the check is currently in its + // check period then... + auto m_now = std::chrono::system_clock::now(); + if (check_period->isActive()) { + // Has a check happened since the beginning of the current phase? Then + // simply compare last check with current time. This should be the 99% + // case. + if (last_check >= last_period_change) { + check_result_age = m_now - last_check; + + } else { + // otherwise the active phase has just begun. Take the time since + // the beginning of the phase. + check_result_age = m_now - last_period_change; + + // Add time at the end of the pre-last transition + std::chrono::system_clock::time_point prelast_period_change = + check_period->previousLastStateChange(); + if (prelast_period_change != + std::chrono::system_clock::time_point()) { + if (last_check < prelast_period_change) { + check_result_age += prelast_period_change - last_check; + } + // else: a check happend out of the check period. Ignore this + } + // else: no information about past. Ignore this + } + } else { + // Check is currently out of its check period? Then use the beginning of + // the inactive phase as reference for computing the check age. This + // effectively freezes the staleness value when a goes goes into its + // inactive phase. + if (last_period_change != std::chrono::system_clock::time_point()) { + check_result_age = last_period_change - last_check; + } else { + // e.g. for timeperiod "never" + check_result_age = std::chrono::seconds(0); + } + } + + // Is the checks' result based on cached agent data? Then use the age of + // that data as check result age + std::chrono::duration<double> interval; + if (state->_cached_at != std::chrono::system_clock::time_point()) { + // Cache interval and check interval can add up in the worst case. + interval = state->_cache_interval + object->_check_interval; + + std::chrono::system_clock::duration cached_age = + m_now - state->_cached_at; + if (cached_age > check_result_age) { + check_result_age = cached_age; + } + } else { + interval = object->_check_interval; + } + + // Check_MK configures the interval for its passive checks correctly. Just + // make sure that we do not fail if it is set to 0 by some error. + return std::chrono::duration_cast<std::chrono::seconds>(check_result_age) + .count() / + (interval == std::chrono::seconds(0) ? 1 : interval.count()); +} +#endif diff --git a/livestatus/src/HostSpecialDoubleColumn.h b/livestatus/src/HostSpecialDoubleColumn.h index afe0bce..ba6e437 100644 --- a/livestatus/src/HostSpecialDoubleColumn.h +++ b/livestatus/src/HostSpecialDoubleColumn.h @@ -30,6 +30,10 @@ #include "DoubleColumn.h" class Row; +#ifdef CMC +class Object; +#endif + class HostSpecialDoubleColumn : public DoubleColumn { public: enum class Type { staleness }; @@ -41,10 +45,15 @@ public: : DoubleColumn(name, description, indirect, extra_offset, extra_extra_offset, offset) , _type(hsdc_type) {} + double getValue(Row row) const override; +#ifdef CMC + static double staleness(const Object* object); +#endif + private: - Type _type; + const Type _type; }; #endif // HostSpecialDoubleColumn_h diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 747543d..0266947 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -23,17 +23,30 @@ // Boston, MA 02110-1301 USA. #include "ServiceSpecialDoubleColumn.h" +#include "Row.h" + +#ifdef CMC +#include "HostSpecialDoubleColumn.h" +class Object; +#else #include <cstring> #include <ctime> -#include "Row.h" #include "nagios.h" - -extern int interval_length; +#endif double ServiceSpecialDoubleColumn::getValue(Row row) const { +#ifdef CMC + if (auto object = columnData<Object>(row)) { + switch (_type) { + case Type::staleness: + return HostSpecialDoubleColumn::staleness(object); + } + } +#else if (auto svc = columnData<service>(row)) { switch (_type) { case Type::staleness: { + extern int interval_length; time_t check_result_age = time(nullptr) - svc->last_check; if (svc->check_interval != 0) { return check_result_age / @@ -58,13 +71,15 @@ double ServiceSpecialDoubleColumn::getValue(Row row) const { interval_length); } } - return 1; // Shouldnt happen! We always expect a check-mk - // service - } // Other non-cmk passive and active checks without - // check_interval + // Shouldn't happen! We always expect a check-mk service + return 1; + } + // Other non-cmk passive and active checks without + // check_interval return check_result_age / interval_length; } } } +#endif return 0; } diff --git a/livestatus/src/ServiceSpecialDoubleColumn.h b/livestatus/src/ServiceSpecialDoubleColumn.h index 190c3f0..e6e2ae7 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.h +++ b/livestatus/src/ServiceSpecialDoubleColumn.h @@ -41,10 +41,11 @@ public: : DoubleColumn(name, description, indirect, extra_offset, extra_extra_offset, offset) , _type(ssdc_type) {} + double getValue(Row row) const override; private: - Type _type; + const Type _type; }; #endif // ServiceSpecialDoubleColumn_h

6 years, 10 months

5195 FIX Fixed an obscure BI bug related to hard states when using the Nagios core.

by Sven Panne

Module: check_mk Branch: master Commit: 1d9e110ce81a1771aa69572401f84ab51f4ebfce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9e110ce81a17… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 15:05:15 2017 +0100 5195 FIX Fixed an obscure BI bug related to hard states when using the Nagios core. Previously, the "service" table was missing a "hard_state" columnm, which led to a rather obscure bug in BI: When the Nagios core was used and BI was configured to use hard states and a service was in a non-OK soft state, the service was effectively ignored by BI. This has been fixed. Change-Id: Id59d500bf2fe6b526cdeeaa7e332336f14af7b6a --- .werks/5195 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5195 b/.werks/5195 new file mode 100644 index 0000000..266d062 --- /dev/null +++ b/.werks/5195 @@ -0,0 +1,13 @@ +Title: Fixed an obscure BI bug related to hard states when using the Nagios core. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509976923 +Class: fix + +Previously, the "service" table was missing a "hard_state" columnm, which +led to a rather obscure bug in BI: When the Nagios core was used and BI was +configured to use hard states and a service was in a non-OK soft state, the +service was effectively ignored by BI. This has been fixed.

6 years, 10 months

Unify special int column implementations.

by Sven Panne

Module: check_mk Branch: master Commit: ea120ba878019945f3d354f0e4f3bb7573079a75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea120ba8780199… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 13:57:17 2017 +0100 Unify special int column implementations. Note that this commit adds a missing "hard_state" column to the "services" table, which in turn fixes a somehow obscure BI bug. Change-Id: Ia263cececd806e8383041550f65886dbe7afe0a1 --- livestatus/src/HostSpecialIntColumn.cc | 45 ++++++++++++++++++++++++++++--- livestatus/src/HostSpecialIntColumn.h | 11 ++++---- livestatus/src/ServiceSpecialIntColumn.cc | 45 +++++++++++++++++++++++++++++++ livestatus/src/ServiceSpecialIntColumn.h | 15 ++++++----- livestatus/src/TableServices.cc | 5 ++++ 5 files changed, 105 insertions(+), 16 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index b883aad..127aa1e 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -26,21 +26,57 @@ #include "MonitoringCore.h" #include "Row.h" #include "mk_inventory.h" + +#ifdef CMC +#include "Core.h" +#include "Host.h" +#include "Object.h" +#include "RRDBackend.h" +#include "RRDInfoCache.h" +#include "State.h" +#include "cmc.h" +#else #include "nagios.h" #include "pnp4nagios.h" +#endif int32_t HostSpecialIntColumn::getValue(Row row, const contact* /* auth_user */) const { +#ifdef CMC + if (auto object = columnData<Object>(row)) { + switch (_type) { + case Type::real_hard_state: { + auto state = object->state(); + if (state->_current_state == 0) { + return 0; + } + if (state->_state_type == StateType::hard) { + return state->_current_state; + } + return state->_last_hard_state; + } + case Type::pnp_graph_present: + return _mc->impl<Core>() + ->_rrd_backend.infoFor(object) + ._names.empty() + ? 0 + : 1; + case Type::mk_inventory_last: + return static_cast<int32_t>(mk_inventory_last( + _mc->mkInventoryPath() + "/" + object->host()->name())); + } + } +#else if (auto hst = columnData<host>(row)) { switch (_type) { case Type::real_hard_state: if (hst->current_state == 0) { return 0; - } else if (hst->state_type == 1) { - return hst->current_state; // we have reached a hard state - } else { - return hst->last_hard_state; } + if (hst->state_type == HARD_STATE) { + return hst->current_state; + } + return hst->last_hard_state; case Type::pnp_graph_present: return pnpgraph_present(_mc, hst->name, @@ -52,5 +88,6 @@ int32_t HostSpecialIntColumn::getValue(Row row, } } } +#endif return 0; } diff --git a/livestatus/src/HostSpecialIntColumn.h b/livestatus/src/HostSpecialIntColumn.h index 034367f..f9f4b1d 100644 --- a/livestatus/src/HostSpecialIntColumn.h +++ b/livestatus/src/HostSpecialIntColumn.h @@ -37,18 +37,19 @@ class HostSpecialIntColumn : public IntColumn { public: enum class Type { real_hard_state, pnp_graph_present, mk_inventory_last }; - HostSpecialIntColumn(const std::string& name, - const std::string& description, int indirect_offset, + HostSpecialIntColumn(const std::string &name, + const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset, - MonitoringCore* mc, Type hsic_type) + MonitoringCore *mc, Type hsic_type) : IntColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) , _mc(mc) , _type(hsic_type) {} - int32_t getValue(Row row, const contact* auth_user) const override; + + int32_t getValue(Row row, const contact *auth_user) const override; private: - MonitoringCore* _mc; + MonitoringCore *_mc; const Type _type; }; diff --git a/livestatus/src/ServiceSpecialIntColumn.cc b/livestatus/src/ServiceSpecialIntColumn.cc index 7fed2ee..40ddb99 100644 --- a/livestatus/src/ServiceSpecialIntColumn.cc +++ b/livestatus/src/ServiceSpecialIntColumn.cc @@ -24,17 +24,62 @@ #include "ServiceSpecialIntColumn.h" #include "Row.h" + +#ifdef CMC +#include "Core.h" +#include "Host.h" +#include "MonitoringCore.h" +#include "Object.h" +#include "RRDBackend.h" +#include "RRDInfoCache.h" +#include "State.h" +#include "cmc.h" +#include "mk_inventory.h" +#else #include "nagios.h" #include "pnp4nagios.h" +#endif int32_t ServiceSpecialIntColumn::getValue( Row row, const contact* /* auth_user */) const { +#ifdef CMC + if (auto object = columnData<Object>(row)) { + switch (_type) { + case Type::real_hard_state: { + auto state = object->state(); + if (state->_current_state == 0) { + return 0; + } + if (state->_state_type == StateType::hard) { + return state->_current_state; + } + return state->_last_hard_state; + } + case Type::pnp_graph_present: + return _mc->impl<Core>() + ->_rrd_backend.infoFor(object) + ._names.empty() + ? 0 + : 1; + } + } +#else if (auto svc = columnData<service>(row)) { switch (_type) { + case Type::real_hard_state: + if (svc->current_state == 0) { + return 0; + } + if (svc->state_type == HARD_STATE) { + return svc->current_state; + } + return svc->last_hard_state; + case Type::pnp_graph_present: return pnpgraph_present(_mc, svc->host_ptr->name, svc->description); } } +#endif return 0; } diff --git a/livestatus/src/ServiceSpecialIntColumn.h b/livestatus/src/ServiceSpecialIntColumn.h index 37008b3..82c028d 100644 --- a/livestatus/src/ServiceSpecialIntColumn.h +++ b/livestatus/src/ServiceSpecialIntColumn.h @@ -35,21 +35,22 @@ class Row; class ServiceSpecialIntColumn : public IntColumn { public: - enum class Type { pnp_graph_present }; + enum class Type { real_hard_state, pnp_graph_present }; - ServiceSpecialIntColumn(const std::string& name, - const std::string& description, int indirect_offset, + ServiceSpecialIntColumn(const std::string &name, + const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, - int offset, MonitoringCore* mc, Type ssic_type) + int offset, MonitoringCore *mc, Type ssic_type) : IntColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) , _mc(mc) , _type(ssic_type) {} - int32_t getValue(Row row, const contact* auth_user) const override; + + int32_t getValue(Row row, const contact *auth_user) const override; private: - MonitoringCore* _mc; - Type _type; + MonitoringCore *_mc; + const Type _type; }; #endif // ServiceSpecialIntColumn_h diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 8c167d5..f0fdc83 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -333,6 +333,11 @@ void TableServices::addColumns(Table *table, const std::string &prefix, "A list of all modified attributes", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, modified_attributes))); table->addColumn(std::make_unique<ServiceSpecialIntColumn>( + prefix + "hard_state", + "The effective hard state of the service (eliminates a problem in hard_state)", + indirect_offset, -1, -1, 0, table->core(), + ServiceSpecialIntColumn::Type::real_hard_state)); + table->addColumn(std::make_unique<ServiceSpecialIntColumn>( prefix + "pnpgraph_present", "Whether there is a PNP4Nagios graph present for this service (0/1)", indirect_offset, -1, -1, 0, table->core(),

6 years, 10 months

df: Move inventory_df_exclude_fs to df from df.include, because it' s only being used in this check

by Konstantin Büttner

Module: check_mk Branch: master Commit: 28f867dbc7dd63b12a02dfcc2adec78c52fe2cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28f867dbc7dd63… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 6 15:09:31 2017 +0100 df: Move inventory_df_exclude_fs to df from df.include, because it's only being used in this check Change-Id: I17577de45d3db4adfc1914648b7ef02ccbcb09a4 --- checks/df | 1 + checks/df.include | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/df b/checks/df index a0fb62b..cd6fabe 100644 --- a/checks/df +++ b/checks/df @@ -90,6 +90,7 @@ # C:\Program Files\Vision Solutions\Double-Take\Service\MountDir\usauhtest0010_c061b170-ad3f-473f-92ce-088c97fce98e_C\ NTFS 41835516 11895180 29940336 29% C:\Program Files\Vision Solutions\Double-Take\Service\MountDir\usauhtest0010_c061b170-ad3f-473f-92ce-088c97fce98e_C\ inventory_df_rules = [] +inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] def parse_df(info): diff --git a/checks/df.include b/checks/df.include index f501487..d61ce4d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -41,7 +41,6 @@ filesystem_levels = [] # obsolete. Just here to check config and warn if filesystem_default_levels = {} # can also be dropped some day in future # Filesystems to ignore (shouldn't be sent by agent anyway) -inventory_df_exclude_fs = [ 'tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660' ] inventory_df_exclude_mountpoints = [ '/dev' ] # Grouping of filesystems into groups that are monitored as one entity

6 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017