Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

applied problem handled in werk#3649 to another line of Linux agent

by Marcel Schulte

Module: check_mk Branch: master Commit: 08e2ff3ab30abb27af9974be5f0d526bce5fed4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08e2ff3ab30abb… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Dec 27 17:09:07 2016 +0100 applied problem handled in werk#3649 to another line of Linux agent Change-Id: I0ff0c748130da567eb807b908ec2fa31c515c527 --- agents/check_mk_agent.linux | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 82fe4df..146cd70 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1006,7 +1006,10 @@ then fi function is_valid_plugin () { - [[ -f "$1" && -x "$1" && ! "$1" =~ \.dpkg-(new|old|temp)$ ]] && true || false + # NOTE: Due to an escaping-related bug in some old bash versions + # (3.2.x), we have to use an intermediate variable for the pattern. + pattern='\.dpkg-(new|old|temp)$' + [[ -f "$1" && -x "$1" && ! "$1" =~ $pattern ]] && true || false }

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 8134d1ac366388f298510ae33557d306438cbf04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8134d1ac366388… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 27 16:49:04 2016 +0100 Fetched livestatus from downstream. Change-Id: I0a0dd10bf5fe59c9f96ebdd83abd9bcf9136d7db --- livestatus/src/AttributeListColumn.cc | 40 ++++++++++++++++------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index 8358eb4..874e585 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AttributeListColumn.h" +#include <bitset> #include <cctype> #include <map> #include <memory> @@ -35,6 +36,7 @@ #include "Renderer.h" #include "strutil.h" +using std::bitset; using std::make_unique; using std::map; using std::string; @@ -44,23 +46,17 @@ using std::vector; namespace { map<string, unsigned long> known_attributes = { - {"notifications_enabled", MODATTR_NOTIFICATIONS_ENABLED}, - {"active_checks_enabled", MODATTR_ACTIVE_CHECKS_ENABLED}, - {"passive_checks_enabled", MODATTR_PASSIVE_CHECKS_ENABLED}, - {"event_handler_enabled", MODATTR_EVENT_HANDLER_ENABLED}, - {"flap_detection_enabled", MODATTR_FLAP_DETECTION_ENABLED}, - {"failure_prediction_enabled", MODATTR_FAILURE_PREDICTION_ENABLED}, - {"performance_data_enabled", MODATTR_PERFORMANCE_DATA_ENABLED}, - {"obsessive_handler_enabled", MODATTR_OBSESSIVE_HANDLER_ENABLED}, - {"event_handler_command", MODATTR_EVENT_HANDLER_COMMAND}, - {"check_command", MODATTR_CHECK_COMMAND}, - {"normal_check_interval", MODATTR_NORMAL_CHECK_INTERVAL}, - {"retry_check_interval", MODATTR_RETRY_CHECK_INTERVAL}, - {"max_check_attempts", MODATTR_MAX_CHECK_ATTEMPTS}, - {"freshness_checks_enabled", MODATTR_FRESHNESS_CHECKS_ENABLED}, - {"check_timeperiod", MODATTR_CHECK_TIMEPERIOD}, - {"custom_variable", MODATTR_CUSTOM_VARIABLE}, - {"notification_timeperiod", MODATTR_NOTIFICATION_TIMEPERIOD}}; + {"notifications_enabled", 0}, {"active_checks_enabled", 1}, + {"passive_checks_enabled", 2}, {"event_handler_enabled", 3}, + {"flap_detection_enabled", 4}, {"failure_prediction_enabled", 5}, + {"performance_data_enabled", 6}, {"obsessive_handler_enabled", 7}, + {"event_handler_command", 8}, {"check_command", 9}, + {"normal_check_interval", 10}, {"retry_check_interval", 11}, + {"max_check_attempts", 12}, {"freshness_checks_enabled", 13}, + {"check_timeperiod", 14}, {"custom_variable", 15}, + {"notification_timeperiod", 16}}; + +using modified_atttibutes = bitset<32>; } // namespace int32_t AttributeListColumn::getValue(void *row, contact * /*unused*/) { @@ -74,10 +70,10 @@ int32_t AttributeListColumn::getValue(void *row, contact * /*unused*/) { void AttributeListColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { - unsigned long mask = static_cast<unsigned long>(getValue(row, nullptr)); + modified_atttibutes values(getValue(row, nullptr)); ListRenderer l(r); for (const auto &entry : known_attributes) { - if ((mask & entry.second) != 0u) { + if (values[entry.second]) { l.output(entry.first); } } @@ -103,7 +99,7 @@ string AttributeListColumn::refValueFor(const string &value, Logger *logger) { value_vec.push_back('\0'); char *scan = &value_vec[0]; - unsigned long ref_value = 0; + modified_atttibutes values; for (const char *t; (t = next_token(&scan, ',')) != nullptr;) { auto it = known_attributes.find(t); if (it == known_attributes.end()) { @@ -111,7 +107,7 @@ string AttributeListColumn::refValueFor(const string &value, Logger *logger) { << "' for attribute list"; continue; } - ref_value |= it->second; + values[it->second] = true; } - return to_string(ref_value); + return to_string(values.to_ulong()); }

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 70c11be2f730b4b9e9985f7c704af56345e964e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70c11be2f730b4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 27 15:52:24 2016 +0100 Fetched livestatus from downstream. Change-Id: I09fd0dbdce1699dd9d21f730d5ecc3c93bc2e49d --- livestatus/src/CustomVarsColumn.cc | 12 ++++++++++++ livestatus/src/CustomVarsColumn.h | 2 +- livestatus/src/CustomVarsDictColumn.h | 9 +++++++-- livestatus/src/CustomVarsNamesColumn.h | 9 +++++++-- livestatus/src/CustomVarsValuesColumn.h | 10 +++++++--- livestatus/src/TableContacts.cc | 12 ++++++------ livestatus/src/TableServices.cc | 12 ++++++------ 7 files changed, 46 insertions(+), 20 deletions(-) diff --git a/livestatus/src/CustomVarsColumn.cc b/livestatus/src/CustomVarsColumn.cc index 34ee280..41bf0ee 100644 --- a/livestatus/src/CustomVarsColumn.cc +++ b/livestatus/src/CustomVarsColumn.cc @@ -24,7 +24,12 @@ #include "CustomVarsColumn.h" #include <utility> + +#ifdef CMC +#include "Object.h" +#else #include "nagios.h" +#endif using std::string; using std::unordered_map; @@ -36,7 +41,13 @@ CustomVarsColumn::CustomVarsColumn(string name, string description, int offset, CustomVarsColumn::~CustomVarsColumn() = default; +// TODO(sp) This should live in our abstraction layer for cores. unordered_map<string, string> CustomVarsColumn::getCVM(void *row) const { +#ifdef CMC + Object *data = static_cast<Object *>(shiftPointer(row)); + return data == nullptr ? unordered_map<string, string>() + : data->customAttributes(); +#else unordered_map<string, string> result; if (char *data = static_cast<char *>(shiftPointer(row))) { for (customvariablesmember *cvm = @@ -46,6 +57,7 @@ unordered_map<string, string> CustomVarsColumn::getCVM(void *row) const { } } return result; +#endif } string CustomVarsColumn::getVariable(void *row, const string &varname) { diff --git a/livestatus/src/CustomVarsColumn.h b/livestatus/src/CustomVarsColumn.h index 5a59f0e..8a4a3e1 100644 --- a/livestatus/src/CustomVarsColumn.h +++ b/livestatus/src/CustomVarsColumn.h @@ -33,7 +33,7 @@ class CustomVarsColumn : public Column { public: CustomVarsColumn(std::string name, std::string description, int offset, - int indirect_offset, int extra_offset = -1); + int indirect_offset, int extra_offset); virtual ~CustomVarsColumn(); virtual bool contains(void *row, const std::string &value) = 0; std::string getVariable(void *row, const std::string &varname); diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index 338dfd9..a2aad88 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -30,15 +30,20 @@ #include <string> #include "Column.h" #include "CustomVarsColumn.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + class CustomVarsDictColumn : public CustomVarsColumn { public: CustomVarsDictColumn(std::string name, std::string description, int offset, - int indirect_offset, int extra_offset = -1); + int indirect_offset, int extra_offset); ColumnType type() override; void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, diff --git a/livestatus/src/CustomVarsNamesColumn.h b/livestatus/src/CustomVarsNamesColumn.h index 97bb5a4..beb58af 100644 --- a/livestatus/src/CustomVarsNamesColumn.h +++ b/livestatus/src/CustomVarsNamesColumn.h @@ -30,15 +30,20 @@ #include <string> #include "Column.h" #include "CustomVarsColumn.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + class CustomVarsNamesColumn : public CustomVarsColumn { public: CustomVarsNamesColumn(std::string name, std::string description, int offset, - int indirect_offset, int extra_offset = -1); + int indirect_offset, int extra_offset); ColumnType type() override; void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, diff --git a/livestatus/src/CustomVarsValuesColumn.h b/livestatus/src/CustomVarsValuesColumn.h index 8161520..fd8c623 100644 --- a/livestatus/src/CustomVarsValuesColumn.h +++ b/livestatus/src/CustomVarsValuesColumn.h @@ -30,16 +30,20 @@ #include <string> #include "Column.h" #include "CustomVarsColumn.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + class CustomVarsValuesColumn : public CustomVarsColumn { public: CustomVarsValuesColumn(std::string name, std::string description, - int offset, int indirect_offset, - int extra_offset = -1); + int offset, int indirect_offset, int extra_offset); ColumnType type() override; void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc index 828000f..1ccfca5 100644 --- a/livestatus/src/TableContacts.cc +++ b/livestatus/src/TableContacts.cc @@ -120,17 +120,17 @@ void TableContacts::addColumns(Table *table, const string &prefix, table->addColumn(make_unique<CustomVarsNamesColumn>( prefix + "custom_variable_names", "A list of all custom variables of the contact", - reinterpret_cast<char *>(&ctc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&ctc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<CustomVarsValuesColumn>( prefix + "custom_variable_values", "A list of the values of all custom variables of the contact", - reinterpret_cast<char *>(&ctc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&ctc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<CustomVarsDictColumn>( prefix + "custom_variables", "A dictionary of the custom variables", - reinterpret_cast<char *>(&ctc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&ctc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<AttributeListAsIntColumn>( prefix + "modified_attributes", "A bitmask specifying which attributes have been modified", diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 379a888..98cf537 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -458,17 +458,17 @@ void TableServices::addColumns(Table *table, const string &prefix, table->addColumn(make_unique<CustomVarsNamesColumn>( prefix + "custom_variable_names", "A list of the names of all custom variables of the service", - reinterpret_cast<char *>(&svc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&svc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<CustomVarsValuesColumn>( prefix + "custom_variable_values", "A list of the values of all custom variable of the service", - reinterpret_cast<char *>(&svc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&svc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<CustomVarsDictColumn>( prefix + "custom_variables", "A dictionary of the custom variables", - reinterpret_cast<char *>(&svc.custom_variables) - ref, - indirect_offset)); + reinterpret_cast<char *>(&svc.custom_variables) - ref, indirect_offset, + -1)); table->addColumn(make_unique<ServiceGroupsColumn>( prefix + "groups", "A list of all service groups the service is in",

7 years, 9 months

4209 FIX mk_jolokia: Setting a default product now works

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9c0e32cd167a215701d237602e4afa9143fe501d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0e32cd167a21… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 27 14:52:11 2016 +0100 4209 FIX mk_jolokia: Setting a default product now works Previously, setting a product (such as tomcat) for all instances in jolokia.cfg would have no effect. This has been fixed. Change-Id: I438b61bc080701f2fbcd05d5d4bf89c4a44eea0f --- .werks/4209 | 12 ++++++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4209 b/.werks/4209 new file mode 100644 index 0000000..204ea5e --- /dev/null +++ b/.werks/4209 @@ -0,0 +1,12 @@ +Title: mk_jolokia: Setting a default product now works +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482845861 + +Previously, setting a product (such as tomcat) for all +instances in jolokia.cfg would have no effect. This has +been fixed. diff --git a/ChangeLog b/ChangeLog index 94d3c6e..cd258ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent... + * 4209 FIX: mk_jolokia: Setting a default product now works... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 841cb6b..ae314ea 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -304,7 +304,7 @@ def query_instance(inst): d = dict(server_info) version = d.get(('info', 'version'), "unknown") product = d.get(('info', 'product'), "unknown") - if inst.has_key("product"): + if inst.get("product"): product = inst["product"] agentversion = d.get(('agent',), "unknown") sys.stdout.write("%s %s %s %s\n" % (inst["instance"], product, version, agentversion)) @@ -361,6 +361,7 @@ client_key = None service_url = None service_user = None service_password = None +product = None global_vars = [ ( "java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), @@ -469,7 +470,8 @@ for inst in instances: ("client_key", client_key), ("service_url", service_url), ("service_user", service_user), - ("service_password", service_password) + ("service_password", service_password), + ( "product", product ), ]: if varname not in inst: inst[varname] = value

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: bc9fdb5ed69654a8a3ca209ddc4c7f3b61460105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc9fdb5ed69654… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 27 14:30:24 2016 +0100 Fetched livestatus from downstream. Change-Id: I9471628400b78bdcd52142945878f8805e618978 --- livestatus/src/CustomVarsColumn.cc | 28 +++++++++++++++------------- livestatus/src/CustomVarsColumn.h | 4 ++-- livestatus/src/CustomVarsDictColumn.cc | 11 +++++------ livestatus/src/CustomVarsNamesColumn.cc | 16 ++++++---------- livestatus/src/CustomVarsValuesColumn.cc | 11 +++++------ livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/LogwatchListColumn.cc | 2 +- livestatus/src/TableStateHistory.cc | 4 ++-- 8 files changed, 37 insertions(+), 41 deletions(-) diff --git a/livestatus/src/CustomVarsColumn.cc b/livestatus/src/CustomVarsColumn.cc index 95adefd..34ee280 100644 --- a/livestatus/src/CustomVarsColumn.cc +++ b/livestatus/src/CustomVarsColumn.cc @@ -23,8 +23,11 @@ // Boston, MA 02110-1301 USA. #include "CustomVarsColumn.h" +#include <utility> +#include "nagios.h" using std::string; +using std::unordered_map; CustomVarsColumn::CustomVarsColumn(string name, string description, int offset, int indirect_offset, int extra_offset) @@ -33,21 +36,20 @@ CustomVarsColumn::CustomVarsColumn(string name, string description, int offset, CustomVarsColumn::~CustomVarsColumn() = default; -customvariablesmember *CustomVarsColumn::getCVM(void *row) { - void *data = shiftPointer(row); - if (data == nullptr) { - return nullptr; +unordered_map<string, string> CustomVarsColumn::getCVM(void *row) const { + unordered_map<string, string> result; + if (char *data = static_cast<char *>(shiftPointer(row))) { + for (customvariablesmember *cvm = + *reinterpret_cast<customvariablesmember **>(data + _offset); + cvm != nullptr; cvm = cvm->next) { + result.emplace(cvm->variable_name, cvm->variable_value); + } } - return *reinterpret_cast<customvariablesmember **>( - reinterpret_cast<char *>(data) + _offset); + return result; } string CustomVarsColumn::getVariable(void *row, const string &varname) { - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - if (varname.compare(cvm->variable_name) == 0) { - return cvm->variable_value; - } - } - return ""; + auto cvm = getCVM(row); + auto it = cvm.find(varname); + return it == cvm.end() ? "" : it->second; } diff --git a/livestatus/src/CustomVarsColumn.h b/livestatus/src/CustomVarsColumn.h index 548ea9f..5a59f0e 100644 --- a/livestatus/src/CustomVarsColumn.h +++ b/livestatus/src/CustomVarsColumn.h @@ -27,8 +27,8 @@ #include "config.h" // IWYU pragma: keep #include <string> +#include <unordered_map> #include "Column.h" -#include "nagios.h" class CustomVarsColumn : public Column { public: @@ -41,7 +41,7 @@ public: protected: const int _offset; // within data structure (differs from host/service) - customvariablesmember *getCVM(void *row); + std::unordered_map<std::string, std::string> getCVM(void *row) const; }; #endif // CustomVarsColumn_h diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index e3c255e..5b79e83 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "CustomVarsDictColumn.h" +#include <utility> #include "CustomVarsDictFilter.h" #include "Filter.h" #include "Renderer.h" @@ -42,9 +43,8 @@ ColumnType CustomVarsDictColumn::type() { return ColumnType::dict; } void CustomVarsDictColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { DictRenderer d(r); - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - d.output(cvm->variable_name, cvm->variable_value); + for (const auto &it : getCVM(row)) { + d.output(it.first, it.second); } } @@ -54,9 +54,8 @@ unique_ptr<Filter> CustomVarsDictColumn::createFilter(RelationalOperator relOp, } bool CustomVarsDictColumn::contains(void *row, const string &value) { - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - if (value.compare(cvm->variable_value) == 0) { + for (const auto &it : getCVM(row)) { + if (it.second == value) { return true; } } diff --git a/livestatus/src/CustomVarsNamesColumn.cc b/livestatus/src/CustomVarsNamesColumn.cc index 768e3ff..bcf6177 100644 --- a/livestatus/src/CustomVarsNamesColumn.cc +++ b/livestatus/src/CustomVarsNamesColumn.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "CustomVarsNamesColumn.h" +#include <unordered_map> +#include <utility> #include "CustomVarsListFilter.h" #include "Filter.h" #include "Renderer.h" @@ -42,9 +44,8 @@ ColumnType CustomVarsNamesColumn::type() { return ColumnType::list; } void CustomVarsNamesColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { ListRenderer l(r); - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - l.output(string(cvm->variable_name)); + for (const auto &it : getCVM(row)) { + l.output(it.first); } } @@ -54,11 +55,6 @@ unique_ptr<Filter> CustomVarsNamesColumn::createFilter(RelationalOperator relOp, } bool CustomVarsNamesColumn::contains(void *row, const string &value) { - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - if (value.compare(cvm->variable_name) == 0) { - return true; - } - } - return false; + auto cvm = getCVM(row); + return cvm.find(value) != cvm.end(); } diff --git a/livestatus/src/CustomVarsValuesColumn.cc b/livestatus/src/CustomVarsValuesColumn.cc index 7488356..67b7955 100644 --- a/livestatus/src/CustomVarsValuesColumn.cc +++ b/livestatus/src/CustomVarsValuesColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "CustomVarsValuesColumn.h" +#include <utility> #include "CustomVarsListFilter.h" #include "Filter.h" #include "Renderer.h" @@ -42,9 +43,8 @@ ColumnType CustomVarsValuesColumn::type() { return ColumnType::list; } void CustomVarsValuesColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { ListRenderer l(r); - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - l.output(string(cvm->variable_value)); + for (const auto &it : getCVM(row)) { + l.output(it.second); } } @@ -54,9 +54,8 @@ unique_ptr<Filter> CustomVarsValuesColumn::createFilter( } bool CustomVarsValuesColumn::contains(void *row, const string &value) { - for (customvariablesmember *cvm = getCVM(row); cvm != nullptr; - cvm = cvm->next) { - if (value.compare(cvm->variable_value) == 0) { + for (const auto &it : getCVM(row)) { + if (it.second == value) { return true; } } diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index ca7e202..94a38e6 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -61,7 +61,7 @@ unique_ptr<vector<char>> HostFileColumn::getBlob(void *data) { } #ifdef CMC - string host_name = static_cast<Host *>(data)->_name; + string host_name = static_cast<Host *>(data)->name(); #else string host_name = static_cast<host *>(data)->name; #endif diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index ce0b99c..aee5d38 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -42,7 +42,7 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, #ifdef CMC Host *host = static_cast<Host *>(data); - string host_name = host->_name; + string host_name = host->name(); #else host *hst = static_cast<host *>(data); string host_name = hst->name; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 135c11e..3b10117 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -512,10 +512,10 @@ void TableStateHistory::answerQuery(Query *query) { state->_host = entry->_host; state->_service = entry->_service; #ifdef CMC - state->_host_name = entry->_host->_name.c_str(); + state->_host_name = entry->_host->name().c_str(); state->_service_description = entry->_service != nullptr - ? entry->_service->_name.c_str() + ? entry->_service->name().c_str() : ""; #else state->_host_name = entry->_host->name;

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: eebe2d608639b2ffef9f3625a406be55a959b70d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebe2d608639b2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 27 10:35:58 2016 +0100 Fetched livestatus from downstream. Change-Id: I2a5a57f33007c1f7867fcd2f2f80e5acfd016c7d --- livestatus/src/ContactGroupsMemberColumn.h | 2 -- livestatus/src/ContactsColumn.h | 2 -- livestatus/src/DownCommColumn.h | 2 -- livestatus/src/HostContactsColumn.h | 2 -- livestatus/src/HostGroupsColumn.h | 2 -- livestatus/src/ServiceContactsColumn.h | 2 -- livestatus/src/ServiceGroupsColumn.h | 2 -- 7 files changed, 14 deletions(-) diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h index 4a1df0b..73dd332 100644 --- a/livestatus/src/ContactGroupsMemberColumn.h +++ b/livestatus/src/ContactGroupsMemberColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ContactsColumn.h" #include "nagios.h" @@ -38,7 +37,6 @@ public: const std::string& description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} - ColumnType type() override { return ColumnType::list; } std::unique_ptr<Contains> makeContains(const std::string& name) override; std::unique_ptr<Contains> containsContact(contact* ctc) override; }; diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h index 87dc8c8..e08213f 100644 --- a/livestatus/src/ContactsColumn.h +++ b/livestatus/src/ContactsColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ListColumn.h" #include "nagios.h" class RowRenderer; @@ -38,7 +37,6 @@ public: ContactsColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset) : ListColumn(name, description, indirect_offset, extra_offset) {} - ColumnType type() override { return ColumnType::list; } virtual std::unique_ptr<Contains> containsContact(contact *ctc) = 0; bool isEmpty(void *data) override; void output(void *row, RowRenderer &r, contact *auth_user) override; diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index f1c5371..835be64 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ListColumn.h" #include "nagios.h" class DowntimeOrComment; @@ -55,7 +54,6 @@ public: , _with_info(with_info) , _is_service(is_service) , _with_extra_info(with_extra_info) {} - ColumnType type() override { return ColumnType::list; } std::unique_ptr<Contains> makeContains(const std::string &name) override; void output(void *row, RowRenderer &r, contact *auth_user) override; bool isEmpty(void *data) override; diff --git a/livestatus/src/HostContactsColumn.h b/livestatus/src/HostContactsColumn.h index 96b7a4c..0b4b0ce 100644 --- a/livestatus/src/HostContactsColumn.h +++ b/livestatus/src/HostContactsColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ContactsColumn.h" #include "nagios.h" @@ -38,7 +37,6 @@ public: int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset = -1) {} - ColumnType type() override { return ColumnType::list; } std::unique_ptr<Contains> makeContains(const std::string& name) override; std::unique_ptr<Contains> containsContact(contact* ctc) override; }; diff --git a/livestatus/src/HostGroupsColumn.h b/livestatus/src/HostGroupsColumn.h index 14b1fe2..b61162b 100644 --- a/livestatus/src/HostGroupsColumn.h +++ b/livestatus/src/HostGroupsColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ListColumn.h" #include "nagios.h" class RowRenderer; @@ -41,7 +40,6 @@ public: int offset, int indirect_offset, int extra_offset = -1) : ListColumn(name, description, indirect_offset, extra_offset) , _offset(offset) {} - ColumnType type() override { return ColumnType::list; } std::unique_ptr<Contains> makeContains(const std::string &name) override; void output(void *row, RowRenderer &r, contact *auth_user) override; bool isEmpty(void *data) override; diff --git a/livestatus/src/ServiceContactsColumn.h b/livestatus/src/ServiceContactsColumn.h index 283df85..102f3b0 100644 --- a/livestatus/src/ServiceContactsColumn.h +++ b/livestatus/src/ServiceContactsColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ContactsColumn.h" #include "nagios.h" @@ -38,7 +37,6 @@ public: const std::string& description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} - ColumnType type() override { return ColumnType::list; } std::unique_ptr<Contains> makeContains(const std::string& name) override; std::unique_ptr<Contains> containsContact(contact* ctc) override; }; diff --git a/livestatus/src/ServiceGroupsColumn.h b/livestatus/src/ServiceGroupsColumn.h index eadfb28..f57442c 100644 --- a/livestatus/src/ServiceGroupsColumn.h +++ b/livestatus/src/ServiceGroupsColumn.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "Column.h" #include "ListColumn.h" #include "nagios.h" class RowRenderer; @@ -41,7 +40,6 @@ public: int offset, int indirect_offset, int extra_offset = -1) : ListColumn(name, description, indirect_offset, extra_offset) , _offset(offset) {} - ColumnType type() override { return ColumnType::list; } void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Contains> makeContains(const std::string &name) override; bool isEmpty(void *data) override;

7 years, 9 months

WATO replication is now using requests modules instead of curl call

by Lars Michelsen

Module: check_mk Branch: master Commit: 683f9047fa60443ab36c2ed9ecf5c460852d07d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=683f9047fa6044… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 15:24:55 2016 +0100 WATO replication is now using requests modules instead of curl call Change-Id: Ica7f74e3fcf151700fc00c833f405a59fdbfc5c6 --- web/htdocs/watolib.py | 94 +++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 60 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fdc5865..c1b47dd 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -49,6 +49,7 @@ import ast import multiprocessing import tarfile import cStringIO +import requests from lib import * from valuespec import * from hashlib import sha256 @@ -3379,14 +3380,14 @@ def do_site_login(site_id, name, password): # Adding _ajaxid makes the web service fail silently with an HTTP code and # not output HTML code for an error screen. url = site["multisiteurl"] + 'login.py' - post_data = html.urlencode_vars([ - ('_login', '1'), - ('_username', name), - ('_password', password), - ('_origtarget', 'automation_login.py'), - ('_plain_error', '1'), - ]) - response = get_url(url, site.get('insecure', False), name, password, post_data=post_data).strip() + post_data = { + '_login' : '1', + '_username' : name, + '_password' : password, + '_origtarget' : 'automation_login.py', + '_plain_error' : '1', + } + response = get_url(url, site.get('insecure', False), auth=(name, password), data=post_data).strip() if '<html>' in response.lower(): message = _("Authentication to web service failed. Message: %s") % \ html.strip_tags(html.strip_scripts(response)) @@ -3401,50 +3402,24 @@ def do_site_login(site_id, name, password): except: raise MKAutomationException(response) -# TODO: Better to use native python requests module instead of -# this curl call. -def get_url(url, insecure, user=None, password=None, params = '', post_data = None): - cred = '' - if user: - cred = ' -u %s' % quote_shell_string("%s:%s" % (user, password)) - - insecure = insecure and ' --insecure' or '' - - # -s: silent - # -S: show errors - # -w '%{http_code}': add the http status code to the end of the output - # -L: follow redirects - # -b /dev/null: handle cookies, but do not persist them - command = 'curl -b /dev/null -L -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( - insecure, cred, params, url) - tmp_file = None - if post_data != None: - # Put POST data on command line as long as it is not - # longer than 50 KB (remember: Linux has an upper limit - # of 132 KB for command line plus environment - if len(post_data) < 50000: - command += ' --data-binary "%s"' % post_data - else: - import tempfile - tmp_file = tempfile.NamedTemporaryFile(dir = cmk.paths.tmp_dir) - tmp_file.write(post_data) - tmp_file.flush() - command += ' --data-binary "@%s"' % tmp_file.name - response = os.popen(command).read().strip() - try: - status_code = int(response[-3:]) - response_body = response[:-3] - except: - status_code = None - response_body = response +def get_url(url, insecure, auth=None, data=None, files=None): + response = requests.post(url, + data=data, + verify=not insecure, + auth=auth, + files=files, + ) - if status_code == 401: + response.encoding = "utf-8" # Always decode with utf-8 + + if response.status_code == 401: raise MKUserError("_passwd", _("Authentication failed. Invalid login/password.")) - elif status_code != 200: - raise MKUserError("_passwd", _("HTTP Error - %s: %s") % (status_code, response_body)) + elif response.status_code != 200: + raise MKUserError("_passwd", _("HTTP Error - %d: %s") % + (response.status_code, response.text)) - return response_body + return response.text def check_mk_remote_automation(site_id, command, args, indata, stdin_data=None, timeout=None, sync=True): @@ -3504,9 +3479,8 @@ def do_remote_automation(site, command, vars): ("secret", secret), ("debug", config.debug and '1' or '') ]) - vars_encoded = html.urlencode_vars(vars) - response = get_url(url, site.get('insecure', False), - post_data=vars_encoded) + + response = get_url(url, site.get('insecure', False), data=dict(vars)) if not response: raise MKAutomationException(_("Empty output from remote site.")) @@ -3757,12 +3731,12 @@ def push_user_profile_to_site(site, user_id, profile): ("siteid", site['id']), ("debug", config.debug and "1" or ""), ]) - content = html.urlencode_vars([ - ('user_id', user_id), - ('profile', mk_repr(profile)), - ]) - response = get_url(url, site.get('insecure', False), post_data = content) + response = get_url(url, site.get('insecure', False), data={ + 'user_id': user_id, + 'profile': mk_repr(profile), + }) + if not response: raise MKAutomationException(_("Empty output from remote site.")) @@ -4554,12 +4528,12 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): try: return ast.literal_eval(response_text) except SyntaxError: - raise MKAutomationException(_("Garbled automation response from site %s: '%s'") % - (site["id"], response_text)) + raise MKAutomationException(_("Garbled automation response: <pre>%s</pre>") % + (html.attrencode(response_text))) def _upload_file(self, url, insecure): - return get_url(url, insecure, params = ' -F snapshot=@%s' % self._snapshot_file) + return get_url(url, insecure, files={"snapshot": open(self._snapshot_file, "r")}) def _cleanup_snapshot(self): @@ -4687,7 +4661,7 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): self._status_details += _(" Finished at: %s.") % render.time_of_day(self._time_ended) if status_details: - self._status_details += " " + status_details + self._status_details += " %s" % status_details def _save_state(self):

7 years, 9 months

Improved help text for monitoring macros

by Konstantin Büttner

Module: check_mk Branch: master Commit: 33daf33821de7133ef9f7a126634c2136fe9a9c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33daf33821de71… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 23 15:20:57 2016 +0100 Improved help text for monitoring macros Change-Id: Ibf76670a7185ee71d1c73a93781d14eec94fbed1 --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4a3c3d2..22ba2bd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16500,15 +16500,15 @@ def monitoring_macro_help(): "<ul>" "<li><tt>$HOSTADDRESS$</tt>: The IP address of the host</li>" "<li><tt>$HOSTNAME$</tt>: The name of the host</li>" - "<li><tt>$USER1$</tt>: user macro 1 (usually path to shipped plugins)</li>" - "<li><tt>$USER2$</tt>: user marco 2 (usually path to your own plugins)</li>" "<li><tt>$_HOSTTAGS$</tt>: List of host tags</li>" "<li><tt>$_HOSTADDRESS_4$</tt>: The IPv4 address of the host</li>" "<li><tt>$_HOSTADDRESS_6$</tt>: The IPv6 address of the host</li>" "<li><tt>$_HOSTADDRESS_FAMILY$</tt>: The primary address family of the host</li>" "</ul>" - "All custom variables defined for the host are available as <tt>$_HOST[VARNAME]$</tt>. " - "Replace <tt>[VARNAME]</tt> with the upper case name of your variable.") + "All custom attributes defined for the host are available as <tt>$_HOST[VARNAME]$</tt>. " + "Replace <tt>[VARNAME]</tt> with the upper case name of your variable. " + "For example, a host attribute named <tt>foo</tt> with the value <tt>bar</tt> would result in " + "the macro <tt>$_HOSTFOO$</tt> being replaced with <tt>bar</tt> ") #.

7 years, 9 months

4224 FIX Improved exception handling during WATO slave site activation

by Lars Michelsen

Module: check_mk Branch: master Commit: 69d7708272a12c57a2a8c98cb7897ee31fd5a07a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69d7708272a12c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 15:20:33 2016 +0100 4224 FIX Improved exception handling during WATO slave site activation Change-Id: Idfc3ba4211ca9707470c40d270755c7f9badc999 --- .werks/4224 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 12 +++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/4224 b/.werks/4224 new file mode 100644 index 0000000..685ef79 --- /dev/null +++ b/.werks/4224 @@ -0,0 +1,9 @@ +Title: Improved exception handling during WATO slave site activation +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482502812 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2d77605..94d3c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names * 4222 FIX: Services of host page: Fixed encoding issue for hosts with umlauts in alias * 4223 FIX: Fixed possible g_host_attribute related AttributeError exception + * 4224 FIX: Improved exception handling during WATO slave site activation Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 6b88730..fdc5865 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4398,6 +4398,13 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def run(self): try: + self._do_run() + except: + log_exception() + + + def _do_run(self): + try: self._time_started = time.time() self._lock_activation() @@ -5459,9 +5466,8 @@ def collect_hosts(folder): # | host and similar things. | # '----------------------------------------------------------------------' -class MKAutomationException(Exception): - def __init__(self, msg): - super(MKAutomationException, self).__init__(msg) +class MKAutomationException(MKGeneralException): + pass def check_mk_automation(siteid, command, args=None, indata="", stdin_data=None, timeout=None, sync=True):

7 years, 9 months

4223 FIX Fixed possible g_host_attribute related AttributeError exception

by Lars Michelsen

Module: check_mk Branch: master Commit: af1cb0f2b0a9e825522e856acb6bb2d1970994df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af1cb0f2b0a9e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 14:53:10 2016 +0100 4223 FIX Fixed possible g_host_attribute related AttributeError exception Change-Id: Id1c2d3b7003e2287f6020adafaf2d86792a25a63 --- .werks/4223 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 20 +++++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.werks/4223 b/.werks/4223 new file mode 100644 index 0000000..fd6b9b4 --- /dev/null +++ b/.werks/4223 @@ -0,0 +1,9 @@ +Title: Fixed possible g_host_attribute related AttributeError exception +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482501180 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 03819ee..2d77605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names * 4222 FIX: Services of host page: Fixed encoding issue for hosts with umlauts in alias + * 4223 FIX: Fixed possible g_host_attribute related AttributeError exception Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index cc67dcb..6b88730 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -68,6 +68,17 @@ automation_commands = {} g_rulespecs = None g_rulegroups = {} +# Global datastructure holding all attributes (in a defined order) +# as pairs of (attr, topic). Topic is the title under which the +# attribute is being displayed. All builtin attributes use the +# topic None. As long as only one topic is used, no topics will +# be displayed. They are useful if you have a great number of +# custom attributes. +g_host_attributes = [] + +# Dictionary for quick access +g_host_attribute = {} + def initialize_before_loading_plugins(): if g_rulespecs: g_rulespecs.clear() @@ -2951,16 +2962,7 @@ class ContactGroupsAttribute(Attribute): def initialize_host_attribute_structures(): global g_host_attributes, g_host_attribute - - # Global datastructure holding all attributes (in a defined order) - # as pairs of (attr, topic). Topic is the title under which the - # attribute is being displayed. All builtin attributes use the - # topic None. As long as only one topic is used, no topics will - # be displayed. They are useful if you have a great number of - # custom attributes. g_host_attributes = [] - - # Dictionary for quick access g_host_attribute = {}

7 years, 9 months

← Newer
1
2
3
4
5
6
7
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016