Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Sven Panne

Module: check_mk Branch: master Commit: da763c1b200d4abd0439a924ce3c0eb3d4b8a585 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da763c1b200d4a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 16 10:19:51 2017 +0200 Const-corrected IntColumn::getValue(). Change-Id: I8975b9f6dad1e9bc5bb5648579e44ef33dd7a0c2 --- livestatus/src/AttributeListAsIntColumn.cc | 2 +- livestatus/src/AttributeListAsIntColumn.h | 2 +- livestatus/src/AttributeListColumn.cc | 3 ++- livestatus/src/AttributeListColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.cc | 4 ++-- livestatus/src/CustomTimeperiodColumn.h | 2 +- livestatus/src/FixedIntColumn.h | 3 ++- livestatus/src/HostListStateColumn.cc | 2 +- livestatus/src/HostListStateColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.cc | 2 +- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/IntColumn.h | 2 +- livestatus/src/IntPointerColumn.h | 3 ++- livestatus/src/OffsetBoolColumn.cc | 3 ++- livestatus/src/OffsetBoolColumn.h | 2 +- livestatus/src/OffsetIntColumn.cc | 3 ++- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/OffsetTimeColumn.cc | 3 ++- livestatus/src/OffsetTimeColumn.h | 2 +- livestatus/src/ServiceListStateColumn.cc | 5 +++-- livestatus/src/ServiceListStateColumn.h | 7 ++++--- livestatus/src/ServiceSpecialIntColumn.cc | 4 ++-- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.cc | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- livestatus/src/TableEventConsole.h | 6 ++++-- livestatus/src/TimePointerColumn.h | 3 ++- livestatus/src/TimeperiodColumn.cc | 3 ++- livestatus/src/TimeperiodColumn.h | 2 +- 29 files changed, 47 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da763c1b20…

6 years, 10 months

Filter hierarchy: Use references instead of pointers.

by Sven Panne

Module: check_mk Branch: master Commit: 3e7dd41f6919611b7c90220d16e1350b693db1ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e7dd41f691961… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 16 09:07:26 2017 +0200 Filter hierarchy: Use references instead of pointers. References can never be null in well-defined programs, so prefer them to pointers where possible. The generated code is identical, we just express our intentions more clearly, which is important. Change-Id: I492089e2357aaacdcf4375b09d1c8196274be28b --- livestatus/src/AttributeListAsIntColumn.cc | 2 +- livestatus/src/AttributeListColumn.cc | 2 +- livestatus/src/CustomVarsDictColumn.cc | 2 +- livestatus/src/CustomVarsDictFilter.cc | 6 +++--- livestatus/src/CustomVarsDictFilter.h | 4 ++-- livestatus/src/CustomVarsListFilter.cc | 8 ++++---- livestatus/src/CustomVarsListFilter.h | 4 ++-- livestatus/src/CustomVarsNamesColumn.cc | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 2 +- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/DoubleFilter.cc | 8 ++++---- livestatus/src/DoubleFilter.h | 4 ++-- livestatus/src/HostListColumn.cc | 2 +- livestatus/src/HostListFilter.cc | 8 ++++---- livestatus/src/HostListFilter.h | 4 ++-- livestatus/src/IntColumn.cc | 2 +- livestatus/src/IntFilter.cc | 10 +++++----- livestatus/src/IntFilter.h | 4 ++-- livestatus/src/ListColumn.cc | 2 +- livestatus/src/ListFilter.cc | 10 +++++----- livestatus/src/ListFilter.h | 4 ++-- livestatus/src/ServiceListColumn.cc | 2 +- livestatus/src/ServiceListFilter.cc | 10 +++++----- livestatus/src/ServiceListFilter.h | 4 ++-- livestatus/src/StringColumn.cc | 2 +- livestatus/src/StringFilter.cc | 6 +++--- livestatus/src/StringFilter.h | 4 ++-- livestatus/src/TimeColumn.cc | 2 +- livestatus/src/TimeFilter.h | 2 +- 29 files changed, 62 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e7dd41f69…

6 years, 10 months

Const-corrected aggregator constructors.

by Sven Panne

Module: check_mk Branch: master Commit: 6f51e22365880c1c9b0fffee85616f71e1c91220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f51e22365880c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 16 10:33:27 2017 +0200 Const-corrected aggregator constructors. Change-Id: I1bf16f1736f144fd43ab999b641dc2b76fa028d1 --- livestatus/src/CountAggregator.h | 4 ++-- livestatus/src/DoubleAggregator.h | 4 ++-- livestatus/src/IntAggregator.h | 4 ++-- livestatus/src/PerfdataAggregator.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livestatus/src/CountAggregator.h b/livestatus/src/CountAggregator.h index 77682a9..e08e1b1 100644 --- a/livestatus/src/CountAggregator.h +++ b/livestatus/src/CountAggregator.h @@ -40,14 +40,14 @@ class RowRenderer; class CountAggregator : public Aggregator { public: - explicit CountAggregator(Filter *filter) + explicit CountAggregator(const Filter *filter) : Aggregator(StatsOperation::count), _filter(filter), _count(0) {} void consume(Row row, const contact *auth_user, int timezone_offset) override; void output(RowRenderer &r) const override; private: - Filter *const _filter; + const Filter *const _filter; std::uint32_t _count; }; diff --git a/livestatus/src/DoubleAggregator.h b/livestatus/src/DoubleAggregator.h index fc0590d..1d6f71e 100644 --- a/livestatus/src/DoubleAggregator.h +++ b/livestatus/src/DoubleAggregator.h @@ -40,7 +40,7 @@ class RowRenderer; class DoubleAggregator : public Aggregator { public: - DoubleAggregator(StatsOperation operation, DoubleColumn *column) + DoubleAggregator(StatsOperation operation, const DoubleColumn *column) : Aggregator(operation) , _column(column) , _count(0) @@ -50,7 +50,7 @@ public: void output(RowRenderer &r) const override; private: - DoubleColumn *const _column; + const DoubleColumn *const _column; std::uint32_t _count; double _aggr; double _sumq; diff --git a/livestatus/src/IntAggregator.h b/livestatus/src/IntAggregator.h index 4ebc439..28d306d 100644 --- a/livestatus/src/IntAggregator.h +++ b/livestatus/src/IntAggregator.h @@ -40,7 +40,7 @@ class RowRenderer; class IntAggregator : public Aggregator { public: - IntAggregator(StatsOperation operation, IntColumn *column) + IntAggregator(StatsOperation operation, const IntColumn *column) : Aggregator(operation) , _column(column) , _count(0) @@ -51,7 +51,7 @@ public: void output(RowRenderer &r) const override; private: - IntColumn *const _column; + const IntColumn *const _column; std::uint32_t _count; int64_t _aggr; double _sumq; diff --git a/livestatus/src/PerfdataAggregator.h b/livestatus/src/PerfdataAggregator.h index 9f7de27..7ef8fed 100644 --- a/livestatus/src/PerfdataAggregator.h +++ b/livestatus/src/PerfdataAggregator.h @@ -41,7 +41,7 @@ class StringColumn; class PerfdataAggregator : public Aggregator { public: - PerfdataAggregator(StatsOperation operation, StringColumn *column) + PerfdataAggregator(StatsOperation operation, const StringColumn *column) : Aggregator(operation), _column(column) {} void consume(Row row, const contact *auth_user, int timezone_offset) override; @@ -54,7 +54,7 @@ private: double _sumq; }; - StringColumn *const _column; + const StringColumn *const _column; std::map<std::string, perf_aggr> _aggr; void consumeVariable(const std::string &varname, double value);

6 years, 10 months

Const-corrected Filter::accepts().

by Sven Panne

Module: check_mk Branch: master Commit: f79982eeb348db289332eec78f56c73e51e0e75a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f79982eeb348db… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 16 10:26:53 2017 +0200 Const-corrected Filter::accepts(). Change-Id: Ic6999a9d61f66ebf292d650e9d31379f3c706829 --- livestatus/src/Aggregator.h | 3 ++- livestatus/src/AndingFilter.cc | 2 +- livestatus/src/AndingFilter.h | 2 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/CountAggregator.h | 3 ++- livestatus/src/CustomVarsDictFilter.cc | 2 +- livestatus/src/CustomVarsDictFilter.h | 2 +- livestatus/src/CustomVarsListFilter.cc | 2 +- livestatus/src/CustomVarsListFilter.h | 2 +- livestatus/src/DoubleAggregator.cc | 2 +- livestatus/src/DoubleAggregator.h | 2 +- livestatus/src/DoubleFilter.cc | 2 +- livestatus/src/DoubleFilter.h | 2 +- livestatus/src/Filter.h | 2 +- livestatus/src/HostListFilter.cc | 2 +- livestatus/src/HostListFilter.h | 2 +- livestatus/src/IntAggregator.cc | 2 +- livestatus/src/IntAggregator.h | 3 ++- livestatus/src/IntFilter.cc | 2 +- livestatus/src/IntFilter.h | 2 +- livestatus/src/ListFilter.cc | 2 +- livestatus/src/ListFilter.h | 2 +- livestatus/src/NegatingFilter.cc | 2 +- livestatus/src/NegatingFilter.h | 2 +- livestatus/src/OringFilter.cc | 2 +- livestatus/src/OringFilter.h | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/PerfdataAggregator.h | 3 ++- livestatus/src/ServiceListFilter.cc | 2 +- livestatus/src/ServiceListFilter.h | 2 +- livestatus/src/StringFilter.cc | 2 +- livestatus/src/StringFilter.h | 2 +- 32 files changed, 36 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f79982eeb3…

6 years, 10 months

Const-corrected Column::createAggregator().

by Sven Panne

Module: check_mk Branch: master Commit: 5253c39c5ea994ffae75704b085c452f34de5a10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5253c39c5ea994… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 16 10:42:42 2017 +0200 Const-corrected Column::createAggregator(). Change-Id: Ice72a62fe0789b168774d73cc1d194b2bed8e9af --- livestatus/src/Column.cc | 2 +- livestatus/src/Column.h | 2 +- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/IntColumn.cc | 2 +- livestatus/src/IntColumn.h | 2 +- livestatus/src/OffsetPerfdataColumn.cc | 2 +- livestatus/src/OffsetPerfdataColumn.h | 2 +- livestatus/src/TimeColumn.cc | 2 +- livestatus/src/TimeColumn.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index e7aa570..9949de4 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -59,6 +59,6 @@ unique_ptr<Filter> Column::createFilter(RelationalOperator /*unused*/, throw runtime_error("filtering on column " + _name + " not supported"); } -unique_ptr<Aggregator> Column::createAggregator(StatsOperation /*unused*/) { +unique_ptr<Aggregator> Column::createAggregator(StatsOperation /*unused*/) const { return nullptr; } diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index c174866..25e168d 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -68,7 +68,7 @@ public: virtual std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value); virtual std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation); + StatsOperation operation) const; Logger *logger() const { return _logger; } diff --git a/livestatus/src/DoubleColumn.cc b/livestatus/src/DoubleColumn.cc index 17a362f..2b1262d 100644 --- a/livestatus/src/DoubleColumn.cc +++ b/livestatus/src/DoubleColumn.cc @@ -43,6 +43,6 @@ unique_ptr<Filter> DoubleColumn::createFilter(RelationalOperator relOp, } unique_ptr<Aggregator> DoubleColumn::createAggregator( - StatsOperation operation) { + StatsOperation operation) const { return make_unique<DoubleAggregator>(operation, this); } diff --git a/livestatus/src/DoubleColumn.h b/livestatus/src/DoubleColumn.h index 696fe93..f54bb29 100644 --- a/livestatus/src/DoubleColumn.h +++ b/livestatus/src/DoubleColumn.h @@ -48,7 +48,7 @@ public: std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation) override; + StatsOperation operation) const override; }; #endif // DoubleColumn_h diff --git a/livestatus/src/IntColumn.cc b/livestatus/src/IntColumn.cc index b75a59d..83ec65a 100644 --- a/livestatus/src/IntColumn.cc +++ b/livestatus/src/IntColumn.cc @@ -42,6 +42,6 @@ unique_ptr<Filter> IntColumn::createFilter(RelationalOperator relOp, return make_unique<IntFilter>(*this, relOp, value); } -unique_ptr<Aggregator> IntColumn::createAggregator(StatsOperation operation) { +unique_ptr<Aggregator> IntColumn::createAggregator(StatsOperation operation) const { return make_unique<IntAggregator>(operation, this); } diff --git a/livestatus/src/IntColumn.h b/livestatus/src/IntColumn.h index b1a61bb..d4f1175 100644 --- a/livestatus/src/IntColumn.h +++ b/livestatus/src/IntColumn.h @@ -54,7 +54,7 @@ public: std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation) override; + StatsOperation operation) const override; }; #endif // IntColumn_h diff --git a/livestatus/src/OffsetPerfdataColumn.cc b/livestatus/src/OffsetPerfdataColumn.cc index b8b4eab..e785458 100644 --- a/livestatus/src/OffsetPerfdataColumn.cc +++ b/livestatus/src/OffsetPerfdataColumn.cc @@ -29,6 +29,6 @@ using std::make_unique; using std::unique_ptr; unique_ptr<Aggregator> OffsetPerfdataColumn::createAggregator( - StatsOperation operation) { + StatsOperation operation) const { return make_unique<PerfdataAggregator>(operation, this); } diff --git a/livestatus/src/OffsetPerfdataColumn.h b/livestatus/src/OffsetPerfdataColumn.h index 472d720..4ef1d33 100644 --- a/livestatus/src/OffsetPerfdataColumn.h +++ b/livestatus/src/OffsetPerfdataColumn.h @@ -41,7 +41,7 @@ public: extra_offset, extra_extra_offset) {} std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation) override; + StatsOperation operation) const override; }; #endif // OffsetPerfdataColumn_h diff --git a/livestatus/src/TimeColumn.cc b/livestatus/src/TimeColumn.cc index 8eee2a4..5b1f1cc 100644 --- a/livestatus/src/TimeColumn.cc +++ b/livestatus/src/TimeColumn.cc @@ -44,6 +44,6 @@ unique_ptr<Filter> TimeColumn::createFilter(RelationalOperator relOp, return make_unique<TimeFilter>(*this, relOp, value); } -unique_ptr<Aggregator> TimeColumn::createAggregator(StatsOperation operation) { +unique_ptr<Aggregator> TimeColumn::createAggregator(StatsOperation operation) const { return make_unique<IntAggregator>(operation, this); } diff --git a/livestatus/src/TimeColumn.h b/livestatus/src/TimeColumn.h index 447ba39..0532848 100644 --- a/livestatus/src/TimeColumn.h +++ b/livestatus/src/TimeColumn.h @@ -51,7 +51,7 @@ public: std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; std::unique_ptr<Aggregator> createAggregator( - StatsOperation operation) override; + StatsOperation operation) const override; }; #endif // TimeColumn_h

6 years, 10 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 4ab7be8e923b4a72049f94c941889b299b1558f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab7be8e923b4a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 15 10:10:15 2017 +0200 Reserved 10 Werk IDS Change-Id: I4cdc770ba5bdd34b69327ac96517a1e38f5ef64c --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 800920f..5d8510a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5108 +5118

6 years, 10 months

4804 FIX brocade_fcport: Fix limiting discovered ports by operational and physical status

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9e6589c52a39c76bb8c35fcd70a4bc731fe792bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e6589c52a39c7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 14 17:19:28 2017 +0200 4804 FIX brocade_fcport: Fix limiting discovered ports by operational and physical status Previously, any rule set aiming to influence this would simply have no effect, as the defaults were always used. This has been fixed. Change-Id: I0348fc56cf5aaf78b152bccff7134417edb21ac2 --- .werks/4804 | 12 ++++++++++++ checks/brocade_fcport | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4804 b/.werks/4804 new file mode 100644 index 0000000..bad9a08 --- /dev/null +++ b/.werks/4804 @@ -0,0 +1,12 @@ +Title: brocade_fcport: Fix limiting discovered ports by operational and physical status +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502723516 + +Previously, any rule set aiming to influence this would simply have no effect, +as the defaults were always used. This has been fixed. diff --git a/checks/brocade_fcport b/checks/brocade_fcport index a9a9a9f..0b115ed 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -214,8 +214,8 @@ def inventory_brocade_fcport(parsed): opstate = if_entry["opstate"] admstate = if_entry["admstate"] if admstate in admstates and \ - opstate in brocade_fcport_inventory_opstates and \ - phystate in brocade_fcport_inventory_phystates: + opstate in opstates and \ + phystate in phystates: inventory.append((brocade_fcport_getitem(parsed, if_entry["index"], if_entry["portname"], if_entry["is_isl"], uses_portname, shows_isl), '{ "phystate": [%d], "opstate": [%d], "admstate": [%d] }' % \

6 years, 10 months

added some help text to script parameters in notfication ruleset

by Marcel Arentz

Module: check_mk Branch: master Commit: 1fcfb269eca7057362d557a18e9093a8628b7fa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fcfb269eca705… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 14 11:46:59 2017 +0200 added some help text to script parameters in notfication ruleset Change-Id: I79452ef67c3991693a142d5f439d6171f2cef85c --- web/htdocs/watolib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9eef9c7..13e2e2e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8452,6 +8452,7 @@ def notification_script_choices_with_parameters(): else: vs = ListOfStrings( title = _("Call with the following parameters:"), + help = _("The given parameters are available in scripts as NOTIFY_PARAMETER_1, NOTIFY_PARAMETER_2, etc."), valuespec = TextUnicode(size = 24), orientation = "horizontal", )

6 years, 10 months

transformed checkplugin revisited

by Marcel Arentz

Module: check_mk Branch: master Commit: 520d6409dffaf9aca56bc893d675d9992468f75c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=520d6409dffaf9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 14 08:43:57 2017 +0200 transformed checkplugin revisited Change-Id: Ic8299885cc4a4134b5be32e0b2f44cd949954750 --- checkman/stormshield_policy | 14 ----------- checkman/stormshield_sync | 11 +++++++++ checks/{stormshield_policy => stormshield_sync} | 32 ++++++++++++------------- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/checkman/stormshield_policy b/checkman/stormshield_policy deleted file mode 100644 index cfae8c9..0000000 --- a/checkman/stormshield_policy +++ /dev/null @@ -1,14 +0,0 @@ -title: Stormshield: Policy status -agents: snmp -catalog: hw/network/stormshield -license: GPL -distribution: check_mk -description: - This check measures the syncing of a policy. The state will change to {CRIT} - if the policy is not synced. - -item: - The policy name is the item - -inventory: - One service for each policy is created diff --git a/checkman/stormshield_sync b/checkman/stormshield_sync new file mode 100644 index 0000000..9289c8c --- /dev/null +++ b/checkman/stormshield_sync @@ -0,0 +1,11 @@ +title: Stormshield: Sync status +agents: snmp +catalog: hw/network/stormshield +license: GPL +distribution: check_mk +description: + This check measures the sync status in a cluster environment. The state will change to {CRIT} + if the cluster nodes are not synced. + +inventory: + Only one service is created 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

Const-corrected and simplified ColumnFilter interface.

by Sven Panne

Module: check_mk Branch: master Commit: 5746bb2ee9d05bebeb4607f5c40dd0b3a76c95a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5746bb2ee9d05b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 11 15:21:09 2017 +0200 Const-corrected and simplified ColumnFilter interface. Apart from being simpler, this makes it easier to achieve const-correctness elsewhere. Change-Id: If73ba610c27cc65a91f229cac21fca7942d43419 --- livestatus/src/ColumnFilter.h | 3 +-- livestatus/src/CommentColumn.cc | 4 +++- livestatus/src/CommentColumn.h | 2 +- livestatus/src/ContactGroupsColumn.cc | 6 ++++-- livestatus/src/ContactGroupsColumn.h | 4 ++-- livestatus/src/ContactsColumn.cc | 4 +++- livestatus/src/ContactsColumn.h | 2 +- livestatus/src/CustomVarsColumn.cc | 2 +- livestatus/src/CustomVarsColumn.h | 4 ++-- livestatus/src/CustomVarsDictColumn.cc | 2 +- livestatus/src/CustomVarsDictColumn.h | 2 +- livestatus/src/CustomVarsDictFilter.cc | 5 +++-- livestatus/src/CustomVarsDictFilter.h | 12 ++++++------ livestatus/src/CustomVarsListFilter.cc | 7 ++++--- livestatus/src/CustomVarsListFilter.h | 14 +++++++------- livestatus/src/CustomVarsNamesColumn.cc | 2 +- livestatus/src/CustomVarsNamesColumn.h | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 2 +- livestatus/src/CustomVarsValuesColumn.h | 2 +- livestatus/src/DoubleFilter.cc | 10 ++++++---- livestatus/src/DoubleFilter.h | 12 ++++++------ livestatus/src/DowntimeColumn.cc | 4 +++- livestatus/src/DowntimeColumn.h | 2 +- livestatus/src/HostGroupsColumn.cc | 6 ++++-- livestatus/src/HostGroupsColumn.h | 4 ++-- livestatus/src/HostListColumn.cc | 2 +- livestatus/src/HostListColumn.h | 4 ++-- livestatus/src/HostListFilter.cc | 12 +++++++----- livestatus/src/HostListFilter.h | 12 ++++++------ livestatus/src/IntFilter.cc | 20 ++++++++++++-------- livestatus/src/IntFilter.h | 13 +++++++------ livestatus/src/ListColumn.h | 2 +- livestatus/src/ListFilter.cc | 13 +++++++------ livestatus/src/ListFilter.h | 14 +++++++------- livestatus/src/ServiceGroupsColumn.cc | 6 ++++-- livestatus/src/ServiceGroupsColumn.h | 4 ++-- livestatus/src/ServiceListColumn.cc | 2 +- livestatus/src/ServiceListColumn.h | 4 ++-- livestatus/src/ServiceListFilter.cc | 12 +++++++----- livestatus/src/ServiceListFilter.h | 12 ++++++------ livestatus/src/StringFilter.cc | 7 ++++--- livestatus/src/StringFilter.h | 12 ++++++------ livestatus/src/TableEventConsole.h | 4 +++- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/TimeFilter.h | 2 +- 45 files changed, 153 insertions(+), 125 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5746bb2ee9…

6 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
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