Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

5194 FIX Fixed time zone handling for Stats: columns.

by Sven Panne

Module: check_mk Branch: master Commit: 1dee163bbe7de4b233d25ebb6aa08f2e4bc8b3cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dee163bbe7de4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 09:52:18 2017 +0100 5194 FIX Fixed time zone handling for Stats: columns. The time zone specified via the Localtime: header was ignored for Stats: columns, so their returned value was wrong when it was a time-related column. This has been fixed. Change-Id: Iaa8293b710600532f9ecb6a75129f61eeae969b7 --- .werks/5194 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5194 b/.werks/5194 new file mode 100644 index 0000000..5c04f76 --- /dev/null +++ b/.werks/5194 @@ -0,0 +1,12 @@ +Title: Fixed time zone handling for Stats: columns. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509958241 +Class: fix + +The time zone specified via the Localtime: header was ignored for Stats: +columns, so their returned value was wrong when it was a time-related +column. This has been fixed.

6 years, 10 months

5193 FIX Fixed authorization handling for Livestatus queries.

by Sven Panne

Module: check_mk Branch: master Commit: b41689f3f71ddfbc87150bc1da07bde761c3a731 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b41689f3f71ddf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 09:50:13 2017 +0100 5193 FIX Fixed authorization handling for Livestatus queries. Depending on the monitoring core used, several columns did not respect the AuthUser: header, so more hosts/services/groups were returned than requested. This has been fixed. Change-Id: I3447d980f23b88141c1b83364b3b250816efb15b --- .werks/5193 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5193 b/.werks/5193 new file mode 100644 index 0000000..0217425 --- /dev/null +++ b/.werks/5193 @@ -0,0 +1,12 @@ +Title: Fixed authorization handling for Livestatus queries. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509958056 +Class: fix + +Depending on the monitoring core used, several columns did not respect the +AuthUser: header, so more hosts/services/groups were returned than +requested. This has been fixed.

6 years, 10 months

Fixed time zone handling for Stats: columns.

by Sven Panne

Module: check_mk Branch: master Commit: 143b0e2addcc01348fb30c039ca4e12081637905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=143b0e2addcc01… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 6 08:54:35 2017 +0100 Fixed time zone handling for Stats: columns. The time zone handling was done in the wrong place (during output and filtering), so Stats: columns were handled incorrectly. Easy test case: lq "GET services\nColumns: description last_check\nStats: min last_check\nLocaltime: $(date --date='1 hour' '+%s')" The time zone is now immediately handled when a time-related value is retrieved. Apart from being more correct, this is simpler, too. Change-Id: Ic94775f561f27742f0fd8653da3abb85cd0efac7 --- livestatus/src/Aggregator.h | 2 -- livestatus/src/IntAggregator.cc | 1 - livestatus/src/IntColumn.cc | 1 - livestatus/src/IntFilter.cc | 1 - livestatus/src/OffsetTimeColumn.cc | 4 ++-- livestatus/src/OffsetTimeColumn.h | 5 ++--- livestatus/src/Query.cc | 8 +++---- livestatus/src/Renderer.cc | 27 ++++++++--------------- livestatus/src/Renderer.h | 5 +---- livestatus/src/RendererBrokenCSV.h | 7 ++---- livestatus/src/RendererCSV.cc | 3 +-- livestatus/src/RendererCSV.h | 4 +--- livestatus/src/RendererJSON.cc | 3 +-- livestatus/src/RendererJSON.h | 4 +--- livestatus/src/RendererPython.cc | 3 +-- livestatus/src/RendererPython.h | 5 +---- livestatus/src/RendererPython3.cc | 3 +-- livestatus/src/RendererPython3.h | 5 +---- livestatus/src/TableEventConsole.h | 5 +++-- livestatus/src/TimeAggregator.cc | 9 ++++---- livestatus/src/TimeColumn.cc | 13 +++++++---- livestatus/src/TimeColumn.h | 8 +++++-- livestatus/src/TimeFilter.cc | 45 +++++++++++++++----------------------- livestatus/src/TimeFilter.h | 2 -- livestatus/src/TimePointerColumn.h | 10 ++++----- 25 files changed, 73 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=143b0e2add…

6 years, 10 months

5432 Network scan: The tag for the "criticality" host tag group can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c7b839ce25e79c412fb79f96906f0b33f6134ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c7b839ce25e79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 09:11:57 2017 +0100 5432 Network scan: The tag for the "criticality" host tag group can now be configured Before this change all new hosts found by the network scan were added as offline hosts (Criticality: Do not monitor this host). It is now possible to configure this value in the properties of the network scan. Change-Id: I639e216b97d833fd79b4a83d8a47c6e1c85109bc --- .werks/5432 | 12 ++++++++++++ web/htdocs/wato.py | 6 ++++-- web/htdocs/watolib.py | 7 +++++++ web/plugins/wato/builtin_attributes.py | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/.werks/5432 b/.werks/5432 new file mode 100644 index 0000000..b7c1503 --- /dev/null +++ b/.werks/5432 @@ -0,0 +1,12 @@ +Title: Network scan: The tag for the "criticality" host tag group can now be configured +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509955833 +Class: feature + +Before this change all new hosts found by the network scan were added as offline hosts +(Criticality: Do not monitor this host). It is now possible to configure this value +in the properties of the network scan. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d9331d1..584eb8f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16496,7 +16496,9 @@ def find_folder_to_scan(): def add_scanned_hosts_to_folder(folder, found): - translation = folder.attribute("network_scan").get("translate_names", {}) + network_scan_properties = folder.attribute("network_scan") + + translation = network_scan_properties.get("translate_names", {}) entries = [] for host_name, ipaddress in found: @@ -16504,7 +16506,7 @@ def add_scanned_hosts_to_folder(folder, found): attrs = { "ipaddress" : ipaddress, - "tag_criticality" : "offline", + "tag_criticality" : network_scan_properties.get("tag_criticality", "offline"), } if not watolib.Host.host_exists(host_name): entries.append((host_name, attrs, None)) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ce67a5b..94d59fe 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6395,6 +6395,13 @@ class HosttagGroup(object): return response + def get_tag_choices(self): + choices = [] + for tag in self.tags: + choices.append((tag.id, tag.title)) + return choices + + class HosttagsConfiguration(object): def __init__(self): super(HosttagsConfiguration, self).__init__() diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index abae99b..e7c1812 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -254,6 +254,13 @@ class NetworkScanAttribute(ValueSpecAttribute): return [ (user_id, "%s (%s)" % (user_id, user.get("alias", user_id))) for user_id, user in userdb.load_users(lock = False).items() ] + def tag_criticality_choices(): + tags = watolib.HosttagsConfiguration() + tags.load() + + criticality = tags.get_tag_group("criticality") + return criticality.get_tag_choices() + ValueSpecAttribute.__init__(self, "network_scan", Dictionary( elements = [ @@ -278,6 +285,14 @@ class NetworkScanAttribute(ValueSpecAttribute): help = _("Limit the execution of the scan to this time range."), allow_empty=False, )), + ("tag_criticality", DropdownChoice( + title = _("Set criticality host tag"), + help = _("Added hosts will be created as \"offline\" host by default. You " + "can change this option to activate monitoring of new hosts after " + "next activation of the configuration after the scan."), + choices = tag_criticality_choices, + default_value = "offline", + )), ("max_parallel_pings", Integer( title = _("Parallel pings to send"), help = _("Set the maximum number of concurrent pings sent to target IP "

6 years, 10 months

Added missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: e16e3f8575e85d48356947ab99aa747d8ae84e10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e16e3f8575e85d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 09:10:18 2017 +0100 Added missing import Change-Id: Ib5d244f900370e1092cbc143090be48af56c123b --- web/htdocs/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 169ae01..d9331d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -97,6 +97,7 @@ import modules as multisite_modules import watolib import cmk.paths +import cmk.translations import cmk.store as store import cmk.man_pages as man_pages from cmk.regex import escape_regex_chars, regex

6 years, 10 months

Simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: 85198f433a71e01112edd272ad3b22af6ea9a010 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85198f433a71e0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 15:35:12 2017 +0100 Simplifications. Change-Id: I9a80c461111c0194dbad6c606ddc4b7cf238fce8 --- livestatus/src/IntFilter.cc | 84 ++++++++++++++++++-------------------------- livestatus/src/IntFilter.h | 7 ++-- livestatus/src/TimeFilter.cc | 10 ++---- livestatus/src/TimeFilter.h | 5 ++- 4 files changed, 42 insertions(+), 64 deletions(-) diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc index 8683f18..855c676 100644 --- a/livestatus/src/IntFilter.cc +++ b/livestatus/src/IntFilter.cc @@ -25,63 +25,52 @@ #include "IntFilter.h" #include <cstdlib> #include <ostream> -#include <utility> #include "IntColumn.h" #include "Logger.h" #include "Row.h" IntFilter::IntFilter(const IntColumn &column, RelationalOperator relOp, - std::string value) - : _column(column), _relOp(relOp), _ref_string(std::move(value)) {} + const std::string &value) + : _column(column), _relOp(relOp), _ref_value(atoi(value.c_str())) {} std::string IntFilter::columnName() const { return _column.name(); } -// overridden by TimeFilter in order to apply timezone offset from Localtime: -// header -bool IntFilter::adjustWithTimezoneOffset() const { return false; } - -int32_t IntFilter::convertRefValue(std::chrono::seconds timezone_offset) const { - return atoi(_ref_string.c_str()) - - (adjustWithTimezoneOffset() ? timezone_offset.count() : 0); -} - bool IntFilter::accepts(Row row, const contact *auth_user, - std::chrono::seconds timezone_offset) const { + std::chrono::seconds /*timezone_offset*/) const { // NOTE: IntColumn::getValue() call site int32_t act_value = _column.getValue(row, auth_user); - int32_t ref_value = convertRefValue(timezone_offset); switch (_relOp) { case RelationalOperator::equal: - return act_value == ref_value; + return act_value == _ref_value; case RelationalOperator::not_equal: - return act_value != ref_value; + return act_value != _ref_value; case RelationalOperator::matches: // superset - return (act_value & ref_value) == ref_value; + return (act_value & _ref_value) == _ref_value; case RelationalOperator::doesnt_match: // not superset - return (act_value & ref_value) != ref_value; + return (act_value & _ref_value) != _ref_value; case RelationalOperator::equal_icase: // subset - return (act_value & ref_value) == act_value; + return (act_value & _ref_value) == act_value; case RelationalOperator::not_equal_icase: // not subset - return (act_value & ref_value) != act_value; + return (act_value & _ref_value) != act_value; case RelationalOperator::matches_icase: // contains any - return (act_value & ref_value) != 0; + return (act_value & _ref_value) != 0; case RelationalOperator::doesnt_match_icase: // contains none of - return (act_value & ref_value) == 0; + return (act_value & _ref_value) == 0; case RelationalOperator::less: - return act_value < ref_value; + return act_value < _ref_value; case RelationalOperator::greater_or_equal: - return act_value >= ref_value; + return act_value >= _ref_value; case RelationalOperator::greater: - return act_value > ref_value; + return act_value > _ref_value; case RelationalOperator::less_or_equal: - return act_value <= ref_value; + return act_value <= _ref_value; } return false; // unreachable } void IntFilter::findIntLimits(const std::string &column_name, int *lower, int *upper, - std::chrono::seconds timezone_offset) const { + std::chrono::seconds /*timezone_offset*/) const { if (column_name != columnName()) { return; // wrong column } @@ -89,45 +78,43 @@ void IntFilter::findIntLimits(const std::string &column_name, int *lower, return; // already empty interval } - int32_t ref_value = convertRefValue(timezone_offset); - /* [lower, upper[ is some interval. This filter might restrict that interval to a smaller interval. */ switch (_relOp) { case RelationalOperator::equal: - if (ref_value >= *lower && ref_value < *upper) { - *lower = ref_value; - *upper = ref_value + 1; + if (_ref_value >= *lower && _ref_value < *upper) { + *lower = _ref_value; + *upper = _ref_value + 1; } else { *lower = *upper; } return; case RelationalOperator::not_equal: - if (ref_value == *lower) { + if (_ref_value == *lower) { *lower = *lower + 1; - } else if (ref_value == *upper - 1) { + } else if (_ref_value == *upper - 1) { *upper = *upper - 1; } return; case RelationalOperator::less: - if (ref_value < *upper) { - *upper = ref_value; + if (_ref_value < *upper) { + *upper = _ref_value; } return; case RelationalOperator::greater_or_equal: - if (ref_value > *lower) { - *lower = ref_value; + if (_ref_value > *lower) { + *lower = _ref_value; } return; case RelationalOperator::greater: - if (ref_value >= *lower) { - *lower = ref_value + 1; + if (_ref_value >= *lower) { + *lower = _ref_value + 1; } return; case RelationalOperator::less_or_equal: - if (ref_value < *upper - 1) { - *upper = ref_value + 1; + if (_ref_value < *upper - 1) { + *upper = _ref_value + 1; } return; case RelationalOperator::matches: @@ -143,21 +130,20 @@ void IntFilter::findIntLimits(const std::string &column_name, int *lower, } } -bool IntFilter::optimizeBitmask(const std::string &column_name, uint32_t *mask, - std::chrono::seconds timezone_offset) const { - int32_t ref_value = convertRefValue(timezone_offset); - +bool IntFilter::optimizeBitmask( + const std::string &column_name, uint32_t *mask, + std::chrono::seconds /*timezone_offset*/) const { if (column_name != columnName()) { return false; // wrong column } - if (ref_value < 0 || ref_value > 31) { + if (_ref_value < 0 || _ref_value > 31) { return true; // not optimizable by 32bit bit mask } // Our task is to remove those bits from mask that are deselected by the // filter. - uint32_t bit = 1 << ref_value; + uint32_t bit = 1 << _ref_value; switch (_relOp) { case RelationalOperator::equal: @@ -176,7 +162,7 @@ bool IntFilter::optimizeBitmask(const std::string &column_name, uint32_t *mask, } return true; case RelationalOperator::less_or_equal: - if (ref_value == 31) { + if (_ref_value == 31) { return true; } bit <<= 1; diff --git a/livestatus/src/IntFilter.h b/livestatus/src/IntFilter.h index 1091d44..5e0173c 100644 --- a/livestatus/src/IntFilter.h +++ b/livestatus/src/IntFilter.h @@ -38,7 +38,7 @@ class Row; class IntFilter : public ColumnFilter { public: IntFilter(const IntColumn &column, RelationalOperator relOp, - std::string value); + const std::string &value); bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; @@ -54,10 +54,7 @@ public: private: const IntColumn &_column; const RelationalOperator _relOp; - const std::string _ref_string; - - bool adjustWithTimezoneOffset() const; - int32_t convertRefValue(std::chrono::seconds timezone_offset) const; + const int32_t _ref_value; }; #endif // IntFilter_h diff --git a/livestatus/src/TimeFilter.cc b/livestatus/src/TimeFilter.cc index f574df4..c24e693 100644 --- a/livestatus/src/TimeFilter.cc +++ b/livestatus/src/TimeFilter.cc @@ -25,23 +25,19 @@ #include "TimeFilter.h" #include <cstdlib> #include <ostream> -#include <utility> #include "Logger.h" #include "Row.h" #include "TimeColumn.h" TimeFilter::TimeFilter(const TimeColumn &column, RelationalOperator relOp, - std::string value) - : _column(column), _relOp(relOp), _ref_string(std::move(value)) {} + const std::string &value) + : _column(column), _relOp(relOp), _ref_value(atoi(value.c_str())) {} std::string TimeFilter::columnName() const { return _column.name(); } -bool TimeFilter::adjustWithTimezoneOffset() const { return true; } - int32_t TimeFilter::convertRefValue( std::chrono::seconds timezone_offset) const { - return atoi(_ref_string.c_str()) - - (adjustWithTimezoneOffset() ? timezone_offset.count() : 0); + return _ref_value - timezone_offset.count(); } bool TimeFilter::accepts(Row row, const contact *auth_user, diff --git a/livestatus/src/TimeFilter.h b/livestatus/src/TimeFilter.h index 15143dc..551a689 100644 --- a/livestatus/src/TimeFilter.h +++ b/livestatus/src/TimeFilter.h @@ -38,7 +38,7 @@ class TimeColumn; class TimeFilter : public ColumnFilter { public: TimeFilter(const TimeColumn &column, RelationalOperator relOp, - std::string value); + const std::string &value); bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; @@ -54,9 +54,8 @@ public: private: const TimeColumn &_column; const RelationalOperator _relOp; - const std::string _ref_string; + const int32_t _ref_value; - bool adjustWithTimezoneOffset() const; int32_t convertRefValue(std::chrono::seconds timezone_offset) const; };

6 years, 10 months

Improved TimeColumn::getValue() return type.

by Sven Panne

Module: check_mk Branch: master Commit: d0cd1f0cda82e0c89d5693da41e0f498a2cc3e05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cd1f0cda82e0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 15:52:27 2017 +0100 Improved TimeColumn::getValue() return type. Change-Id: I14262e9fbf2cf9d4dd6b7c817b1b56dec7a29595 --- livestatus/src/OffsetTimeColumn.cc | 8 ++++---- livestatus/src/OffsetTimeColumn.h | 5 +++-- livestatus/src/TableEventConsole.h | 6 +++--- livestatus/src/TimeAggregator.cc | 3 ++- livestatus/src/TimeColumn.cc | 2 +- livestatus/src/TimeColumn.h | 4 ++-- livestatus/src/TimeFilter.cc | 3 ++- livestatus/src/TimePointerColumn.h | 6 +++--- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/livestatus/src/OffsetTimeColumn.cc b/livestatus/src/OffsetTimeColumn.cc index 32c40ec..727c673 100644 --- a/livestatus/src/OffsetTimeColumn.cc +++ b/livestatus/src/OffsetTimeColumn.cc @@ -26,10 +26,10 @@ #include <ctime> #include "Row.h" -int32_t OffsetTimeColumn::getValue(Row row, - const contact* /* auth_user */) const { +std::chrono::system_clock::time_point OffsetTimeColumn::getValue( + Row row, const contact* /* auth_user */) const { if (auto p = columnData<time_t>(row)) { - return static_cast<int32_t>(*p); + return std::chrono::system_clock::from_time_t(*p); } - return 0; + return std::chrono::system_clock::time_point(); } diff --git a/livestatus/src/OffsetTimeColumn.h b/livestatus/src/OffsetTimeColumn.h index 04809ea..a931b2e 100644 --- a/livestatus/src/OffsetTimeColumn.h +++ b/livestatus/src/OffsetTimeColumn.h @@ -26,7 +26,7 @@ #define OffsetTimeColumn_h #include "config.h" // IWYU pragma: keep -#include <cstdint> +#include <chrono> #include <string> #include "TimeColumn.h" #include "contact_fwd.h" @@ -40,7 +40,8 @@ public: : TimeColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} - int32_t getValue(Row row, const contact* auth_user) const override; + std::chrono::system_clock::time_point getValue( + Row row, const contact* auth_user) const override; }; #endif // OffsetTimeColumn_h diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index f0b7d53..f44b564 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -135,9 +135,9 @@ protected: return static_cast<int32_t>(atof(x.c_str())); }) {} - int32_t getValue(Row row, - const contact * /* auth_user */) const override { - return _ecc.getValue(row); + std::chrono::system_clock::time_point getValue( + Row row, const contact * /* auth_user */) const override { + return std::chrono::system_clock::from_time_t(_ecc.getValue(row)); } }; diff --git a/livestatus/src/TimeAggregator.cc b/livestatus/src/TimeAggregator.cc index 76d7362..63242c3 100644 --- a/livestatus/src/TimeAggregator.cc +++ b/livestatus/src/TimeAggregator.cc @@ -33,7 +33,8 @@ void TimeAggregator::consume(Row row, const contact *auth_user, std::chrono::seconds /* timezone_offset */) { _count++; // NOTE: TimeColumn::getValue() call site - int32_t value = _column->getValue(row, auth_user); + int32_t value = + std::chrono::system_clock::to_time_t(_column->getValue(row, auth_user)); switch (getOperation()) { case StatsOperation::sum: case StatsOperation::avg: diff --git a/livestatus/src/TimeColumn.cc b/livestatus/src/TimeColumn.cc index 0469c5c..5e765e1 100644 --- a/livestatus/src/TimeColumn.cc +++ b/livestatus/src/TimeColumn.cc @@ -33,7 +33,7 @@ void TimeColumn::output(Row row, RowRenderer &r, const contact *auth_user, std::chrono::seconds /*timezone_offset*/) const { // NOTE: TimeColumn::getValue() call site - r.output(std::chrono::system_clock::from_time_t(getValue(row, auth_user))); + r.output(getValue(row, auth_user)); } std::unique_ptr<Filter> TimeColumn::createFilter( diff --git a/livestatus/src/TimeColumn.h b/livestatus/src/TimeColumn.h index 82fb36f..d33a57d 100644 --- a/livestatus/src/TimeColumn.h +++ b/livestatus/src/TimeColumn.h @@ -27,7 +27,6 @@ #include "config.h" // IWYU pragma: keep #include <chrono> -#include <cstdint> #include <memory> #include <string> #include "Aggregator.h" @@ -57,7 +56,8 @@ public: std::unique_ptr<Aggregator> createAggregator( StatsOperation operation) const override; - virtual int32_t getValue(Row row, const contact *auth_user) const = 0; + virtual std::chrono::system_clock::time_point getValue( + Row row, const contact *auth_user) const = 0; }; #endif // TimeColumn_h diff --git a/livestatus/src/TimeFilter.cc b/livestatus/src/TimeFilter.cc index c24e693..4aeea1a 100644 --- a/livestatus/src/TimeFilter.cc +++ b/livestatus/src/TimeFilter.cc @@ -43,7 +43,8 @@ int32_t TimeFilter::convertRefValue( bool TimeFilter::accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const { // NOTE: TimeColumn::getValue() call site - int32_t act_value = _column.getValue(row, auth_user); + int32_t act_value = + std::chrono::system_clock::to_time_t(_column.getValue(row, auth_user)); int32_t ref_value = convertRefValue(timezone_offset); switch (_relOp) { case RelationalOperator::equal: diff --git a/livestatus/src/TimePointerColumn.h b/livestatus/src/TimePointerColumn.h index 99b6723..fc910c4 100644 --- a/livestatus/src/TimePointerColumn.h +++ b/livestatus/src/TimePointerColumn.h @@ -39,9 +39,9 @@ public: const time_t *number) : TimeColumn(name, description, -1, -1, -1, 0), _number(number) {} - int32_t getValue(Row /* row */, - const contact * /* auth_user */) const override { - return static_cast<int32_t>(*_number); + std::chrono::system_clock::time_point getValue( + Row /* row */, const contact * /* auth_user */) const override { + return std::chrono::system_clock::from_time_t(*_number); } private:

6 years, 10 months

Do not derive time-related columns/filtes/ aggregators from their int counterparts.

by Sven Panne

Module: check_mk Branch: master Commit: 127a46af3721a844c1a205cc2d8fab1dd901619a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=127a46af3721a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 14:54:01 2017 +0100 Do not derive time-related columns/filtes/aggregators from their int counterparts. They have different semantics (time zone offset!), and we derived only to re-use code, which is considered an anti-pattern. We will fix the newly introduced code duplication later, the main point of this completely mechanical commit is to get the class hierarchies right. Change-Id: I23d43fd79fdb8d3caea7fd3502d5ee26dd37c16c --- livestatus/src/IntColumn.h | 10 +-- livestatus/src/IntFilter.h | 6 +- livestatus/src/Makefile.am | 1 + livestatus/src/TimeAggregator.cc | 122 +++++++++++++++++++++++++++ livestatus/src/TimeAggregator.h | 56 +++++++++++++ livestatus/src/TimeColumn.cc | 6 +- livestatus/src/TimeColumn.h | 15 ++-- livestatus/src/TimeFilter.cc | 177 +++++++++++++++++++++++++++++++++++++++ livestatus/src/TimeFilter.h | 33 ++++++-- 9 files changed, 404 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=127a46af37…

6 years, 10 months

Refactored some WATO modes to classes; Refactored main menu code

by Lars Michelsen

Module: check_mk Branch: master Commit: 073ec3ca47f57589cba78234d1effed505fdf8c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=073ec3ca47f575… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 21 22:55:25 2017 +0200 Refactored some WATO modes to classes; Refactored main menu code Change-Id: Ia701e5149b70b69529cc331e53dc8151a55f279c --- web/htdocs/wato.py | 3135 +++++++++++++++++++++++++----------------------- web/plugins/wato/bi.py | 17 +- 2 files changed, 1641 insertions(+), 1511 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=073ec3ca47…

6 years, 10 months

Improved separation of watolib and wato

by Lars Michelsen

Module: check_mk Branch: master Commit: c74ba91d47b000fe42923bc11e05f1aa50592505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74ba91d47b000… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Aug 19 20:44:41 2017 +0200 Improved separation of watolib and wato The wato.py was importing all things of the watolib.py via star import to it's own namespace. With the later plugin loading mechanism confusions (and bugs) could occur easily because there are not only functions and classes, but also data structures loaded from watolib.py. The current idea of these both modules is now: - wato: Implementation of WATO pages (the views you can open in browser) and registration of things to configure via plugins (rulesets, global settings, ...). - watolib: Implementation of the logic and data structures. Plugins for the watolib extend the internal functionality of WATO. The watolib module is allowed to be imported from the whole GUI code. The wato module should only be imported for accessing the pages. The thing that has been changed now is that the star import has been removed and all references from wato to watolib has been made explicit. Most wato plugins should be compatible with this change. Plugins that are doing more than just registering some configuration options may miss some variables / methods that were available before. This can mostly be solved by specifying the module name <tt>watolib.</tt> before the name. Change-Id: I95e8530c36293ca3916e538a576e1981fcc1f33e --- web/htdocs/notifications.py | 2 +- web/htdocs/userdb.py | 8 +- web/htdocs/wato.py | 1375 ++++++++++++---------------- web/htdocs/watolib.py | 237 ++++- web/plugins/pages/wato.py | 3 +- web/plugins/sidebar/shipped.py | 5 +- web/plugins/sidebar/wato.py | 9 +- web/plugins/userdb/hook_auth.py | 5 +- web/plugins/userdb/ldap.py | 12 +- web/plugins/views/wato.py | 5 +- web/plugins/visuals/wato.py | 6 +- web/plugins/wato/backup_domains.py | 2 +- web/plugins/wato/bi.py | 14 +- web/plugins/wato/builtin_attributes.py | 2 +- web/plugins/wato/check_mk_configuration.py | 10 +- web/plugins/wato/datasource_programs.py | 26 +- web/plugins/wato/mkeventd.py | 14 +- web/plugins/wato/omd_configuration.py | 14 +- 18 files changed, 914 insertions(+), 835 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c74ba91d47…

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017