Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 830f1db66721bd1f29fa9b23aec528c468f406ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830f1db66721bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 11 14:00:02 2017 +0200 Revert "transformed checkplugin" This reverts commit c9992bdda6c8c832aa44752d99d746988427f1e8. It broke the integration tests: https://ci.mathias-kettner.de/job/cmk_master/job/integrationstests/2867/ --- checks/{stormshield_sync => stormshield_policy} | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/checks/stormshield_sync b/checks/stormshield_policy similarity index 67% rename from checks/stormshield_sync rename to checks/stormshield_policy index 24ffcc0..5422e0a 100644 --- a/checks/stormshield_sync +++ b/checks/stormshield_policy @@ -28,28 +28,30 @@ # example output -def inventory_stormshield_sync(info): - return [ (None, None) ] +def inventory_stormshield_policy(info): + for line in info: + yield (line[0], None) -def check_stormshield_sync(_no_item, _no_params, info): +def check_stormshield_policy(item, params, info): sync_status = { - '1' : (0, "Synced"), - '0' : (2, "Not synced"), - '-1' : (3, "Unknown / error"), + '1' : (0, "synced"), + '2' : (2, "not synced"), } - state, state_readable = sync_status[info[0][0]] - return state, "%s" % state_readable + for line in info: + if line[0] == item: + state, state_readable = sync_status[line[1]] + yield state, "Policy is %s" % state_readable - -check_info['stormshield_sync'] = { - 'inventory_function' : inventory_stormshield_sync, - 'check_function' : check_stormshield_sync, - 'service_description' : 'Sync status', - 'snmp_info' : ('.1.3.6.1.4.1.11256.1.11', [ - '8', # STORMSHIELD-POLICY-MIB::snsHASyncStatus +check_info['stormshield_policy'] = { + 'inventory_function' : inventory_stormshield_policy, + 'check_function' : check_stormshield_policy, + 'service_description' : 'Policy %s status', + 'snmp_info' : ('.1.3.6.1.4.1.11256.1.8.1.1', [ + '2', # STORMSHIELD-POLICY-MIB::snsPolicyName + '5', # STORMSHIELD-POLICY-MIB::snsPolicySync ]), 'snmp_scan_function' : stormshield_scan_function, 'includes' : [ 'stormshield.include' ],

6 years, 10 months

transformed checkplugin

by Marcel Arentz

Module: check_mk Branch: master Commit: c9992bdda6c8c832aa44752d99d746988427f1e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9992bdda6c8c8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Aug 10 17:36:19 2017 +0200 transformed checkplugin The original plugin did not the job. The sync status can only be checked at all but not for particular policies. Change-Id: I2e2af0c893b61af62f9612d21d8c11cfec8ebf7b --- checks/{stormshield_policy => stormshield_sync} | 32 ++++++++++++------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/checks/stormshield_policy b/checks/stormshield_sync similarity index 67% rename from checks/stormshield_policy rename to checks/stormshield_sync index 5422e0a..24ffcc0 100644 --- a/checks/stormshield_policy +++ b/checks/stormshield_sync @@ -28,30 +28,28 @@ # example output -def inventory_stormshield_policy(info): - for line in info: - yield (line[0], None) +def inventory_stormshield_sync(info): + return [ (None, None) ] -def check_stormshield_policy(item, params, info): +def check_stormshield_sync(_no_item, _no_params, info): sync_status = { - '1' : (0, "synced"), - '2' : (2, "not synced"), + '1' : (0, "Synced"), + '0' : (2, "Not synced"), + '-1' : (3, "Unknown / error"), } - for line in info: - if line[0] == item: - state, state_readable = sync_status[line[1]] - yield state, "Policy is %s" % state_readable + state, state_readable = sync_status[info[0][0]] + return state, "%s" % state_readable -check_info['stormshield_policy'] = { - 'inventory_function' : inventory_stormshield_policy, - 'check_function' : check_stormshield_policy, - 'service_description' : 'Policy %s status', - 'snmp_info' : ('.1.3.6.1.4.1.11256.1.8.1.1', [ - '2', # STORMSHIELD-POLICY-MIB::snsPolicyName - '5', # STORMSHIELD-POLICY-MIB::snsPolicySync + +check_info['stormshield_sync'] = { + 'inventory_function' : inventory_stormshield_sync, + 'check_function' : check_stormshield_sync, + 'service_description' : 'Sync status', + 'snmp_info' : ('.1.3.6.1.4.1.11256.1.11', [ + '8', # STORMSHIELD-POLICY-MIB::snsHASyncStatus ]), 'snmp_scan_function' : stormshield_scan_function, 'includes' : [ 'stormshield.include' ],

6 years, 10 months

5096 FIX mk_oracle_crs: crs_stat command is deprecated since Oracle 11gR2; Now the plugin handles that correctly

by Simon Betz

Module: check_mk Branch: master Commit: d0aedbf9c666ffe5eeacaef2bcaa4c86bf708992 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0aedbf9c666ff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 10 15:56:48 2017 +0200 5096 FIX mk_oracle_crs: crs_stat command is deprecated since Oracle 11gR2; Now the plugin handles that correctly Change-Id: I28aae2bbab236ced481a522f4a1de728bd56d1a8 --- .werks/5096 | 11 +++++++++++ agents/plugins/mk_oracle_crs | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5096 b/.werks/5096 new file mode 100644 index 0000000..51462cc --- /dev/null +++ b/.werks/5096 @@ -0,0 +1,11 @@ +Title: mk_oracle_crs: crs_stat command is deprecated since Oracle 11gR2; Now the plugin handles that correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502373102 + + diff --git a/agents/plugins/mk_oracle_crs b/agents/plugins/mk_oracle_crs index 759b9f6..15efd85 100755 --- a/agents/plugins/mk_oracle_crs +++ b/agents/plugins/mk_oracle_crs @@ -81,7 +81,6 @@ function printcrsdata() { echo "<<<oracle_crs_version:sep(124)>>>" crs_version=$($CRSCTL query crs releaseversion) - crs_version_short=$(echo $crs_version | cut -d"[" -f2- | cut -d"." -f-2) echo $crs_version echo "<<<oracle_crs_voting>>>" @@ -93,7 +92,8 @@ function printcrsdata() { echo "nodename|"$OLS_NODENAME - if [ $crs_version_short = '11.2' ] ; then + crs_version_short=$(echo $crs_version | cut -d"[" -f2- | cut -d"." -f-2 | sed 's/\.//') + if [ $(($crs_version_short)) -ge 112 ] ; then $CRSCTL stat res -v -n $OLS_NODENAME -init | grep -E $resourcefilter | sed "s/^/csslocal\|/" for nodelist in $($OLSNODES) do

6 years, 10 months

Revert "View editor: Prefix painter/ sorter choices with related info titles"

by Sven Panne

Module: check_mk Branch: master Commit: bda8003b43c25657acd3a022423ffd80e5df9307 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda8003b43c256… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 15:38:06 2017 +0200 Revert "View editor: Prefix painter/sorter choices with related info titles" This reverts commit 76d8095cb399144fe1c10444314c6e596d478000. The commit broke "Problems" / "Alert Statistics" / "Edit view", leading to a GUI crash. No idea what exactly is affected by this revert, but I can't see any negative effect, and editing the problematic view works again. To be investigated further by the author of the original commit... Change-Id: I362fd224d1e438c9a3e53b0047d340f9bc27960b --- web/htdocs/views.py | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ab7822f..03d8ef2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1215,7 +1215,7 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = [ (name, get_painter_title_for_choices(p)) for name, p + choices = [ (name, p["title"]) for name, p in sorters_of_datasource(ds_name).items() ], sorted = True, no_preselect = True, @@ -2428,20 +2428,13 @@ def allowed_for_datasource(collection, datasourcename): allowed = {} for name, item in collection.items(): - infos_needed = infos_needed_by_painter(item, add_columns) + columns = get_painter_columns(item) + infos_needed = set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) if len(infos_needed.difference(infos_available)) == 0: allowed[name] = item return allowed -def infos_needed_by_painter(painter, add_columns=None): - if add_columns is None: - add_columns = [] - - columns = get_painter_columns(painter) - return set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) - - # Returns either the valuespec of the painter parameters or None def get_painter_params_valuespec(painter): if "params" not in painter: @@ -2457,29 +2450,16 @@ def painter_choices(painters, add_params=False): choices = [] for name, painter in painters.items(): - title = get_painter_title_for_choices(painter) - # Add the optional valuespec for painter parameters if add_params and "params" in painter: vs_params = get_painter_params_valuespec(painter) - choices.append((name, title, vs_params)) + choices.append((name, painter["title"], vs_params)) else: - choices.append((name, title)) + choices.append((name, painter["title"])) return sorted(choices, key=lambda x: x[1]) -def get_painter_title_for_choices(painter): - info_title = "/".join([ visuals.infos[info_name]["title_plural"] for info_name - in sorted(infos_needed_by_painter(painter)) ]) - - # TODO: Cleanup the special case for sites. How? Add an info for it? - if painter["columns"] == ["site"]: - info_title = _("Site") - - return "%s: %s" % (info_title, painter["title"]) - - def painter_choices_with_params(painters): return painter_choices(painters, add_params=True)

6 years, 10 months

5095 FIX 'Round trip average' graph: Added warn and crit lines

by Simon Betz

Module: check_mk Branch: master Commit: 734a1f54cae55a8bade52b18dc17dabb3bfc9aa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=734a1f54cae55a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 10 15:04:43 2017 +0200 5095 FIX 'Round trip average' graph: Added warn and crit lines Change-Id: Ieba2f1b3a053a67846ff09e39e843d8f54b55844 --- .werks/5095 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/5095 b/.werks/5095 new file mode 100644 index 0000000..93c09b9 --- /dev/null +++ b/.werks/5095 @@ -0,0 +1,11 @@ +Title: "Round trip average" graph: Added warn and crit lines +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502370019 + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index e80afd8..94b63e5 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -7362,6 +7362,10 @@ graph_info["round_trip_average"] = { ( "rtmin", "area" ), ( "rta", "line" ), ], + "scalars": [ + "rta:warn", + "rta:crit", + ] } for idx in range(1, MAX_NUMBER_HOPS):

6 years, 10 months

Updated bug entries #2430, #2431

by Andreas Umbreit

Module: check_mk Branch: master Commit: c8082eaa78752d1b2af58140aec211a99e54a96a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8082eaa78752d… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Aug 10 13:49:20 2017 +0200 Updated bug entries #2430, #2431 Change-Id: Ia23acd269531b13178fb5a831f59f6418cf32a74 --- .bugs/2430 | 11 +++++------ .bugs/2431 | 8 ++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.bugs/2430 b/.bugs/2430 index 6a8313d..fce3be4 100644 --- a/.bugs/2430 +++ b/.bugs/2430 @@ -1,9 +1,8 @@ -Title: Views in dashlets do use display options +Title: RRDTool is unable to process variable definitions containing "-" Component: multisite State: open -Date: 2016-02-17 14:33:10 -Targetversion: future -Class: nastiness +Date: 2017-08-10 13:39:12 +Targetversion: 1.2.8 +Class: bug -Example: change time format in "normal" view to absolute. -Embedded "normal" view in dashlet still uses old (defautl) format. +RRDTool earlier than 1.5.6 cant cope with a hyphen within variable definitions like DEF:foo-bar=some_file.rrd. This is a problem for pnp-templates that define a DEF that can possibly contain a hypen, e.g. originating from an arbitrary metric name \ No newline at end of file diff --git a/.bugs/2431 b/.bugs/2431 new file mode 100644 index 0000000..84d480b --- /dev/null +++ b/.bugs/2431 @@ -0,0 +1,8 @@ +Title: Duplicate for git bug 2430 for 1.4.0 +Component: multisite +State: open +Date: 2017-08-10 13:47:36 +Targetversion: 1.4.0 +Class: bug + +same issue as git bug #2430. 1.4.0 is also affected here.

6 years, 10 months

Reserved 10 bug IDS

by Andreas Umbreit

Module: check_mk Branch: master Commit: 6b677d07dafbb84ec2e512c25327c5b73f547fd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b677d07dafbb8… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Aug 10 13:36:38 2017 +0200 Reserved 10 bug IDS Change-Id: I85f9d2118b97f92f777973c45e9a80c92f0ebecb --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index fc818e9..41ecbe3 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2940 +2950

6 years, 10 months

Const-corrected Filter.

by Sven Panne

Module: check_mk Branch: master Commit: c12236fa0ffca4c075576015576b60087b84048b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c12236fa0ffca4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 10:08:20 2017 +0200 Const-corrected Filter. Change-Id: I4097d1eee4bc28b9a41ddf6f6e69aabe7d29bd74 --- livestatus/src/AndingFilter.cc | 3 ++- livestatus/src/AndingFilter.h | 3 ++- livestatus/src/ColumnFilter.h | 2 +- livestatus/src/CustomVarsDictFilter.cc | 2 +- livestatus/src/CustomVarsDictFilter.h | 3 ++- livestatus/src/CustomVarsListFilter.cc | 2 +- livestatus/src/CustomVarsListFilter.h | 3 ++- livestatus/src/DoubleFilter.cc | 2 +- livestatus/src/DoubleFilter.h | 3 ++- livestatus/src/Filter.h | 5 +++-- livestatus/src/HostListFilter.cc | 2 +- livestatus/src/HostListFilter.h | 3 ++- livestatus/src/IntFilter.cc | 3 ++- livestatus/src/IntFilter.h | 3 ++- livestatus/src/ListFilter.cc | 2 +- livestatus/src/ListFilter.h | 3 ++- livestatus/src/NegatingFilter.cc | 5 +++-- livestatus/src/NegatingFilter.h | 5 +++-- livestatus/src/OringFilter.cc | 3 ++- livestatus/src/OringFilter.h | 3 ++- livestatus/src/ServiceListFilter.cc | 2 +- livestatus/src/ServiceListFilter.h | 3 ++- livestatus/src/StringFilter.cc | 2 +- livestatus/src/StringFilter.h | 3 ++- livestatus/src/VariadicFilter.cc | 2 +- livestatus/src/VariadicFilter.h | 2 +- 26 files changed, 45 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c12236fa0f…

6 years, 10 months

Const-corrected Aggregator.

by Sven Panne

Module: check_mk Branch: master Commit: 3f603964cd0d758bb39772e20c6e87873e000718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f603964cd0d75… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 10:18:11 2017 +0200 Const-corrected Aggregator. Change-Id: Id3f0c5391cc45858b3e2350b16800b03db37ddce --- livestatus/src/Aggregator.h | 2 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/CountAggregator.h | 2 +- livestatus/src/DoubleAggregator.cc | 2 +- livestatus/src/DoubleAggregator.h | 2 +- livestatus/src/IntAggregator.cc | 2 +- livestatus/src/IntAggregator.h | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/PerfdataAggregator.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Aggregator.h b/livestatus/src/Aggregator.h index b2f3f5a..d40e997 100644 --- a/livestatus/src/Aggregator.h +++ b/livestatus/src/Aggregator.h @@ -48,7 +48,7 @@ public: // fixed, it is just an artifact. virtual void consume(Row row, contact *auth_user, int timezone_offset) = 0; - virtual void output(RowRenderer &r) = 0; + virtual void output(RowRenderer &r) const = 0; private: const StatsOperation _operation; diff --git a/livestatus/src/CountAggregator.cc b/livestatus/src/CountAggregator.cc index 46614c2..a5bd14d 100644 --- a/livestatus/src/CountAggregator.cc +++ b/livestatus/src/CountAggregator.cc @@ -36,4 +36,4 @@ void CountAggregator::consume(Row row, contact* auth_user, } } -void CountAggregator::output(RowRenderer& r) { r.output(_count); } +void CountAggregator::output(RowRenderer& r) const { r.output(_count); } diff --git a/livestatus/src/CountAggregator.h b/livestatus/src/CountAggregator.h index 1768f89..be2d69c 100644 --- a/livestatus/src/CountAggregator.h +++ b/livestatus/src/CountAggregator.h @@ -43,7 +43,7 @@ public: explicit CountAggregator(Filter *filter) : Aggregator(StatsOperation::count), _filter(filter), _count(0) {} void consume(Row row, contact *auth_user, int timezone_offset) override; - void output(RowRenderer &r) override; + void output(RowRenderer &r) const override; private: Filter *const _filter; diff --git a/livestatus/src/DoubleAggregator.cc b/livestatus/src/DoubleAggregator.cc index c7e31e3..2fa5bc5 100644 --- a/livestatus/src/DoubleAggregator.cc +++ b/livestatus/src/DoubleAggregator.cc @@ -74,7 +74,7 @@ void DoubleAggregator::consume(Row row, contact* /* auth_user */, } } -void DoubleAggregator::output(RowRenderer& r) { +void DoubleAggregator::output(RowRenderer& r) const { switch (getOperation()) { case StatsOperation::sum: case StatsOperation::min: diff --git a/livestatus/src/DoubleAggregator.h b/livestatus/src/DoubleAggregator.h index 25dbbe7..c50fc26 100644 --- a/livestatus/src/DoubleAggregator.h +++ b/livestatus/src/DoubleAggregator.h @@ -47,7 +47,7 @@ public: , _aggr(0) , _sumq(0) {} void consume(Row row, contact *contact, int timezone_offset) override; - void output(RowRenderer &r) override; + void output(RowRenderer &r) const override; private: DoubleColumn *const _column; diff --git a/livestatus/src/IntAggregator.cc b/livestatus/src/IntAggregator.cc index 0e41571..e96445b 100644 --- a/livestatus/src/IntAggregator.cc +++ b/livestatus/src/IntAggregator.cc @@ -69,7 +69,7 @@ void IntAggregator::consume(Row row, contact *auth_user, } } -void IntAggregator::output(RowRenderer &r) { +void IntAggregator::output(RowRenderer &r) const { switch (getOperation()) { case StatsOperation::sum: case StatsOperation::min: diff --git a/livestatus/src/IntAggregator.h b/livestatus/src/IntAggregator.h index 28e64ae..d864f33 100644 --- a/livestatus/src/IntAggregator.h +++ b/livestatus/src/IntAggregator.h @@ -47,7 +47,7 @@ public: , _aggr(0) , _sumq(0) {} void consume(Row row, contact *auth_user, int timezone_offset) override; - void output(RowRenderer &r) override; + void output(RowRenderer &r) const override; private: IntColumn *const _column; diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index f16a6f9..122607f 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -113,7 +113,7 @@ void PerfdataAggregator::consumeVariable(const string &varname, double value) { } } -void PerfdataAggregator::output(RowRenderer &r) { +void PerfdataAggregator::output(RowRenderer &r) const { string perf_data; bool first = true; for (const auto &entry : _aggr) { diff --git a/livestatus/src/PerfdataAggregator.h b/livestatus/src/PerfdataAggregator.h index 1f5c8e7..1a334dd 100644 --- a/livestatus/src/PerfdataAggregator.h +++ b/livestatus/src/PerfdataAggregator.h @@ -44,7 +44,7 @@ public: PerfdataAggregator(StatsOperation operation, StringColumn *column) : Aggregator(operation), _column(column) {} void consume(Row row, contact *auth_user, int timezone_offset) override; - void output(RowRenderer &r) override; + void output(RowRenderer &r) const override; private: struct perf_aggr {

6 years, 10 months

Const-corrected DoubleColumn::getValue().

by Sven Panne

Module: check_mk Branch: master Commit: 61f7fa7c664788d0c259d2c1db55fbc137f1a8d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61f7fa7c664788… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 09:23:11 2017 +0200 Const-corrected DoubleColumn::getValue(). Change-Id: I7acbe250c20c4671e327a6c0481bfc9574dc2cbf --- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/DoublePointerColumn.h | 2 +- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/HostSpecialDoubleColumn.h | 2 +- livestatus/src/OffsetDoubleColumn.cc | 2 +- livestatus/src/OffsetDoubleColumn.h | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.h | 2 +- livestatus/src/TableEventConsole.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/livestatus/src/DoubleColumn.h b/livestatus/src/DoubleColumn.h index 6988e51..696fe93 100644 --- a/livestatus/src/DoubleColumn.h +++ b/livestatus/src/DoubleColumn.h @@ -42,7 +42,7 @@ public: int indirect_offset, int extra_offset, int extra_extra_offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset) {} - virtual double getValue(Row data) = 0; + virtual double getValue(Row data) const = 0; void output(Row row, RowRenderer &r, contact *auth_user) override; ColumnType type() const override { return ColumnType::double_; } std::unique_ptr<Filter> createFilter(RelationalOperator relOp, diff --git a/livestatus/src/DoublePointerColumn.h b/livestatus/src/DoublePointerColumn.h index 316e8f2..f1b8de1 100644 --- a/livestatus/src/DoublePointerColumn.h +++ b/livestatus/src/DoublePointerColumn.h @@ -34,7 +34,7 @@ public: const double *number) : DoubleColumn(name, description, -1, -1, -1), _number(number) {} - double getValue(Row) override { return *_number; } + double getValue(Row) const override { return *_number; } private: const double *const _number; diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 22771eb..aca26bd 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -29,7 +29,7 @@ extern int interval_length; -double HostSpecialDoubleColumn::getValue(Row row) { +double HostSpecialDoubleColumn::getValue(Row row) const { if (auto hst = columnData<host>(row)) { switch (_type) { case Type::staleness: { diff --git a/livestatus/src/HostSpecialDoubleColumn.h b/livestatus/src/HostSpecialDoubleColumn.h index d8345de..ca3a861 100644 --- a/livestatus/src/HostSpecialDoubleColumn.h +++ b/livestatus/src/HostSpecialDoubleColumn.h @@ -41,7 +41,7 @@ public: : DoubleColumn(name, description, indirect, extra_offset, extra_extra_offset) , _type(hsdc_type) {} - double getValue(Row row) override; + double getValue(Row row) const override; private: Type _type; diff --git a/livestatus/src/OffsetDoubleColumn.cc b/livestatus/src/OffsetDoubleColumn.cc index fb68961..3435cce 100644 --- a/livestatus/src/OffsetDoubleColumn.cc +++ b/livestatus/src/OffsetDoubleColumn.cc @@ -26,7 +26,7 @@ #include "Column.h" #include "Row.h" -double OffsetDoubleColumn::getValue(Row row) { +double OffsetDoubleColumn::getValue(Row row) const { if (auto p = columnData<void>(row)) { return *offset_cast<double>(p, _offset); } diff --git a/livestatus/src/OffsetDoubleColumn.h b/livestatus/src/OffsetDoubleColumn.h index f923d5e..a690030 100644 --- a/livestatus/src/OffsetDoubleColumn.h +++ b/livestatus/src/OffsetDoubleColumn.h @@ -38,7 +38,7 @@ public: : DoubleColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) , _offset(offset) {} - double getValue(Row row) override; + double getValue(Row row) const override; protected: const int _offset; diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index f51cc50..747543d 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -30,7 +30,7 @@ extern int interval_length; -double ServiceSpecialDoubleColumn::getValue(Row row) { +double ServiceSpecialDoubleColumn::getValue(Row row) const { if (auto svc = columnData<service>(row)) { switch (_type) { case Type::staleness: { diff --git a/livestatus/src/ServiceSpecialDoubleColumn.h b/livestatus/src/ServiceSpecialDoubleColumn.h index 48ca45f..7000a30 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.h +++ b/livestatus/src/ServiceSpecialDoubleColumn.h @@ -41,7 +41,7 @@ public: : DoubleColumn(name, description, indirect, extra_offset, extra_extra_offset) , _type(ssdc_type) {} - double getValue(Row row) override; + double getValue(Row row) const override; private: Type _type; diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 7357d03..70d8c59 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -122,7 +122,7 @@ protected: : DoubleColumn(name, description, -1, -1, -1) , _ecc(*this, 0, [](std::string x) { return atof(x.c_str()); }) {} - double getValue(Row row) override { return _ecc.getValue(row); } + double getValue(Row row) const override { return _ecc.getValue(row); } }; class TimeEventConsoleColumn : public TimeColumn {

6 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017