Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

5521 FIX logwatch: Fix exception in WATO's check parameter display

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4f2bfb4082cf962f2301385084cf41a2df9eded5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2bfb4082cf96… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 24 15:56:17 2017 +0100 5521 FIX logwatch: Fix exception in WATO's check parameter display Previously, WATO's check parameter display would complain about invalid check parameters, due to logwatch's parameter precompilation working well with the check itself, but breaking the GUI's validation. This was a purely cosmetic issue. Change-Id: I1743feca52e8848fa5bc30968a912c07988e1052 --- .werks/5521 | 13 +++++++++++++ checks/logwatch | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.werks/5521 b/.werks/5521 new file mode 100644 index 0000000..0819951 --- /dev/null +++ b/.werks/5521 @@ -0,0 +1,13 @@ +Title: logwatch: Fix exception in WATO's check parameter display +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1511534791 + +Previously, WATO's check parameter display would complain about invalid check parameters, +due to logwatch's parameter precompilation working well with the check itself, but +breaking the GUI's validation. This was a purely cosmetic issue. diff --git a/checks/logwatch b/checks/logwatch index 3ae71a4..e92d711 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -153,19 +153,24 @@ def logwatch_level_worst(worst, level): # Extracts patterns that are relevant for the current host and item. # Constructs simple list of pairs: [ ('W', 'crash.exe'), ('C', 'sshd.*test') ] -def logwatch_precompile(hostname, item, params): - params = {"reclassify_patterns": [], "reclassify_states": {}} +def logwatch_precompile(hostname, item, _unused): + # Initialize the patterns list with the logwatch_rules + params = {"reclassify_patterns": []} # This is the new (-> WATO controlled) variable rules = service_extra_conf(hostname, item, logwatch_rules) for rule in rules: if isinstance(rule, dict): - params["reclassify_patterns"].extend(x[:2] for x in rule.get("reclassify_patterns")) + params["reclassify_patterns"].extend(x for x in rule.get("reclassify_patterns")) if "reclassify_states" in rule: + # NOTE: This key cannot be set unless it contains a valid entry. + # The check does not care either way, but the GUI's validation fails + # if it is passed to it with an empty dict. + params.setdefault("reclassify_states", {}) params["reclassify_states"] = rule["reclassify_states"] else: - params["reclassify_patterns"].extend(x[:2] for x in rule) + params["reclassify_patterns"].extend(x for x in rule) # Now load the old logwatch_patterns var patterns = logwatch_patterns.get(item) @@ -187,7 +192,10 @@ def logwatch_precompile(hostname, item, params): in_extraconf_hostlist(hostlist, hostname)): continue - params["reclassify_patterns"].append((level, pattern)) + # All entries need to be 3-Tuples to be compatible with the wato rule. + # The third entry is a comment not used in the check anyway, so we just + # fill it with None here. + params["reclassify_patterns"].append((level, pattern, None)) return params @@ -203,7 +211,7 @@ def logwatch_reclassify(counts, patterns, text, old_level): # Reclassify state if a given regex pattern matches # A match overrules the previous state->state reclassification - for level, pattern in patterns.get("reclassify_patterns", []): + for level, pattern, _ in patterns.get("reclassify_patterns", []): reg = regex(pattern) if reg.search(text): # If the level is not fixed like 'C' or 'W' but a pair like (10, 20),

6 years, 7 months

5540 FIX "Graph time range" display option had no effect on Check_MK graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d3b9703970d787d40e01f88a169a471abebf974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d3b9703970d78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 24 15:50:19 2017 +0100 5540 FIX "Graph time range" display option had no effect on Check_MK graphs The graph time range configured in the view is the "default" time range and the display option is meant to override this view default. Change-Id: I7d11f8e20049bc739c03b71b6a73fab9db16d379 --- .werks/5540 | 12 ++++++++++++ web/plugins/views/painters.py | 13 ++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/5540 b/.werks/5540 new file mode 100644 index 0000000..3c41046 --- /dev/null +++ b/.werks/5540 @@ -0,0 +1,12 @@ +Title: "Graph time range" display option had no effect on Check_MK graphs +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i2 +Date: 1511534729 + +The graph time range configured in the view is the "default" time range and +the display option is meant to override this view default. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b0c7fe8..be8c166 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1013,20 +1013,31 @@ def paint_time_graph_cmk(row, cell, show_timeranges=False): "host_name" : row["host_name"], "service_description" : row.get("service_description", "_HOST_"), }) - graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } # Load the graph render options from # a) the painter parameters configured in the view # b) the painter options set per user and view graph_render_options = cell.painter_parameters().copy() + graph_data_range = {} graph_render_options["show_time_range_previews"] = show_timeranges options = painter_options.get_without_default("graph_render_options") if options != None: graph_render_options.update(options) + # Do not load this setting form the painter options del graph_render_options["set_default_time_range"] + if "set_default_time_range" in graph_render_options: + duration = graph_render_options["set_default_time_range"] + now = time.time() + graph_data_range["time_range"] = now - duration, now + + # Load timerange from painter option (overrides the defaults, if set by the user) + painter_option_pnp_timerange = painter_options.get_without_default("pnp_timerange") + if painter_option_pnp_timerange is not None: + graph_data_range["time_range"] = get_graph_timerange_from_painter_options() + if html.is_mobile(): graph_render_options.update({ "interaction" : False,

6 years, 7 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: ddf1a574e89dee28a17ee62205b596c182ef48d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf1a574e89dee… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 15:42:38 2017 +0100 IWYU fixes. Change-Id: I28e5dea9e6ed318d59ebc34c0f92e593e3ccee9a --- livestatus/src/Column.h | 3 ++- livestatus/src/TimeColumn.cc | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 2155e11..0c2f4a2 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -30,10 +30,11 @@ #include <cstddef> #include <memory> #include <string> -#include "Aggregator.h" #include "Row.h" #include "contact_fwd.h" #include "opids.h" +class Aggregation; +class Aggregator; class Filter; class Logger; class RowRenderer; diff --git a/livestatus/src/TimeColumn.cc b/livestatus/src/TimeColumn.cc index 879641d..a3fc845 100644 --- a/livestatus/src/TimeColumn.cc +++ b/livestatus/src/TimeColumn.cc @@ -22,6 +22,8 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// Different IWYU/header versions don't agree... :-/ +// IWYU pragma: no_include <ratio> #include "TimeColumn.h" #include <chrono> #include "Aggregator.h"

6 years, 7 months

Reduce heavy copy-n-paste by introducing an aggregation class.

by Sven Panne

Module: check_mk Branch: master Commit: 4e7c07bd6017c4981d7398eb72287eb9a66b469b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e7c07bd6017c4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 13:27:39 2017 +0100 Reduce heavy copy-n-paste by introducing an aggregation class. Change-Id: I79ec7b2ecf90bb2256ecd3a7ddd7aa97f786f340 --- livestatus/src/Aggregator.h | 69 ++++++++++++++++++++- livestatus/src/BlobColumn.cc | 6 +- livestatus/src/BlobColumn.h | 5 +- livestatus/src/Column.h | 2 +- livestatus/src/CustomVarsDictColumn.cc | 4 +- livestatus/src/CustomVarsDictColumn.h | 5 +- livestatus/src/DoubleAggregator.cc | 104 -------------------------------- livestatus/src/DoubleAggregator.h | 28 ++++----- livestatus/src/DoubleColumn.cc | 5 +- livestatus/src/DoubleColumn.h | 5 +- livestatus/src/IntAggregator.cc | 104 -------------------------------- livestatus/src/IntAggregator.h | 26 ++++---- livestatus/src/IntColumn.cc | 5 +- livestatus/src/IntColumn.h | 5 +- livestatus/src/ListColumn.cc | 2 +- livestatus/src/ListColumn.h | 5 +- livestatus/src/Makefile.am | 3 - livestatus/src/NullColumn.cc | 2 +- livestatus/src/NullColumn.h | 5 +- livestatus/src/OffsetPerfdataColumn.cc | 5 +- livestatus/src/OffsetPerfdataColumn.h | 5 +- livestatus/src/PerfdataAggregator.cc | 107 +++++---------------------------- livestatus/src/PerfdataAggregator.h | 17 ++---- livestatus/src/Query.cc | 13 ++-- livestatus/src/StatsColumn.cc | 5 +- livestatus/src/StatsColumn.h | 4 +- livestatus/src/StringColumn.cc | 2 +- livestatus/src/StringColumn.h | 5 +- livestatus/src/TimeAggregator.cc | 105 -------------------------------- livestatus/src/TimeAggregator.h | 29 +++++---- livestatus/src/TimeColumn.cc | 6 +- livestatus/src/TimeColumn.h | 5 +- 32 files changed, 189 insertions(+), 509 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e7c07bd60…

6 years, 7 months

5413 FIX Windows agent: nocontext tag did not work for multibyte encoded logfiles

by Jukka Aro

Module: check_mk Branch: master Commit: b8538679c7dafc9ae067d0815c49cbf04aacdf8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8538679c7dafc… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Nov 24 14:43:00 2017 +0100 5413 FIX Windows agent: nocontext tag did not work for multibyte encoded logfiles If a Windows logfile was encoded with a multibyte character encoding the nocontext flag had no effect, always outputting the full context. The nocontext tag now works correctly, in a way similar to single-byte encoded logfiles. Change-Id: Idcca870974ac26da4b8961ad35ba446d90b28897 --- .werks/5413 | 16 ++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/5413 b/.werks/5413 new file mode 100644 index 0000000..ab135d7 --- /dev/null +++ b/.werks/5413 @@ -0,0 +1,16 @@ +Title: Windows agent: nocontext tag did not work for multibyte encoded logfiles +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511530638 +Class: fix + +If a Windows logfile was encoded with a multibyte character encoding +the nocontext flag had no effect, always outputting the full context. + +The nocontext tag now works correctly, in a way similar to single-byte +encoded logfiles. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index eab009b..e8fdf6b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3006 +3008 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index f179114..b436cf8 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -312,7 +312,8 @@ SectionLogwatch::processTextfileUnicode(FILE *file, logwatch_textfile *textfile, } // Output line - if (write_output && !output_buffer.empty()) { + if (write_output && !output_buffer.empty() && + !(textfile->nocontext && (state == 'I' || state == '.'))) { out << state << " " << output_buffer << "\n"; }

6 years, 7 months

5412 FIX Windows agent: fix logfile glob patterns without '*' at the end

by Jukka Aro

Module: check_mk Branch: master Commit: 662af878e1381595e2727cd54c82283f691dde22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=662af878e13815… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Nov 24 14:35:30 2017 +0100 5412 FIX Windows agent: fix logfile glob patterns without '*' at the end Windows logfile patterns have required a wildcard '*' at the end in order to work correctly. It was not possible to require an exact match to the end of a line without wildcard '*' at the end. The reason was a carriage-return (CR) character at the end of each read line that prevented a match unless a '*' was present at the end of the pattern. Now also patterns without a wildcard '*' at the end work correctly. Change-Id: I576b6302e333bfc6eb2014bcc759caa0e17eeb0f --- .werks/5412 | 16 ++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 23 +++++++++++++++++------ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.werks/5412 b/.werks/5412 new file mode 100644 index 0000000..c072659 --- /dev/null +++ b/.werks/5412 @@ -0,0 +1,16 @@ +Title: Windows agent: fix logfile glob patterns without '*' at the end +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i2 +Date: 1511530237 +Class: fix + +Windows logfile patterns have required a wildcard '*' at the end in +order to work correctly. It was not possible to require an exact match +to the end of a line without wildcard '*' at the end. The reason was a +carriage-return (CR) character at the end of each read line that +prevented a match unless a '*' was present at the end of the pattern. + +Now also patterns without a wildcard '*' at the end work correctly. diff --git a/agents/windows/build_version b/agents/windows/build_version index 533bca3..eab009b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3004 +3006 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index 7e9867b..f179114 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -216,17 +216,19 @@ void SectionLogwatch::saveOffsets(const std::string &logwatch_statefile) { } } +namespace { + // Process content of the given textfile // Can be called in dry-run mode (write_output = false). This tries to detect // CRIT or WARN patterns // If write_output is set to true any data found is written to the out socket -int fill_unicode_bytebuffer(FILE *file, char *buffer, int offset) { +inline int fill_unicode_bytebuffer(FILE *file, char *buffer, int offset) { int bytes_to_read = UNICODE_BUFFER_SIZE - offset; int read_bytes = fread(buffer + offset, 1, bytes_to_read, file); return read_bytes + offset; } -int find_crnl_end(char *buffer) { +inline int find_crnl_end(char *buffer) { for (size_t index = 0; index < UNICODE_BUFFER_SIZE; index += 2) { if (buffer[index] == 0x0d && index < UNICODE_BUFFER_SIZE - 2 && buffer[index + 2] == 0x0a) @@ -235,6 +237,14 @@ int find_crnl_end(char *buffer) { return -1; } +inline void rtrim(std::string &s) { + s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) { + return !std::isspace(ch); + }).base(), s.end()); +} + +} //namespace + SectionLogwatch::ProcessTextfileResponse SectionLogwatch::processTextfileUnicode(FILE *file, logwatch_textfile *textfile, std::ostream &out, bool write_output) { @@ -276,6 +286,7 @@ SectionLogwatch::processTextfileUnicode(FILE *file, logwatch_textfile *textfile, // Argh! The wstring needs to be cut at CRLF as it may go on beyond that unicode_wstr.resize(buffer_size); std::string output_buffer = to_utf8(unicode_wstr); + rtrim(output_buffer); Debug(_logger) << "SectionLogwatch::processTextfileUnicode, output_buffer: " << output_buffer; @@ -344,12 +355,12 @@ SectionLogwatch::processTextfileDefault(FILE *file, logwatch_textfile *textfile, while (!feof(file)) { if (!fgets(line, sizeof(line), file)) break; - - if (line[strlen(line) - 1] == '\n') line[strlen(line) - 1] = 0; + std::string lineString(line); + rtrim(lineString); char state = '.'; for (condition_pattern *pattern : *textfile->patterns) { - if (globmatch(pattern->glob_pattern, line)) { + if (globmatch(pattern->glob_pattern, lineString.c_str())) { if (!write_output && (pattern->state == 'C' || pattern->state == 'W' || pattern->state == 'O')) { @@ -364,7 +375,7 @@ SectionLogwatch::processTextfileDefault(FILE *file, logwatch_textfile *textfile, if (write_output && strlen(line) > 0 && !(textfile->nocontext && (state == 'I' || state == '.'))) - out << state << " " << line << "\n"; + out << state << " " << lineString << "\n"; } response.found_match = false;

6 years, 7 months

A few const-correctness fixes. More references instead of pointers.

by Sven Panne

Module: check_mk Branch: master Commit: 8e694cc8e7cb2a5c14f81d3a69007daf25b01437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e694cc8e7cb2a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 11:17:52 2017 +0100 A few const-correctness fixes. More references instead of pointers. Change-Id: Iff9c6dbecdd376197b2834cfab01b6e9006c3c74 --- livestatus/src/ColumnsColumn.cc | 2 +- livestatus/src/ColumnsColumn.h | 4 ++-- livestatus/src/Store.cc | 48 ++++++++++++++++++++--------------------- livestatus/src/Store.h | 2 +- livestatus/src/TableColumns.cc | 10 ++++----- livestatus/src/TableColumns.h | 7 +++--- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/livestatus/src/ColumnsColumn.cc b/livestatus/src/ColumnsColumn.cc index 087488f..7550838 100644 --- a/livestatus/src/ColumnsColumn.cc +++ b/livestatus/src/ColumnsColumn.cc @@ -29,7 +29,7 @@ class Column; std::string ColumnsColumn::getValue(Row row) const { if (auto p = columnData<Column>(row)) { - return _table_columns->getValue(p, _colcol); + return _table_columns.getValue(p, _colcol); } return ""; } diff --git a/livestatus/src/ColumnsColumn.h b/livestatus/src/ColumnsColumn.h index b4cabc8..b4c6146 100644 --- a/livestatus/src/ColumnsColumn.h +++ b/livestatus/src/ColumnsColumn.h @@ -37,7 +37,7 @@ public: ColumnsColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, - int offset, Type colcol, TableColumns *tablecols) + int offset, Type colcol, const TableColumns &tablecols) : StringColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) , _colcol(colcol) @@ -46,7 +46,7 @@ public: private: const Type _colcol; - TableColumns *_table_columns; + const TableColumns &_table_columns; }; #endif // ColumnsColumn_h diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index d0ed454..556d542 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -67,32 +67,32 @@ Store::Store(MonitoringCore *mc) , _table_statehistory(mc, &_log_cache) , _table_status(mc) , _table_timeperiods(mc) { - addTable(&_table_columns); - addTable(&_table_commands); - addTable(&_table_comments); - addTable(&_table_contactgroups); - addTable(&_table_contacts); - addTable(&_table_downtimes); - addTable(&_table_hostgroups); - addTable(&_table_hostsbygroup); - addTable(&_table_hosts); - addTable(&_table_log); - addTable(&_table_servicegroups); - addTable(&_table_servicesbygroup); - addTable(&_table_servicesbyhostgroup); - addTable(&_table_services); - addTable(&_table_statehistory); - addTable(&_table_status); - addTable(&_table_timeperiods); - addTable(&_table_eventconsoleevents); - addTable(&_table_eventconsolehistory); - addTable(&_table_eventconsolestatus); - addTable(&_table_eventconsolereplication); - addTable(&_table_eventconsolerules); + addTable(_table_columns); + addTable(_table_commands); + addTable(_table_comments); + addTable(_table_contactgroups); + addTable(_table_contacts); + addTable(_table_downtimes); + addTable(_table_hostgroups); + addTable(_table_hostsbygroup); + addTable(_table_hosts); + addTable(_table_log); + addTable(_table_servicegroups); + addTable(_table_servicesbygroup); + addTable(_table_servicesbyhostgroup); + addTable(_table_services); + addTable(_table_statehistory); + addTable(_table_status); + addTable(_table_timeperiods); + addTable(_table_eventconsoleevents); + addTable(_table_eventconsolehistory); + addTable(_table_eventconsolestatus); + addTable(_table_eventconsolereplication); + addTable(_table_eventconsolerules); } -void Store::addTable(Table *table) { - _tables.emplace(table->name(), table); +void Store::addTable(Table &table) { + _tables.emplace(table.name(), &table); _table_columns.addTable(table); } diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 4bf2881..3528df3 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -144,7 +144,7 @@ private: std::mutex _command_mutex; #endif - void addTable(Table *table); + void addTable(Table &table); Table *findTable(const std::string &name); #ifdef CMC const GlobalConfig *config() const; diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 2a7ebbd..502cb84 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -32,23 +32,23 @@ TableColumns::TableColumns(MonitoringCore *mc) : Table(mc) { addColumn(std::make_unique<ColumnsColumn>( "table", "The name of the table", -1, -1, -1, 0, - ColumnsColumn::Type::table, this)); + ColumnsColumn::Type::table, *this)); addColumn(std::make_unique<ColumnsColumn>( "name", "The name of the column within the table", -1, -1, -1, 0, - ColumnsColumn::Type::name, this)); + ColumnsColumn::Type::name, *this)); addColumn(std::make_unique<ColumnsColumn>( "description", "A description of the column", -1, -1, -1, 0, - ColumnsColumn::Type::description, this)); + ColumnsColumn::Type::description, *this)); addColumn(std::make_unique<ColumnsColumn>( "type", "The data type of the column (int, float, string, list)", -1, - -1, -1, 0, ColumnsColumn::Type::type, this)); + -1, -1, 0, ColumnsColumn::Type::type, *this)); } std::string TableColumns::name() const { return "columns"; } std::string TableColumns::namePrefix() const { return "column_"; } -void TableColumns::addTable(Table *table) { _tables.push_back(table); } +void TableColumns::addTable(const Table &table) { _tables.push_back(&table); } void TableColumns::answerQuery(Query *query) { for (auto table : _tables) { diff --git a/livestatus/src/TableColumns.h b/livestatus/src/TableColumns.h index 2ac5ce8..61cc827 100644 --- a/livestatus/src/TableColumns.h +++ b/livestatus/src/TableColumns.h @@ -35,8 +35,6 @@ class MonitoringCore; class Query; class TableColumns : public Table { - std::vector<Table *> _tables; - public: explicit TableColumns(MonitoringCore *mc); @@ -44,10 +42,13 @@ public: std::string namePrefix() const override; void answerQuery(Query *query) override; - void addTable(Table *); + void addTable(const Table &table); std::string getValue(const Column *column, ColumnsColumn::Type colcol) const; std::string tableNameOf(const Column *column) const; + +private: + std::vector<const Table *> _tables; }; #endif // TableColumns_h

6 years, 7 months

Refactoring: Introduce null object for table.

by Sven Panne

Module: check_mk Branch: master Commit: 55356b460250025ee183bc0011909d0eb430feb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55356b46025002… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 11:53:12 2017 +0100 Refactoring: Introduce null object for table. https://refactoring.com/catalog/introduceNullObject.html Change-Id: Id069627b1be136db9544b516fbcf844abcb2758e --- livestatus/src/Query.cc | 40 ++++++++++++++++------------------------ livestatus/src/Query.h | 4 ++-- livestatus/src/Store.cc | 36 ++++++++++++++++-------------------- livestatus/src/Store.h | 13 +++++++++++-- 4 files changed, 45 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=55356b4602…

6 years, 7 months

Fixed text alignment of host edit page (and other forms)

by Lars Michelsen

Module: check_mk Branch: master Commit: aa1eedad133e7957efed24b22c102968f36301cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1eedad133e79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 11:14:29 2017 +0100 Fixed text alignment of host edit page (and other forms) Change-Id: I78793c20ac48baf1139e9cc398ee3019ac2f7917 --- web/htdocs/pages.css | 7 +++---- web/htdocs/wato.py | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0c8b5fe..cc6ca6a 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -871,6 +871,7 @@ input.date, input.time { span.checkbox { white-space: nowrap; + line-height: 14px; } @@ -921,8 +922,7 @@ table.nform > tbody > tr > td { } table.nform > tbody > tr > td.simple { - vertical-align: top; - height: 18px; + line-height: 20px; } table.nform td.legend { @@ -930,8 +930,8 @@ table.nform td.legend { width: 240px; padding-right: 8px; vertical-align: top; - padding-top: 8px; padding-left: 10px; + line-height: 28px; } table.nform td.legend.simple { padding-top: 5px; @@ -967,7 +967,6 @@ table.nform td.legend div.checkbox { table.nform td.content { padding-left: 10px; padding-right: 10px; - padding-bottom: 10px; } table.nform td.content.simple { padding-bottom: 0px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1095d38..f5df3d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17411,7 +17411,8 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr attr.render_input(varprefix, defvalue) html.close_div() - html.open_div(class_="inherited", id_="attr_default_%s" % attrname, style="display: none;" if active else None) + html.open_div(class_="inherited", id_="attr_default_%s" % attrname, + style="display: none;" if active else None) # # DIV with actual / inherited / default value

6 years, 7 months

Analyze config: Fixed processing of test result of local site

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e5ce454779fee69b329da726d628d512179c512 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e5ce454779fee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 24 08:34:18 2017 +0100 Analyze config: Fixed processing of test result of local site Change-Id: Ifface311054f91278a290ae63792e2e55a3caf2b --- web/htdocs/wato.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f5df3d4..d538655 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16578,6 +16578,7 @@ class ModeAnalyzeConfig(WatoMode): while True: try: site_id, results_data = result_queue.get_nowait() + results_data = ast.literal_eval(results_data) if isinstance(results_data, Exception): raise results_data @@ -16613,11 +16614,11 @@ class ModeAnalyzeConfig(WatoMode): results_data = watolib.do_remote_automation( config.site(site_id), "check-analyze-config", []) - result_queue.put((site_id, results_data)) + result_queue.put((site_id, repr(results_data))) except Exception, e: log_exception() - result_queue.put((site_id, e)) + result_queue.put((site_id, repr(e))) finally: result_queue.close() result_queue.join_thread()

6 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017