Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 929cde495898fa93e9ebf9be06664cec035ef8cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929cde495898fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 10:01:23 2017 +0200 Const-corrected FilterVisitor. Change-Id: I0c0cd665c1a50930cfa8e0619add00d05224afe8 --- livestatus/src/AttributeListAsIntColumn.cc | 3 ++- livestatus/src/FilterVisitor.h | 6 +++--- livestatus/src/NegatingFilter.cc | 2 +- livestatus/src/NegatingFilter.h | 2 +- livestatus/src/TableStateHistory.cc | 6 +++--- livestatus/src/VariadicFilter.h | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/livestatus/src/AttributeListAsIntColumn.cc b/livestatus/src/AttributeListAsIntColumn.cc index a445433..ae49337 100644 --- a/livestatus/src/AttributeListAsIntColumn.cc +++ b/livestatus/src/AttributeListAsIntColumn.cc @@ -40,7 +40,8 @@ unique_ptr<Filter> AttributeListAsIntColumn::createFilter( this, relOp, AttributeListColumn::refValueFor(value, logger())); } -int32_t AttributeListAsIntColumn::getValue(Row row, contact * /*unused*/) const { +int32_t AttributeListAsIntColumn::getValue(Row row, + contact * /*unused*/) const { if (auto p = columnData<void>(row)) { return static_cast<int32_t>(*offset_cast<unsigned long>(p, _offset)); } diff --git a/livestatus/src/FilterVisitor.h b/livestatus/src/FilterVisitor.h index 50f2120..5704b6f 100644 --- a/livestatus/src/FilterVisitor.h +++ b/livestatus/src/FilterVisitor.h @@ -33,9 +33,9 @@ class VariadicFilter; class FilterVisitor { public: virtual ~FilterVisitor() {} - virtual void visit(ColumnFilter &) = 0; - virtual void visit(NegatingFilter &) = 0; - virtual void visit(VariadicFilter &) = 0; + virtual void visit(const ColumnFilter &) = 0; + virtual void visit(const NegatingFilter &) = 0; + virtual void visit(const VariadicFilter &) = 0; }; #endif // FilterVisitor_h diff --git a/livestatus/src/NegatingFilter.cc b/livestatus/src/NegatingFilter.cc index cedab7b..d907d13 100644 --- a/livestatus/src/NegatingFilter.cc +++ b/livestatus/src/NegatingFilter.cc @@ -36,7 +36,7 @@ NegatingFilter::NegatingFilter(unique_ptr<Filter> filter) void NegatingFilter::accept(FilterVisitor &v) { v.visit(*this); } #ifdef CMC -const unique_ptr<Filter> &NegatingFilter::subfilter() { return _filter; } +const unique_ptr<Filter> &NegatingFilter::subfilter() const { return _filter; } #endif bool NegatingFilter::accepts(Row row, contact *auth_user, int timezone_offset) { diff --git a/livestatus/src/NegatingFilter.h b/livestatus/src/NegatingFilter.h index 7127dee..e2bf808 100644 --- a/livestatus/src/NegatingFilter.h +++ b/livestatus/src/NegatingFilter.h @@ -42,7 +42,7 @@ public: explicit NegatingFilter(std::unique_ptr<Filter> filter); void accept(FilterVisitor &v) override; bool accepts(Row row, contact *auth_user, int timezone_offset) override; - const std::unique_ptr<Filter> &subfilter(); + const std::unique_ptr<Filter> &subfilter() const; private: std::unique_ptr<Filter> _filter; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index c636cf3..3d8868b 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -261,7 +261,7 @@ LogEntry *TableStateHistory::getNextLogentry() { namespace { class IsObjectFilter : public FilterVisitor { public: - void visit(ColumnFilter &f) override { + void visit(const ColumnFilter &f) override { if (_value) { auto column_name = f.column()->name(); _value = starts_with(column_name, string("current_")) || @@ -269,8 +269,8 @@ public: starts_with(column_name, string("service_")); } } - void visit(NegatingFilter & /*unused*/) override {} - void visit(VariadicFilter & /*unused*/) override {} + void visit(const NegatingFilter & /*unused*/) override {} + void visit(const VariadicFilter & /*unused*/) override {} bool _value = true; }; diff --git a/livestatus/src/VariadicFilter.h b/livestatus/src/VariadicFilter.h index a210363..1ab9f7e 100644 --- a/livestatus/src/VariadicFilter.h +++ b/livestatus/src/VariadicFilter.h @@ -42,9 +42,9 @@ public: void addSubfilter(std::unique_ptr<Filter> f); std::unique_ptr<Filter> stealLastSubfiler(); void combineFilters(int count, LogicalOperator andor); - size_t size() { return _subfilters.size(); } - auto begin() { return _subfilters.begin(); } - auto end() { return _subfilters.end(); } + size_t size() const { return _subfilters.size(); } + auto begin() const { return _subfilters.begin(); } + auto end() const { return _subfilters.end(); } void findIntLimits(const std::string &colum_nname, int *lower, int *upper, int timezone_offset) const override;

6 years, 10 months

Const-corrected IntColumn::getValue().

by Sven Panne

Module: check_mk Branch: master Commit: f9199c2a1d399c079b92b260b50bae7d705783a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9199c2a1d399c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 09:29:43 2017 +0200 Const-corrected IntColumn::getValue(). Change-Id: If924311d5301a252b2d73f962a84bf869922b3ae --- livestatus/src/AttributeListAsIntColumn.cc | 2 +- livestatus/src/AttributeListAsIntColumn.h | 2 +- livestatus/src/AttributeListColumn.cc | 2 +- livestatus/src/AttributeListColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.cc | 5 +++-- livestatus/src/CustomTimeperiodColumn.h | 4 ++-- livestatus/src/FixedIntColumn.h | 2 +- livestatus/src/HostListStateColumn.cc | 4 ++-- livestatus/src/HostListStateColumn.h | 6 +++--- livestatus/src/HostSpecialIntColumn.cc | 3 ++- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/IntColumn.h | 2 +- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/OffsetBoolColumn.cc | 2 +- livestatus/src/OffsetBoolColumn.h | 2 +- livestatus/src/OffsetIntColumn.cc | 2 +- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/OffsetTimeColumn.cc | 2 +- livestatus/src/OffsetTimeColumn.h | 2 +- livestatus/src/ServiceListStateColumn.cc | 4 ++-- livestatus/src/ServiceListStateColumn.h | 4 ++-- livestatus/src/ServiceSpecialIntColumn.cc | 3 ++- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.cc | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- livestatus/src/TableEventConsole.h | 4 ++-- livestatus/src/TimePointerColumn.h | 2 +- livestatus/src/TimeperiodColumn.cc | 2 +- livestatus/src/TimeperiodColumn.h | 2 +- 29 files changed, 40 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f9199c2a1d…

6 years, 10 months

Const-corrected Column::type().

by Sven Panne

Module: check_mk Branch: master Commit: 0ce01a09121838f7f93778b0100d5ce2874cb1f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce01a09121838… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 08:27:11 2017 +0200 Const-corrected Column::type(). Change-Id: I0c037ee1765821d5dc08dd36ef83479aed61b71d --- livestatus/src/AttributeListColumn.h | 2 +- livestatus/src/BlobColumn.h | 2 +- livestatus/src/Column.h | 2 +- livestatus/src/CustomVarsDictColumn.cc | 2 +- livestatus/src/CustomVarsDictColumn.h | 2 +- livestatus/src/CustomVarsNamesColumn.cc | 2 +- livestatus/src/CustomVarsNamesColumn.h | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 2 +- livestatus/src/CustomVarsValuesColumn.h | 2 +- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/HostListColumn.h | 2 +- livestatus/src/IntColumn.h | 2 +- livestatus/src/ListColumn.h | 2 +- livestatus/src/LogwatchListColumn.h | 2 +- livestatus/src/MetricsColumn.h | 2 +- livestatus/src/NullColumn.h | 2 +- livestatus/src/ServiceListColumn.h | 2 +- livestatus/src/StringColumn.h | 2 +- livestatus/src/TimeColumn.h | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0ce01a0912…

6 years, 10 months

Added missing 'overrides'.

by Sven Panne

Module: check_mk Branch: master Commit: 965a155e2f7c5b7b1dfd68b3c0361f904c997333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=965a155e2f7c5b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 10 09:09:02 2017 +0200 Added missing 'overrides'. Change-Id: Ia62fc544561157accd20609083963bb38ee64bb6 --- livestatus/src/DoublePointerColumn.h | 2 +- livestatus/src/HostSpecialDoubleColumn.h | 2 +- livestatus/src/OffsetDoubleColumn.h | 2 +- livestatus/src/ServiceSpecialDoubleColumn.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/DoublePointerColumn.h b/livestatus/src/DoublePointerColumn.h index 5685abf..316e8f2 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) { return *_number; } + double getValue(Row) override { return *_number; } private: const double *const _number; diff --git a/livestatus/src/HostSpecialDoubleColumn.h b/livestatus/src/HostSpecialDoubleColumn.h index 1e53b90..d8345de 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); + double getValue(Row row) override; private: Type _type; diff --git a/livestatus/src/OffsetDoubleColumn.h b/livestatus/src/OffsetDoubleColumn.h index 8c2dd80..f923d5e 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); + double getValue(Row row) override; protected: const int _offset; diff --git a/livestatus/src/ServiceSpecialDoubleColumn.h b/livestatus/src/ServiceSpecialDoubleColumn.h index 94421c2..48ca45f 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); + double getValue(Row row) override; private: Type _type;

6 years, 10 months

mk_jolokia: Fix for changed data type of sentinel value

by Konstantin Büttner

Module: check_mk Branch: master Commit: d3873ab96e781f66a6bb27851f1cbaa810499eeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3873ab96e781f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 9 17:54:40 2017 +0200 mk_jolokia: Fix for changed data type of sentinel value Change-Id: I4fd3bf56b8baf1cabc8656530f04c5e333810845 --- agents/plugins/mk_jolokia | 4 ++-- agents/windows/plugins/mk_jolokia.exe | Bin 10088482 -> 10088473 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index e372ade..6a2e23a 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -478,7 +478,7 @@ conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" if os.path.exists(conffile): execfile(conffile) -if server == ("use fqdn",): +if server == "use fqdn": server = socket.getfqdn() if instance == None: @@ -517,7 +517,7 @@ for inst in instances: inst["instance"] = str(inst["port"]) inst["instance"] = inst["instance"].replace(" ", "_") - if inst.get("server") == ("use fqdn",): + if inst.get("server") == "use fqdn": inst["server"] = socket.getfqdn() query_instance(inst) diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index fbb54d9..1eeac35 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ

6 years, 10 months

5093 FIX dell_poweredge_temp: Fixed device levels handling if they are empty

by Simon Betz

Module: check_mk Branch: master Commit: 055f1d232392d76e41ed3e0cf44b8684b82bb84b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=055f1d232392d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 9 17:55:28 2017 +0200 5093 FIX dell_poweredge_temp: Fixed device levels handling if they are empty Change-Id: I7bc3ec61fac4af4e6890e567130ca7db7f20face --- .werks/5093 | 11 +++++++++++ checks/dell_poweredge_temp | 18 +++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.werks/5093 b/.werks/5093 new file mode 100644 index 0000000..e21496a --- /dev/null +++ b/.werks/5093 @@ -0,0 +1,11 @@ +Title: dell_poweredge_temp: Fixed device levels handling if they are empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502294014 + + diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index ac3112e..4763458 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -44,13 +44,18 @@ def inventory_dell_poweredge_temp(info): def check_dell_poweredge_temp(item, params, info): for chassisIndex, Index, StateSettings, Status, Reading, LocationName, \ UpperCritical, UpperNonCritical, LowerNonCritical, LowerCritical in info: - if item == dell_poweredge_temp_makeitem(chassisIndex, Index, LocationName): temp = int(Reading) / 10.0 - warn = int(UpperNonCritical) / 10.0 - crit = int(UpperCritical) / 10.0 - lower_warn = int(LowerNonCritical) / 10.0 - lower_crit = int(LowerCritical) / 10.0 + + if UpperNonCritical and UpperCritical: + levels = (int(UpperNonCritical) / 10.0, int(UpperCritical) / 10.0) + else: + levels = None, None + if LowerNonCritical and LowerCritical: + lower_levels = int(LowerNonCritical) / 10.0, int(LowerCritical) / 10.0 + else: + lower_levels = None, None + state_table = { "1" : ("other", 1), "2" : ("unknown", 1), @@ -67,8 +72,7 @@ def check_dell_poweredge_temp(item, params, info): if state: yield state, state_txt yield check_temperature(temp, params, "dell_poweredge_temp_%s" % item, - dev_levels=(warn, crit), - dev_levels_lower=(lower_warn, lower_crit)) + dev_levels=levels, dev_levels_lower=lower_levels)

6 years, 10 months

mk_jolokia.exe: Update Windows version to be in sync with Linux version

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69c75e8487f83a03e5207c92d8cb11d62ce5ab57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c75e8487f83a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 9 16:25:46 2017 +0200 mk_jolokia.exe: Update Windows version to be in sync with Linux version Change-Id: I7920b55630eabd77daf33066cd14e471fef3e2b2 --- agents/windows/plugins/mk_jolokia.exe | Bin 10088473 -> 10088482 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 1eeac35..fbb54d9 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ

6 years, 10 months

mk_jolokia: Change sentinel value for local FQDN to 1-Tuple to avoid cosmetic issue in WATO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2a04df7a3a091a1a4a935928ddf53548e1c6f867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a04df7a3a091a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 9 15:48:19 2017 +0200 mk_jolokia: Change sentinel value for local FQDN to 1-Tuple to avoid cosmetic issue in WATO Change-Id: Id1154d20e3874939ca4046116eedf73e2f02e6d9 --- agents/plugins/mk_jolokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 1af2c69..e372ade 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -517,7 +517,7 @@ for inst in instances: inst["instance"] = str(inst["port"]) inst["instance"] = inst["instance"].replace(" ", "_") - if inst.get("server") == "use fqdn": + if inst.get("server") == ("use fqdn",): inst["server"] = socket.getfqdn() query_instance(inst)

6 years, 11 months

mk_jolokia: Change sentinel value for local FQDN to 1-Tuple to avoid cosmetic issue in WATO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 272c6e4d40f1dc9d35b2a7e1c8628544ecb90b40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=272c6e4d40f1dc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Aug 9 15:48:19 2017 +0200 mk_jolokia: Change sentinel value for local FQDN to 1-Tuple to avoid cosmetic issue in WATO Change-Id: Id1154d20e3874939ca4046116eedf73e2f02e6d9 --- agents/plugins/mk_jolokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 6a2e23a..1af2c69 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -478,7 +478,7 @@ conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" if os.path.exists(conffile): execfile(conffile) -if server == "use fqdn": +if server == ("use fqdn",): server = socket.getfqdn() if instance == None:

6 years, 11 months

fixed broken edit permissions in edit host dialog

by Andreas Boesl

Module: check_mk Branch: master Commit: fa25d503d9c396c7ebc49c512420a4771ffd2d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa25d503d9c396… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 9 14:57:57 2017 +0200 fixed broken edit permissions in edit host dialog Change-Id: I82ac845abc126c26efe5c2f8a2c8f109a89a9a58 --- web/htdocs/watolib.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7b61505..9eef9c7 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3147,7 +3147,7 @@ class ContactGroupsAttribute(Attribute): # Only show contact groups I'm currently in and contact # groups already listed here. self.load_data() - self._vs_contactgroups().render_input(varprefix + self._name + "_n_", value['groups']) + self._vs_contactgroups().render_input(varprefix + self._name, value['groups']) html.hr() @@ -3184,11 +3184,10 @@ class ContactGroupsAttribute(Attribute): def from_html_vars(self, varprefix): - cgs = [] self.load_data() - for name in self._contactgroups: - if html.get_checkbox(varprefix + self._name + "_n_" + name): - cgs.append(name) + + cgs = self._vs_contactgroups().from_html_vars(varprefix + self._name) + return { "groups" : cgs, "recurse_perms" : html.get_checkbox(varprefix + self._name + "_recurse_perms"),

6 years, 11 months

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