Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 7ec531567b0ed3e65ffb0328e27278327361b008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec531567b0ed3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 20 18:00:06 2017 +0100 Fixed wrong manpage name Change-Id: Ibf62e887a309988784b89fb787992078bc8bb745 --- checkman/{stormshield_packages => stormshield_packets} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/stormshield_packages b/checkman/stormshield_packets similarity index 100% rename from checkman/stormshield_packages rename to checkman/stormshield_packets

6 years, 10 months

Unified aggregators a bit. Made edge cases consistent (Inf or NaN).

by Sven Panne

Module: check_mk Branch: master Commit: 54c18a35974f096c0c6531450c254302fe6d09ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54c18a35974f09… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 15:13:14 2017 +0100 Unified aggregators a bit. Made edge cases consistent (Inf or NaN). Change-Id: Ib567c147142234041a717ca4d2f03edd73fb192e --- livestatus/src/DoubleAggregator.cc | 52 ++++++++++++------------ livestatus/src/IntAggregator.cc | 75 ++++++++++++++--------------------- livestatus/src/IntAggregator.h | 2 +- livestatus/src/PerfdataAggregator.cc | 60 +++++++++++++++++----------- livestatus/src/PerfdataAggregator.h | 2 +- livestatus/src/TimeAggregator.cc | 77 +++++++++++++++--------------------- livestatus/src/TimeAggregator.h | 2 +- 7 files changed, 128 insertions(+), 142 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=54c18a3597…

6 years, 10 months

Removed slightly confusing StatsOperation:: count. Improved class hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: 396b6141e3b99dfca1f4f4f4d93679ab591368f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=396b6141e3b99d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 11:59:01 2017 +0100 Removed slightly confusing StatsOperation::count. Improved class hierarchy. Change-Id: I7f5c87fd25c9f1f3db450f0d0e56176f0fdb0c1f --- livestatus/src/Aggregator.h | 9 +---- livestatus/src/CountAggregator.h | 2 +- livestatus/src/DoubleAggregator.cc | 8 ++--- livestatus/src/DoubleAggregator.h | 3 +- livestatus/src/IntAggregator.cc | 8 ++--- livestatus/src/IntAggregator.h | 3 +- livestatus/src/PerfdataAggregator.cc | 10 ++---- livestatus/src/PerfdataAggregator.h | 3 +- livestatus/src/Query.cc | 65 ++++++++++++------------------------ livestatus/src/StatsColumn.cc | 44 +++++++++++++++--------- livestatus/src/StatsColumn.h | 27 ++++++++++++--- livestatus/src/TimeAggregator.cc | 8 ++--- livestatus/src/TimeAggregator.h | 3 +- 13 files changed, 91 insertions(+), 102 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=396b6141e3…

6 years, 10 months

Centralize error handling a bit more.

by Sven Panne

Module: check_mk Branch: master Commit: 699f590f17187a664cc343c886666cf0e8f1e7b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=699f590f17187a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 11:39:20 2017 +0100 Centralize error handling a bit more. Change-Id: I829603e3fb5324ec1770e50a753b10a6f787953b --- livestatus/src/Query.cc | 13 ++----------- livestatus/src/StatsColumn.cc | 7 ++++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 4171ee9..57838fc 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -261,12 +261,7 @@ void Query::parseStatsAndOrLine(char *line, LogicalOperator op) { " filters, but only " + std::to_string(i) + " " + (i == 1 ? "is" : "are") + " on stack"); } - auto &col = _stats_columns.back(); - if (col->operation() != StatsOperation::count) { - throw std::runtime_error( - "only valid on Stats: headers of filter type"); - } - subfilters.push_back(col->stealFilter()); + subfilters.push_back(_stats_columns.back()->stealFilter()); _stats_columns.pop_back(); } _stats_columns.push_back(std::make_unique<StatsColumn>( @@ -279,11 +274,7 @@ void Query::parseStatsNegateLine(char *line) { throw("error combining filters for table '" + _table->name() + "': expected 1 filters, but only 0 are on stack"); } - auto &col = _stats_columns.back(); - if (col->operation() != StatsOperation::count) { - throw std::runtime_error("only valid on Stats: headers of filter type"); - } - auto to_negate = col->stealFilter(); + auto to_negate = _stats_columns.back()->stealFilter(); _stats_columns.pop_back(); _stats_columns.push_back(std::make_unique<StatsColumn>( nullptr, to_negate->negate(), StatsOperation::count)); diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index bd75909..cffc974 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -34,7 +34,12 @@ StatsColumn::StatsColumn(Column *c, std::unique_ptr<Filter> f, StatsOperation o) : _column(c), _filter(std::move(f)), _operation(o) {} -std::unique_ptr<Filter> StatsColumn::stealFilter() { return move(_filter); } +std::unique_ptr<Filter> StatsColumn::stealFilter() { + if (_operation != StatsOperation::count) { + throw std::runtime_error("not a counting aggregator"); + } + return move(_filter); +} std::unique_ptr<Aggregator> StatsColumn::createAggregator( Logger *logger) const {

6 years, 10 months

Nuked plain C versions of lstrip/rstrip.

by Sven Panne

Module: check_mk Branch: master Commit: 8f4bef8c21c530f9c6a2895512f0d124b279d9b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4bef8c21c530… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 10:03:47 2017 +0100 Nuked plain C versions of lstrip/rstrip. Change-Id: I31035bbeb6394a395fa384806e924d6eb654dcfb --- livestatus/src/Query.cc | 25 ++++++++----------------- livestatus/src/strutil.cc | 31 +++++++++---------------------- livestatus/src/strutil.h | 2 -- 3 files changed, 17 insertions(+), 41 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 459fa19..4171ee9 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -323,13 +323,9 @@ void Query::parseStatsLine(char *line) { auto column = _table->column(column_name); std::unique_ptr<Filter> filter; if (operation == StatsOperation::count) { - RelationalOperator relOp = - relationalOperatorForName(nextStringArgument(&line)); - char *value = lstrip(line); - if (value == nullptr) { - throw std::runtime_error("missing value after operator"); - } - filter = column->createFilter(relOp, value); + auto relOp = relationalOperatorForName(nextStringArgument(&line)); + auto operand = mk::lstrip(line); + filter = column->createFilter(relOp, operand); } else { // create an "accept all" filter, just in case we fall back to counting filter = std::make_unique<AndingFilter>( @@ -346,14 +342,9 @@ void Query::parseStatsLine(char *line) { void Query::parseFilterLine(char *line, FilterStack &filters) { auto column = _table->column(nextStringArgument(&line)); - RelationalOperator relOp = - relationalOperatorForName(nextStringArgument(&line)); - char *value = lstrip(line); - if (value == nullptr) { - throw std::runtime_error("missing value after operator"); - } - - auto sub_filter = column->createFilter(relOp, value); + auto relOp = relationalOperatorForName(nextStringArgument(&line)); + auto operand = mk::lstrip(line); + auto sub_filter = column->createFilter(relOp, operand); filters.push_back(std::move(sub_filter)); _all_columns.insert(column); } @@ -490,10 +481,10 @@ void Query::parseWaitTriggerLine(char *line) { } void Query::parseWaitObjectLine(char *line) { - char *objectspec = lstrip(line); + auto objectspec = mk::lstrip(line); _wait_object = _table->findObject(objectspec); if (_wait_object.isNull()) { - throw std::runtime_error("object '" + std::string(objectspec) + + throw std::runtime_error("object '" + objectspec + "' not found or not supported by this table"); } } diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index 779be3a..3659479 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -24,30 +24,17 @@ #include "strutil.h" #include <cctype> -#include <cstring> -char *rstrip(char *c) { - char *w = c + strlen(c) - 1; - while (w >= c && (isspace(*w) != 0)) { - *w-- = '\0'; - } - return c; -} - -char *lstrip(char *c) { - while (isspace(*c) != 0) { - c++; - } - return c; -} - -/* *c points to a string containing white space separated columns. This method - returns a pointer to the zero-terminated next field. That might be identical - with *c itself. The pointer c is then moved to the possible beginning of the - next field. */ +// *c points to a string containing white space separated columns. This method +// returns a pointer to the zero-terminated next field. That might be identical +// with *c itself. The pointer c is then moved to the possible beginning of the +// next field. char *next_field(char **c) { - /* *c points to first character of field */ - char *begin = lstrip(*c); // skip leading spaces + // skip leading spaces + char *begin = *c; + while (isspace(*begin) != 0) { + begin++; + } if (*begin == 0) { *c = begin; return nullptr; // found end of string -> no more field diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index 4e47ca6..4802315 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -27,8 +27,6 @@ #include "config.h" // IWYU pragma: keep -char *rstrip(char *); -char *lstrip(char *); char *next_token(char **c, char delim); const char *safe_next_token(char **c, char delim); char *next_field(char **c);

6 years, 10 months

Introduce null object.

by Sven Panne

Module: check_mk Branch: master Commit: 7f795fdc66b36a18d91b6125238b02e74acc3081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f795fdc66b36a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 09:49:35 2017 +0100 Introduce null object. Change-Id: I4faa3c161f7b38e198e0d68c07aed015e563b35a See: https://refactoring.com/catalog/introduceNullObject.html --- livestatus/src/CountAggregator.cc | 4 +--- livestatus/src/Query.cc | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/livestatus/src/CountAggregator.cc b/livestatus/src/CountAggregator.cc index c9d589f..a7dd3cf 100644 --- a/livestatus/src/CountAggregator.cc +++ b/livestatus/src/CountAggregator.cc @@ -29,9 +29,7 @@ void CountAggregator::consume(Row row, const contact* auth_user, std::chrono::seconds timezone_offset) { - // _filter is 0 --> no filter, accept all rows - if (_filter == nullptr || - _filter->accepts(row, auth_user, timezone_offset)) { + if (_filter->accepts(row, auth_user, timezone_offset)) { _count++; } } diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 7d7cde0..459fa19 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -330,6 +330,10 @@ void Query::parseStatsLine(char *line) { throw std::runtime_error("missing value after operator"); } filter = column->createFilter(relOp, value); + } else { + // create an "accept all" filter, just in case we fall back to counting + filter = std::make_unique<AndingFilter>( + std::vector<std::unique_ptr<Filter>>()); } _stats_columns.push_back( std::make_unique<StatsColumn>(column.get(), move(filter), operation));

6 years, 10 months

5532 Host/Service states and outputs can now be translated

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e25c7b620a6f2b566c157c98ade89f81a75f654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e25c7b620a6f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 20 10:31:16 2017 +0100 5532 Host/Service states and outputs can now be translated The states and service status detail of hosts and services can now be translated. You can now use the rules {{Host state translation}} and {{Service state translation}} to configure the Check_MK core to translate either specific states to other states or the status detail to other texts. States: For each host/service you can configure a transformation of each possible monitoring state to another one. The state translation can, for example, be used to inverse a host check in case you want to get a notification in case a host becomes reachable. The translation of detail outputs is done using regular expressions. You can specify multiple regular expressions (infix match, case sensitive) per object which are applied to the current status detail. The matched text will be replaced by the specified replacement text. You can use match groups to extract parts of the original text using the regular expression. Change-Id: I1f81a91bfbedcf3a3f14566fe5a7a121418f38fe --- .werks/5532 | 24 ++++++++++++++++++++++++ web/htdocs/valuespec.py | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.werks/5532 b/.werks/5532 new file mode 100644 index 0000000..c9f53df --- /dev/null +++ b/.werks/5532 @@ -0,0 +1,24 @@ +Title: Host/Service states and outputs can now be translated +Level: 2 +Component: cmc +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1511169817 +Class: feature + +The states and service status detail of hosts and services can now be translated. You can now +use the rules {{Host state translation}} and {{Service state translation}} to configure the +Check_MK core to translate either specific states to other states or the status detail to other +texts. + +States: For each host/service you can configure a transformation of each possible monitoring state +to another one. + +The state translation can, for example, be used to inverse a host check in case you want to get +a notification in case a host becomes reachable. + +The translation of detail outputs is done using regular expressions. You can specify multiple +regular expressions (infix match, case sensitive) per object which are applied to the current +status detail. The matched text will be replaced by the specified replacement text. You can +use match groups to extract parts of the original text using the regular expression. diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8de080f..a09712a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1733,6 +1733,7 @@ class DropdownChoice(ValueSpec): # Special conveniance variant for monitoring states +# TODO: Rename to ServiceState() or something like this class MonitoringState(DropdownChoice): def __init__(self, **kwargs): choices = [ ( 0, _("OK")), @@ -1742,6 +1743,17 @@ class MonitoringState(DropdownChoice): kwargs.setdefault("default_value", 0) DropdownChoice.__init__(self, choices=choices, **kwargs) + +class HostState(DropdownChoice): + def __init__(self, **kwargs): + choices = [ + ( 0, _("UP")), + ( 1, _("DOWN")), + ( 2, _("UNREACHABLE")), + ] + kwargs.setdefault("default_value", 0) + DropdownChoice.__init__(self, choices=choices, **kwargs) + # A Dropdown choice where the elements are ValueSpecs. # The currently selected ValueSpec will be displayed. # The text representations of the ValueSpecs will be used as texts.

6 years, 10 months

Use exceptions instead of magic values, simplifying things quite a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 3505f73a6e8c474d1fce16236c5c730517293ec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3505f73a6e8c47… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 20 08:44:03 2017 +0100 Use exceptions instead of magic values, simplifying things quite a bit. Change-Id: I2f9b19017ef17065c60eccd83f6d25eaa752affc --- livestatus/src/DynamicLogwatchFileColumn.cc | 16 +++++------ livestatus/src/Query.cc | 41 ++++++++--------------------- livestatus/src/Table.cc | 32 ++++++++-------------- livestatus/src/TableLog.cc | 20 +++++++------- livestatus/src/TableStateHistory.cc | 18 ++++++------- livestatus/src/opids.cc | 16 +++++------ livestatus/src/opids.h | 4 +-- 7 files changed, 54 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3505f73a6e…

6 years, 10 months

5548 FIX zpool_status: Fixed crash if pool has been deleted or vanished

by Marcel Arentz

Module: check_mk Branch: master Commit: 1fc70e65f80cfd79da72f66344d0c0319733a39c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fc70e65f80cfd… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Nov 20 08:42:01 2017 +0100 5548 FIX zpool_status: Fixed crash if pool has been deleted or vanished The service would crash if a previously detected pool has been removed/deleted or vanished for some reasons. This is now fixed and the service output will reflect that no pool is available. Change-Id: Id55b02802f69893e9949775e92b497910d99e1fe --- .werks/5548 | 12 ++++++++++++ checks/zpool_status | 2 ++ 2 files changed, 14 insertions(+) diff --git a/.werks/5548 b/.werks/5548 new file mode 100644 index 0000000..9b1949e --- /dev/null +++ b/.werks/5548 @@ -0,0 +1,12 @@ +Title: zpool_status: Fixed crash if pool has been deleted or vanished +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1511163595 +Class: fix + +The service would crash if a previously detected pool has been removed/deleted +or vanished for some reasons. This is now fixed and the service output will +reflect that no pool is available. diff --git a/checks/zpool_status b/checks/zpool_status index f0cbfe4..a700226 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -71,6 +71,8 @@ def inventory_zpool_status(info): def check_zpool_status(_no_item, _no_params, info): if " ".join(info[0]) == "all pools are healthy": return 0, "All pools are healthy" + elif " ".join(info[0]) == "no pools available": + return 3, "No pools available" start_pool = False multiline = False

6 years, 10 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: f039003c1dbbb4f9a75ca6c47269c694daa43f37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f039003c1dbbb4… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Nov 20 08:39:53 2017 +0100 Reserved 10 Werk IDS Change-Id: I68835c048752a2b191b64bb06ba652b1210e886d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1a97831..b610eca 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5548 +5558

6 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
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