Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

3662 FIX Fixed creation/editing of dashboards (regression since 1.2.8p5)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4fdbb1443dd00bd001a1f5a188ec6053165eff98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fdbb1443dd00b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 6 10:39:16 2016 +0200 3662 FIX Fixed creation/editing of dashboards (regression since 1.2.8p5) --- .werks/3662 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3662 b/.werks/3662 new file mode 100644 index 0000000..b38ba34 --- /dev/null +++ b/.werks/3662 @@ -0,0 +1,10 @@ +Title: Fixed creation/editing of dashboards (regression since 1.2.8p5) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467794282 + + diff --git a/ChangeLog b/ChangeLog index 1da175c..c37e37c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -383,6 +383,7 @@ * 2239 FIX: Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree... * 3148 FIX: fixed Edit View/Dashlet Dialogs offering non-sensical filter choices... * 3659 FIX: Fixed GUI exceptions for users having special characters in ther user names + * 3662 FIX: Fixed creation/editing of dashboards (regression since 1.2.8p5) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index b21e795..66ba942 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -520,7 +520,7 @@ def get_context_specs(visual, info_handler): filter_names = filter_list.filter_names() if not filter_names: - return [] # Skip infos which have no filters available + return # Skip infos which have no filters available params = [ ('filters', filter_list), @@ -533,7 +533,8 @@ def get_context_specs(visual, info_handler): # single infos first, the rest afterwards return [(info_key, visual_spec_single(info_key)) for info_key in single_info_keys] +\ - [(info_key, visual_spec_multi(info_key)) for info_key in multi_info_keys] + [(info_key, visual_spec_multi(info_key)) for info_key in multi_info_keys + if visual_spec_multi(info_key) ] def process_context_specs(context_specs):

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: c90d42c0b6dc12ef26c6d38b7a6f54a6f8280fc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c90d42c0b6dc12… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 6 10:25:48 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AndingFilter.cc | 3 ++- livestatus/src/AndingFilter.h | 2 +- livestatus/src/Filter.cc | 6 +++--- livestatus/src/Filter.h | 6 +++--- livestatus/src/IntFilter.cc | 7 ++++--- livestatus/src/IntFilter.h | 6 +++--- livestatus/src/ListFilter.cc | 2 +- livestatus/src/ListFilter.h | 2 +- livestatus/src/OringFilter.cc | 3 ++- livestatus/src/OringFilter.h | 2 +- livestatus/src/StringFilter.cc | 2 +- livestatus/src/StringFilter.h | 2 +- livestatus/src/TimeFilter.cc | 2 +- livestatus/src/TimeFilter.h | 2 +- livestatus/src/VariadicFilter.cc | 2 +- livestatus/src/VariadicFilter.h | 2 +- 16 files changed, 27 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c90d42c0b6…

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 5707eb8b31389903c763ea6182ef41250d676e47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5707eb8b313899… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 6 10:08:20 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Column.cc | 7 +++++++ livestatus/src/Column.h | 6 ++---- livestatus/src/CustomVarsFilter.cc | 14 ++++++-------- livestatus/src/Filter.cc | 18 ++++++++++++++---- livestatus/src/Filter.h | 30 ++++++++---------------------- livestatus/src/Query.cc | 17 +++++++---------- livestatus/src/StringFilter.cc | 14 ++++++-------- 7 files changed, 50 insertions(+), 56 deletions(-) diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index d68be5e..18925a2 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -23,8 +23,10 @@ // Boston, MA 02110-1301 USA. #include "Column.h" +#include <stdexcept> #include <utility> +using std::runtime_error; using std::string; Column::Column(string name, string description, int indirect_offset, @@ -62,3 +64,8 @@ void *Column::shiftPointer(void *data) const { return data; } + +Filter *Column::createFilter(Query * /*unused*/, RelationalOperator /*unused*/, + const std::string & /*unused*/) { + throw runtime_error("filtering on column " + _name + " not supported"); +} diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index ab9a0c7..9819db7 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -55,10 +55,8 @@ public: virtual bool mustDelete() { return false; // true for dynamic Columns to be deleted after Query } - virtual Filter *createFilter(Query * /*unused*/, RelationalOperator, - const std::string &) { - return nullptr; - } + virtual Filter *createFilter(Query *, RelationalOperator, + const std::string &); }; #endif // Column_h diff --git a/livestatus/src/CustomVarsFilter.cc b/livestatus/src/CustomVarsFilter.cc index ebe8251..1ec8328 100644 --- a/livestatus/src/CustomVarsFilter.cc +++ b/livestatus/src/CustomVarsFilter.cc @@ -26,11 +26,12 @@ #include <ctype.h> #include <string.h> #include <ostream> +#include <stdexcept> #include "Column.h" #include "CustomVarsColumn.h" #include "Logger.h" -#include "OutputBuffer.h" +using std::runtime_error; using std::string; CustomVarsFilter::CustomVarsFilter(Query *query, CustomVarsColumn *column, @@ -66,9 +67,8 @@ CustomVarsFilter::CustomVarsFilter(Query *query, CustomVarsColumn *column, case RelationalOperator::doesnt_match_icase: if (strchr(search_space, '{') != nullptr || strchr(search_space, '}') != nullptr) { - setError(OutputBuffer::ResponseCode::invalid_header, - "disallowed regular expression '" + string(value) + - "': must not contain { or }"); + throw runtime_error("disallowed regular expression '" + value + + "': must not contain { or }"); } else { _regex = new regex_t(); bool ignore_case = @@ -77,11 +77,9 @@ CustomVarsFilter::CustomVarsFilter(Query *query, CustomVarsColumn *column, if (regcomp(_regex, search_space, REG_EXTENDED | REG_NOSUB | (ignore_case ? REG_ICASE : 0)) != 0) { - setError( - OutputBuffer::ResponseCode::invalid_header, - "invalid regular expression '" + string(value) + "'"); delete _regex; - _regex = nullptr; + throw runtime_error("invalid regular expression '" + value + + "'"); } } break; diff --git a/livestatus/src/Filter.cc b/livestatus/src/Filter.cc index d46542f..349489c 100644 --- a/livestatus/src/Filter.cc +++ b/livestatus/src/Filter.cc @@ -24,8 +24,18 @@ #include "Filter.h" -void Filter::setError(OutputBuffer::ResponseCode code, - const std::string &message) { - _error_message = message; - _error_code = code; +Filter::Filter(Query *query) : _query(query) {} + +Filter::~Filter() = default; + +void *Filter::indexFilter(const std::string & /* column_name */) { + return nullptr; +} + +void Filter::findIntLimits(const std::string & /* column_name */, + int * /* lower */, int * /* upper */) {} + +bool Filter::optimizeBitmask(const std::string & /* column_name */, + uint32_t * /* mask */) { + return false; } diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index f70c73d..53a6abc 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -28,38 +28,24 @@ #include "config.h" // IWYU pragma: keep #include <stdint.h> #include <string> -#include "OutputBuffer.h" class FilterVisitor; class Query; class Filter { public: - explicit Filter(Query *query) - : _query(query), _error_code(OutputBuffer::ResponseCode::ok) {} - virtual ~Filter() {} + explicit Filter(Query *query); + virtual ~Filter(); virtual void accept(FilterVisitor &) = 0; - std::string errorMessage() const { return _error_message; } - OutputBuffer::ResponseCode errorCode() const { return _error_code; } - bool hasError() const { return _error_message != ""; } Query *query() const { return _query; } virtual bool accepts(void *data) = 0; - virtual void *indexFilter(const std::string & /* column_name */) { - return nullptr; - } - virtual void findIntLimits(const std::string & /* column_name */, - int * /* lower */, int * /* upper */) {} - virtual bool optimizeBitmask(const std::string & /* column_name */, - uint32_t * /* mask */) { - return false; - } - -protected: - void setError(OutputBuffer::ResponseCode code, const std::string &message); + virtual void *indexFilter(const std::string &column_name); + virtual void findIntLimits(const std::string &column_name, int *lower, + int *upper); + virtual bool optimizeBitmask(const std::string &column_name, + uint32_t *mask); private: - Query *_query; - OutputBuffer::ResponseCode _error_code; - std::string _error_message; + Query *const _query; }; #endif // Filter_h diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 7d583b1..705c213 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -30,6 +30,7 @@ #include <string.h> #include <memory> #include <ostream> +#include <stdexcept> #include <utility> #include <vector> #include "Aggregator.h" @@ -55,6 +56,7 @@ extern unsigned long g_max_response_size; extern int g_data_encoding; using std::list; +using std::runtime_error; using std::string; using std::to_string; using std::unordered_set; @@ -263,19 +265,14 @@ void Query::setError(OutputBuffer::ResponseCode code, const string &message) { Filter *Query::createFilter(Column *column, RelationalOperator relOp, const string &value) { - Filter *filter = column->createFilter(this, relOp, value); - if (filter == nullptr) { + try { + return column->createFilter(this, relOp, value); + } catch (const runtime_error &e) { setError(OutputBuffer::ResponseCode::invalid_header, - "cannot create filter on table " + string(_table->name())); + "error creating filter on table" + string(_table->name()) + + ": " + e.what()); return nullptr; } - if (filter->hasError()) { - setError(filter->errorCode(), - "error in Filter header: " + filter->errorMessage()); - delete filter; - return nullptr; - } - return filter; } void Query::parseAndOrLine(char *line, LogicalOperator andor, diff --git a/livestatus/src/StringFilter.cc b/livestatus/src/StringFilter.cc index a938aaf..db4cfb2 100644 --- a/livestatus/src/StringFilter.cc +++ b/livestatus/src/StringFilter.cc @@ -24,10 +24,11 @@ #include "StringFilter.h" #include <string.h> -#include "OutputBuffer.h" +#include <stdexcept> #include "StringColumn.h" #include "opids.h" +using std::runtime_error; using std::string; StringFilter::StringFilter(Query *query, StringColumn *column, @@ -44,9 +45,8 @@ StringFilter::StringFilter(Query *query, StringColumn *column, case RelationalOperator::doesnt_match_icase: if (strchr(value.c_str(), '{') != nullptr || strchr(value.c_str(), '}') != nullptr) { - setError(OutputBuffer::ResponseCode::invalid_header, - "disallowed regular expression '" + string(value) + - "': must not contain { or }"); + throw runtime_error("disallowed regular expression '" + value + + "': must not contain { or }"); } else { _regex = new regex_t(); bool ignore_case = @@ -55,11 +55,9 @@ StringFilter::StringFilter(Query *query, StringColumn *column, if (regcomp(_regex, value.c_str(), REG_EXTENDED | REG_NOSUB | (ignore_case ? REG_ICASE : 0)) != 0) { - setError( - OutputBuffer::ResponseCode::invalid_header, - "invalid regular expression '" + string(value) + "'"); delete _regex; - _regex = nullptr; + throw runtime_error("invalid regular expression '" + value + + "'"); } } break;

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: cb2dacbd3914fadda11290f0319e2e5879df37cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb2dacbd3914fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 5 15:45:31 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AndingFilter.cc | 2 ++ livestatus/src/AndingFilter.h | 2 ++ livestatus/src/AttributelistColumn.cc | 5 +-- livestatus/src/AttributelistColumn.h | 2 +- livestatus/src/AttributelistFilter.cc | 5 +-- livestatus/src/AttributelistFilter.h | 5 +-- livestatus/src/Column.h | 3 +- livestatus/src/ColumnFilter.h | 4 ++- livestatus/src/CustomVarsColumn.cc | 4 +-- livestatus/src/CustomVarsColumn.h | 2 +- livestatus/src/CustomVarsFilter.cc | 8 +++-- livestatus/src/CustomVarsFilter.h | 5 +-- livestatus/src/DoubleColumn.cc | 4 +-- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/DoubleFilter.cc | 9 +++-- livestatus/src/DoubleFilter.h | 3 +- livestatus/src/Filter.h | 20 +++++------ livestatus/src/FilterVisitor.h | 41 +++++++++++++++++++++++ livestatus/src/HostlistColumn.cc | 4 +-- livestatus/src/HostlistColumn.h | 2 +- livestatus/src/HostlistFilter.cc | 9 +++-- livestatus/src/HostlistFilter.h | 5 +-- livestatus/src/IntColumn.cc | 5 +-- livestatus/src/IntColumn.h | 2 +- livestatus/src/IntFilter.cc | 10 ++++-- livestatus/src/IntFilter.h | 4 ++- livestatus/src/ListColumn.cc | 4 +-- livestatus/src/ListColumn.h | 3 +- livestatus/src/ListFilter.cc | 7 ++-- livestatus/src/ListFilter.h | 3 +- livestatus/src/NegatingFilter.h | 5 +-- livestatus/src/OffsetStringMacroColumn.cc | 5 +-- livestatus/src/OffsetStringMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.cc | 4 +-- livestatus/src/OffsetTimeColumn.h | 2 +- livestatus/src/OringFilter.cc | 2 ++ livestatus/src/OringFilter.h | 2 ++ livestatus/src/Query.cc | 51 ++++++++++++++++------------- livestatus/src/ServicelistColumn.cc | 4 +-- livestatus/src/ServicelistColumn.h | 2 +- livestatus/src/ServicelistFilter.cc | 4 +-- livestatus/src/ServicelistFilter.h | 5 +-- livestatus/src/StringColumn.cc | 4 +-- livestatus/src/StringColumn.h | 2 +- livestatus/src/StringFilter.cc | 10 ++++-- livestatus/src/StringFilter.h | 3 +- livestatus/src/TableStateHistory.cc | 35 +++++++++++++++----- livestatus/src/TimeFilter.cc | 7 +--- livestatus/src/TimeFilter.h | 5 +-- livestatus/src/TimePointerColumn.cc | 4 +-- livestatus/src/TimePointerColumn.h | 2 +- livestatus/src/VariadicFilter.cc | 17 ++++++---- livestatus/src/VariadicFilter.h | 12 ++++--- 53 files changed, 244 insertions(+), 129 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb2dacbd39…

8 years, 2 months

3153 FIX windows agent: fixed two problems that could cause missing wmi results

by Sebastian Herbord

Module: check_mk Branch: master Commit: 403e5b50a05faa6cef587969c06e800a08fb5e6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403e5b50a05faa… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jul 5 14:37:15 2016 +0200 3153 FIX windows agent: fixed two problems that could cause missing wmi results The first problem was that under certain circumstances, the first row of each wmi result was skipped. The second problem was, that a wmi section could get disabled if the wmi result is valid but empty. --- .werks/3153 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1272320 -> 1272320 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 0 -> 10603394 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1272320 -> 1272320 bytes agents/windows/check_mk_agent.cc | 10 +++++++--- agents/windows/check_mk_agent.exe | Bin 1240576 -> 1240576 bytes agents/windows/check_mk_agent.msi | Bin 2781696 -> 2781696 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 0 -> 8930198 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1240576 -> 1240576 bytes agents/windows/install_agent-64.exe | Bin 567258 -> 567256 bytes agents/windows/install_agent.exe | Bin 560902 -> 561019 bytes agents/windows/wmiHelper.cc | 11 +++++++---- agents/windows/wmiHelper.h | 4 ++++ 16 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.werks/3153 b/.werks/3153 new file mode 100644 index 0000000..58fe40c --- /dev/null +++ b/.werks/3153 @@ -0,0 +1,12 @@ +Title: windows agent: fixed two problems that could cause missing wmi results +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467721715 + +The first problem was that under certain circumstances, the first row of each wmi result was +skipped. +The second problem was, that a wmi section could get disabled if the wmi result is valid but empty. diff --git a/ChangeLog b/ChangeLog index c56247d..1da175c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -298,6 +298,7 @@ NOTE: Please refer to the migration notes! * 3552 FIX: SNMPv3: Fixed login with security level noAuthNoPriv... * 3694 FIX: fortigate_sessions_base: Added missing WATO rule + * 3153 FIX: windows agent: fixed two problems that could cause missing wmi results... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/Makefile b/agents/windows/Makefile index a145938..976026e 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -146,7 +146,7 @@ check_mk_agent-64.exe.versioned: # important: %.exe.versioned must not depend on %.exe.unversioned because on the # automated build system, "make ...versioned" is called and that system doesn't # provide the right compiler to build this agent -%.exe: %.exe.unversioned %.exe.versioned +%.exe: %.unversioned.exe %.exe.versioned true # ----------------------------------------------------------------------------- diff --git a/agents/windows/build_version b/agents/windows/build_version index 77de926..ff5a506 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1767 +1769 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 6d77af8..69d6980 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe new file mode 100755 index 0000000..61f2e5a Binary files /dev/null and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index d21d014..84b43c2 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 980db65..db02b01 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1539,8 +1539,11 @@ void section_logfiles(OutputProxy &out, const Environment &env) { } void dump_wmi_table(OutputProxy &out, wmi::Result &result) { + if (!result.valid()) { + return; + } out.output("%ls\n", join(result.names(), L",").c_str()); - bool more = result.valid(); + bool more = true; while (more) { std::vector<std::wstring> values = result.names(); // resolve all table keys to their value on this row. @@ -1565,8 +1568,9 @@ bool output_wmi_table(OutputProxy &out, const wchar_t *table_name, } if (!result.valid()) { - crash_log("table %ls is empty or doesn't exist", table_name); - return false; + crash_log("table %ls %s", table_name, + FAILED(result.last_error()) ? "doesn't exist" : "is empty"); + return !FAILED(result.last_error()); } if (as_subtable) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 8172581..5138b1b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index a1b5970..64f834d 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe new file mode 100755 index 0000000..92eb0da Binary files /dev/null and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 6e74c04..ea3954c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8b48d18..97f787d 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5744b96..68d4ac4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 2baa7a4..1fc6219 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -124,7 +124,9 @@ Result::Result() : ObjectWrapper(nullptr), _enumerator(nullptr, releaseInterface) {} Result::Result(const Result &reference) - : ObjectWrapper(nullptr), _enumerator(reference._enumerator) {} + : ObjectWrapper(reference) + , _enumerator(reference._enumerator) + , _last_error(reference._last_error) {} Result::Result(IEnumWbemClassObject *enumerator) : ObjectWrapper(nullptr), _enumerator(enumerator, releaseInterface) { @@ -145,7 +147,8 @@ Result &Result::operator=(const Result &reference) { _enumerator->Release(); } _enumerator = reference._enumerator; - next(); + _current = reference._current; + _last_error = reference._last_error; } return *this; } @@ -191,13 +194,13 @@ bool Result::next() { // in this case the "current" object isn't changed to guarantee that the // Result remains valid // throw ComException("Failed to retrieve element", res); + _last_error = res; return false; } if (numReturned == 0) { // no more values. the current object remains at the last element so - // that - // a call to get continues to work + // that a call to get continues to work return false; } diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 5abe581..7a9f4cf 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -126,6 +126,7 @@ T ObjectWrapper::get(const wchar_t *key) const { class Result : public ObjectWrapper { std::shared_ptr<IEnumWbemClassObject> _enumerator{NULL}; + HRESULT _last_error{S_OK}; public: Result(); @@ -144,6 +145,9 @@ public: // stays there. bool next(); + // returns the last error that occured during iteration + HRESULT last_error() const { return _last_error; } + // return true if this is a valid result. Please note that // once a result is valid it remains so, it doesn't become invalid // if an error during iteration happens or the last row has been reached.

8 years, 2 months

3554 Inotify: Added configurable levels for movedto, movefrom and move self

by Andreas Boesl

Module: check_mk Branch: master Commit: 6c5feea104d764a7cc3bf1e16b46dd89ecafda87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5feea104d764… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 5 10:52:33 2016 +0200 3554 Inotify: Added configurable levels for movedto, movefrom and move self --- .werks/3554 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 15 ++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/3554 b/.werks/3554 new file mode 100644 index 0000000..78ef41b --- /dev/null +++ b/.werks/3554 @@ -0,0 +1,9 @@ +Title: Inotify: Added configurable levels for movedto, movefrom and move self +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1467708741 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e5a7760..c56247d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 3689 brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received * 3690 apache_status: upper levels for busy workers are now configurable * 3691 oracle_jobs: status of missing jobs is now configurable + * 3554 Inotify: Added configurable levels for movedto, movefrom and move self * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d4f15ea..d0d668a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2260,11 +2260,16 @@ register_check_parameters( Tuple( elements = [ DropdownChoice( title = _("INotify Operation"), - choices = [ ("create", _("Create")), - ("delete", _("Delete")), - ("access", _("Access")), - ("modify", _("Modify")), - ("open", _("Open")) ] + choices = [ + ("create", _("Create")), + ("delete", _("Delete")), + ("open", _("Open")), + ("modify", _("Modify")), + ("access", _("Access")), + ("movedfrom", _("Moved from")), + ("movedto", _("Moved to")), + ("moveself", _("Move self")), + ] ), Age(title=_("Warning at")), Age(title=_("Critical at")),

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: f6a6d2b34b586a30cb2805a915fa46ab2467dfba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6a6d2b34b586a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 5 10:42:31 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AttributelistFilter.cc | 2 ++ livestatus/src/AttributelistFilter.h | 7 ++-- livestatus/src/ColumnFilter.h | 38 ++++++++++++++++++++ livestatus/src/CustomVarsFilter.cc | 2 ++ livestatus/src/CustomVarsFilter.h | 7 ++-- livestatus/src/DoubleColumn.cc | 4 +-- .../src/{DoubleColumnFilter.cc => DoubleFilter.cc} | 11 +++--- .../src/{DoubleColumnFilter.h => DoubleFilter.h} | 17 ++++----- livestatus/src/Filter.h | 10 ++---- livestatus/src/HostlistColumn.cc | 4 +-- .../{HostlistColumnFilter.cc => HostlistFilter.cc} | 15 ++++---- .../{HostlistColumnFilter.h => HostlistFilter.h} | 19 +++++----- livestatus/src/IntColumn.cc | 4 +-- .../src/{IntColumnFilter.cc => IntFilter.cc} | 28 +++++++-------- livestatus/src/{IntColumnFilter.h => IntFilter.h} | 18 +++++----- livestatus/src/ListColumn.cc | 4 +-- .../src/{ListColumnFilter.cc => ListFilter.cc} | 12 ++++--- .../src/{ListColumnFilter.h => ListFilter.h} | 17 ++++----- livestatus/src/Makefile.am | 14 ++++---- livestatus/src/OffsetTimeColumn.cc | 7 ++-- livestatus/src/Query.cc | 6 ++-- livestatus/src/ServicelistColumn.cc | 4 +-- ...icelistColumnFilter.cc => ServicelistFilter.cc} | 16 +++++---- ...rvicelistColumnFilter.h => ServicelistFilter.h} | 19 +++++----- livestatus/src/StringColumn.cc | 4 +-- .../src/{StringColumnFilter.cc => StringFilter.cc} | 15 ++++---- .../src/{StringColumnFilter.h => StringFilter.h} | 19 +++++----- livestatus/src/TableStateHistory.cc | 9 +++-- .../src/{TimeColumnFilter.cc => TimeFilter.cc} | 6 ++-- .../src/{TimeColumnFilter.h => TimeFilter.h} | 16 ++++----- livestatus/src/TimePointerColumn.cc | 7 ++-- 31 files changed, 204 insertions(+), 157 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f6a6d2b34b…

8 years, 2 months

3694 FIX fortigate_sessions_base: Added missing WATO rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: d4b8f873037f70a3e84d666ae1d3181133f559a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4b8f873037f70… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 4 16:29:16 2016 +0200 3694 FIX fortigate_sessions_base: Added missing WATO rule Conflicts: ChangeLog web/plugins/wato/check_parameters.py --- .werks/3694 | 10 ++++++++++ ChangeLog | 1 + checks/fortigate_sessions_base | 22 ++++++++++++---------- web/plugins/metrics/check_mk.py | 4 ++++ web/plugins/wato/check_parameters.py | 13 +++++++++++++ 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.werks/3694 b/.werks/3694 new file mode 100644 index 0000000..93abc58 --- /dev/null +++ b/.werks/3694 @@ -0,0 +1,10 @@ +Title: fortigate_sessions_base: Added missing WATO rule +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467642109 + + diff --git a/ChangeLog b/ChangeLog index 9c81753..e5a7760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -296,6 +296,7 @@ * 3693 FIX: ups_eaton_enviroment: Fixed handling of dictionary-based parameters... NOTE: Please refer to the migration notes! * 3552 FIX: SNMPv3: Fixed login with security level noAuthNoPriv... + * 3694 FIX: fortigate_sessions_base: Added missing WATO rule Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/fortigate_sessions_base b/checks/fortigate_sessions_base index 981aad4..5cd841b 100644 --- a/checks/fortigate_sessions_base +++ b/checks/fortigate_sessions_base @@ -31,18 +31,19 @@ def inventory_fortigate_sessions_base(info): def check_fortigate_sessions_base(item, params, info): warn, crit = params - current = saveint(info[0][0]) - state = 0 - icon = '' - if current >= warn: - state = 1 - icon = "(!)" + current = int(info[0][0]) + status = 0 if current >= crit: - state = 2 - icon = "(!!)" + status = 2 + elif current >= warn: + status = 1 - perf = [("session", current, warn, crit)] - return state, "%d Session%s (warn/crit at %d/%d)" % (current, icon, warn, crit), perf + infotext = "%d active sessions" % current + if status: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + + perfdata = [("session", current, warn, crit)] + return status, infotext, perfdata check_info["fortigate_sessions_base"] = { "inventory_function" : inventory_fortigate_sessions_base, @@ -53,5 +54,6 @@ check_info["fortigate_sessions_base"] = { "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 8 ]), + "group" : "fortigate_sessions", } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 65ca01e..8a5dc97 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4422,6 +4422,10 @@ check_metrics["check_mk-cisco_mem_asa"] = { "mem_used" : { "name" : "mem_used_percent" } } +check_metrics["check_mk-fortigate_sessions_base"] = { + "session" : { "name" : "active_sessions" } +} + #. # .--Perf-O-Meters-------------------------------------------------------. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b346eb3..d4f15ea 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -198,6 +198,19 @@ register_check_parameters( 'dict' ) +register_check_parameters( + subgroup_networking, + "fortigate_sessions", + _(u"Fortigate Active Sessions"), + Tuple( + title = _(u"Levels for active sessions"), + elements = [ + Integer( title = _(u"Warning at"), default_value = 100000 ), + Integer( title = _(u"Critical at"), default_value = 150000 ), + ]), + None, + "first" +) #. # .--Inventory-----------------------------------------------------------.

8 years, 2 months

aquire_lock: now return True if lock was already held

by Mathias Kettner

Module: check_mk Branch: master Commit: 88d5ac8cf9b6e9986b190e4817dfdc2bae703d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88d5ac8cf9b6e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 4 14:31:52 2016 +0200 aquire_lock: now return True if lock was already held --- web/htdocs/lib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 7b76b6d..3acae6b 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -388,7 +388,7 @@ g_aquired_locks = [] g_locked_paths = [] def aquire_lock(path): if path in g_locked_paths: - return # No recursive locking + return True # No recursive locking # Create file (and base dir) for locking if not existant yet make_nagios_directory(os.path.dirname(path)) @@ -408,6 +408,7 @@ def aquire_lock(path): g_aquired_locks.append((path, fd)) g_locked_paths.append(path) + def release_lock(path): if path not in g_locked_paths: return # no unlocking needed

8 years, 2 months

3152 FIX lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set

by Sebastian Herbord

Module: check_mk Branch: master Commit: de1ebadc35e648a0bf9090b32eb79252348c8641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1ebadc35e648… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jul 4 14:11:54 2016 +0200 3152 FIX lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set --- .werks/3152 | 10 ++++++++++ ChangeLog | 1 + checks/lvm_vgs | 1 + web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3152 b/.werks/3152 new file mode 100644 index 0000000..4af887c --- /dev/null +++ b/.werks/3152 @@ -0,0 +1,10 @@ +Title: lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467634183 + + diff --git a/ChangeLog b/ChangeLog index d794d09..9c81753 100644 --- a/ChangeLog +++ b/ChangeLog @@ -471,6 +471,7 @@ * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... * 3547 FIX: Deleting a subfolder now generates a correct audit message... * 3661 FIX: Service discovery is now possible with only "modify services" permission... + * 3152 FIX: lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/checks/lvm_vgs b/checks/lvm_vgs index fb9fbdb..9d7a0a3 100644 --- a/checks/lvm_vgs +++ b/checks/lvm_vgs @@ -44,4 +44,5 @@ check_info['lvm_vgs'] = { "has_perfdata" : True, "group" : "volume_groups", "default_levels_variable" : "filesystem_default_levels", + "includes" : [ "df.include" ] } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index aeb584f..b346eb3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4738,7 +4738,7 @@ register_check_parameters( TextAscii( title = _("Volume Group"), allow_empty = False), - "dict" + "first" ) register_check_parameters(

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016