Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Cleaned up show_timeranges argument of render_graphs_from_specification_html ()

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a74abc4bbbce9b52195d601e5187a66ac9bc037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a74abc4bbbce9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 23 07:55:51 2017 +0200 Cleaned up show_timeranges argument of render_graphs_from_specification_html() Change-Id: I38102356de07b0f18be4e61c5bbb3eb37947498f --- web/htdocs/metrics.py | 13 +++++++------ web/plugins/views/painters.py | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index bb39222..9a2acd6 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1565,11 +1565,12 @@ def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_opt int((float(html.var("height")) - 18)/html_size_per_ex)) graph_render_options = { - "size" : size, - "font_size" : 8, - "show_legend" : False, - "show_controls" : False, - "resizable" : False, + "size" : size, + "font_size" : 8, + "show_legend" : False, + "show_controls" : False, + "resizable" : False, + "show_time_range_previews" : False, } graph_render_options.update(custom_graph_render_options) @@ -1610,7 +1611,7 @@ def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_opt graph_artwork = compute_graph_artwork(graph_recipe, graph_data_range, graph_render_options) graph_render_options["size"] = (size[0], size[1] - graph_legend_height_ex(graph_render_options, graph_artwork)) - html_code = render_graphs_from_definitions([graph_recipe], graph_data_range, graph_render_options) + html_code = render_graphs_from_definitions([graph_recipe], graph_data_range, graph_render_options, render_async=False) html.write(html_code) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d99ae02..b0c7fe8 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1020,6 +1020,8 @@ def paint_time_graph_cmk(row, cell, show_timeranges=False): # b) the painter options set per user and view graph_render_options = cell.painter_parameters().copy() + 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) @@ -1047,8 +1049,7 @@ def paint_time_graph_cmk(row, cell, show_timeranges=False): return "", metrics.render_graphs_from_specification_html( graph_identification, graph_data_range, - graph_render_options, - show_timeranges) + graph_render_options) def get_graph_timerange_from_painter_options():

6 years, 7 months

5539 Improved performance of pages showing many graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cd72e65dc77a547528828ec616b1687392219c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd72e65dc77a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 24 07:56:18 2017 +0100 5539 Improved performance of pages showing many graphs Previously the GUI was loading all graphs in the progress of rendering a view. The view was rendered to the user once the information for all graphs is known. This mechanism made pages that show a lot of graphs load slowly. With this change the views are now rendered with a place holder for each graph which is a lot faster. After the view has been loaded for the user, the browser starts to render the graphs asynchronously and simultaneously which will also reduce the total time needed for loading. Change-Id: I2a4a54945f9a81257af23c7724b2a683ed6893f8 --- .werks/5539 | 19 +++++++++++++++++++ web/htdocs/js/checkmk.js | 1 + 2 files changed, 20 insertions(+) diff --git a/.werks/5539 b/.werks/5539 new file mode 100644 index 0000000..cb73311 --- /dev/null +++ b/.werks/5539 @@ -0,0 +1,19 @@ +Title: Improved performance of pages showing many graphs +Level: 2 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1511506236 +Class: feature + +Previously the GUI was loading all graphs in the progress of +rendering a view. The view was rendered to the user once the +information for all graphs is known. This mechanism made pages +that show a lot of graphs load slowly. + +With this change the views are now rendered with a place holder +for each graph which is a lot faster. After the view has been +loaded for the user, the browser starts to render the graphs +asynchronously and simultaneously which will also reduce the +total time needed for loading. diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7c6f982..76e6617 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -612,6 +612,7 @@ function executeJSbyObject(obj) eval(aScripts[i].text); g_current_script = null; } catch(e) { + console.log(e) alert(aScripts[i].text + "\nError:" + e.message); } }

6 years, 7 months

Fixed styling glitch in rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 025ff1cc7f5b424e96d86a7745410a0beb71fa0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=025ff1cc7f5b42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 10:50:49 2017 +0100 Fixed styling glitch in rule editor Change-Id: Ib2da496ae1bff396f8022daa5a7a5ca374e2eb41 --- web/htdocs/wato.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4b3d6be..1095d38 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13838,8 +13838,6 @@ class ModeEditRule(WatoMode): orientation = "horizontal", valuespec = TextAscii(size = 30)).render_input("hostlist", explicit_hosts) - html.br() - html.br() html.checkbox("negate_hosts", negate_hosts, label = _("<b>Negate:</b> make rule apply for <b>all but</b> the above hosts")) html.close_div()

6 years, 7 months

5465 FIX Fixed calculation of standard deviation.

by Sven Panne

Module: check_mk Branch: master Commit: 7fadec11c731a571f8bb0d336a118d2cdeaf9d85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fadec11c731a5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 11:02:54 2017 +0100 5465 FIX Fixed calculation of standard deviation. Note: This fixes only a slightly esoteric feature, namely "Stats: std ..." headers. Normal users are not affected, only those using this header via self-written scripts. Livestatus incorrectly used a bias correction when calculating the standard deviation. For more mathematical background see: https://en.wikipedia.org/wiki/Bessel%27s_correction http://mathworld.wolfram.com/StandardDeviation.html Change-Id: I54ee4adb94dd1bda2afb4b558c647484b768ea0c --- .werks/5465 | 18 ++++++++++++++++++ livestatus/src/DoubleAggregator.cc | 6 ++++-- livestatus/src/IntAggregator.cc | 6 ++++-- livestatus/src/PerfdataAggregator.cc | 19 ++++++++----------- livestatus/src/TimeAggregator.cc | 6 ++++-- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/.werks/5465 b/.werks/5465 new file mode 100644 index 0000000..2cb94e8 --- /dev/null +++ b/.werks/5465 @@ -0,0 +1,18 @@ +Title: Fixed calculation of standard deviation. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511517478 +Class: fix + +Note: This fixes only a slightly esoteric feature, namely "Stats: std ..." +headers. Normal users are not affected, only those using this header via +self-written scripts. + +Livestatus incorrectly used a bias correction when calculating the standard +deviation. For more mathematical background see: + + https://en.wikipedia.org/wiki/Bessel%27s_correction + http://mathworld.wolfram.com/StandardDeviation.html diff --git a/livestatus/src/DoubleAggregator.cc b/livestatus/src/DoubleAggregator.cc index 5ed83a0..b0c6c2c 100644 --- a/livestatus/src/DoubleAggregator.cc +++ b/livestatus/src/DoubleAggregator.cc @@ -87,9 +87,11 @@ void DoubleAggregator::output(RowRenderer& r) const { r.output(_aggr / _count); break; - case StatsOperation::std: - r.output(sqrt((_sumq - _aggr * _aggr / _count) / (_count - 1))); + case StatsOperation::std: { + auto mean = _aggr / _count; + r.output(sqrt(_sumq / _count - mean * mean)); break; + } case StatsOperation::suminv: r.output(_aggr); diff --git a/livestatus/src/IntAggregator.cc b/livestatus/src/IntAggregator.cc index b130f30..ef97737 100644 --- a/livestatus/src/IntAggregator.cc +++ b/livestatus/src/IntAggregator.cc @@ -87,9 +87,11 @@ void IntAggregator::output(RowRenderer &r) const { r.output(_aggr / _count); break; - case StatsOperation::std: - r.output(sqrt((_sumq - _aggr * _aggr / _count) / (_count - 1))); + case StatsOperation::std: { + auto mean = _aggr / _count; + r.output(sqrt(_sumq / _count - mean * mean)); break; + } case StatsOperation::suminv: r.output(_aggr); diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 3653477..d007da5 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -53,11 +53,7 @@ void PerfdataAggregator::consumeVariable(const std::string &varname, double value) { auto it = _aggr.find(varname); if (it == _aggr.end()) { // first entry - perf_aggr new_entry; - new_entry._count = 1; - new_entry._aggr = value; - new_entry._sumq = value * value; - _aggr.emplace(varname, new_entry); + _aggr.emplace(varname, perf_aggr{1, value, value * value}); } else { it->second._count++; switch (_operation) { @@ -122,12 +118,13 @@ void PerfdataAggregator::output(RowRenderer &r) const { break; case StatsOperation::std: - value = entry.second._count <= 1 - ? 0.0 - : sqrt((entry.second._sumq - - (entry.second._aggr * entry.second._aggr) / - entry.second._count) / - (entry.second._count - 1)); + if (entry.second._count == 0) { + value = 0.0; + } else { + auto mean = entry.second._aggr / entry.second._count; + value = sqrt(entry.second._sumq / entry.second._count - + mean * mean); + } break; case StatsOperation::suminv: diff --git a/livestatus/src/TimeAggregator.cc b/livestatus/src/TimeAggregator.cc index 461b400..8baa6b5 100644 --- a/livestatus/src/TimeAggregator.cc +++ b/livestatus/src/TimeAggregator.cc @@ -88,9 +88,11 @@ void TimeAggregator::output(RowRenderer &r) const { r.output(_aggr / _count); break; - case StatsOperation::std: - r.output(sqrt((_sumq - _aggr * _aggr / _count) / (_count - 1))); + case StatsOperation::std: { + auto mean = _aggr / _count; + r.output(sqrt(_sumq / _count - mean * mean)); break; + } case StatsOperation::suminv: r.output(_aggr);

6 years, 7 months

IWYU tweaks for recent libc6 headers.

by Sven Panne

Module: check_mk Branch: master Commit: 3e864c94f5526afbbd9786200b29cc41a7323572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e864c94f5526a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 17:39:50 2017 +0100 IWYU tweaks for recent libc6 headers. Change-Id: I65b8c287d6471405200560f6aa41fa0cfee84f6a --- tests/check_mk.imp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/check_mk.imp b/tests/check_mk.imp index 15db6ca..1370fdc 100644 --- a/tests/check_mk.imp +++ b/tests/check_mk.imp @@ -4,6 +4,9 @@ { ref: boost-all-private.imp }, { include: ["<bits/shared_ptr.h>", private, "<memory>", public ] }, { include: ["<bits/socket_type.h>", private, "<sys/socket.h>", public ] }, + { include: ["<bits/stdint-intn.h>", private, "<cstdint>", public ] }, + { include: ["<bits/stdint-uintn.h>", private, "<cstdint>", public ] }, + { include: ["<bits/types/time_t.h>", private, "<ctime>", public ] }, { include: ["<experimental/bits/fs_ops.h>", private, "<experimental/filesystem>", public ] }, { include: ["<experimental/fs_ops.h>", private, "<experimental/filesystem>", public ] }, { include: ["<pcap/bpf.h>", private, "<pcap.h>", public ] },

6 years, 7 months

5463 FIX Report invalid table names via response header.

by Sven Panne

Module: check_mk Branch: master Commit: a6d28c0d573b1d2ea1987488dd481882b0794cf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6d28c0d573b1d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 24 09:07:45 2017 +0100 5463 FIX Report invalid table names via response header. Even when "ResponseHeader: fixed16" was used, an invalid table name in a GET request was not reported via Livestatus (only in the log file of the monitoring core). This was a regression compared to 1.2.8 and has been fixed. Change-Id: I72df8074f68c71e4dedaf19be13a0f80eeec4147 --- .werks/5463 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5463 b/.werks/5463 new file mode 100644 index 0000000..d5d131d --- /dev/null +++ b/.werks/5463 @@ -0,0 +1,13 @@ +Title: Report invalid table names via response header. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511510734 +Class: fix + +Even when "ResponseHeader: fixed16" was used, an invalid table name in a GET +request was not reported via Livestatus (only in the log file of the +monitoring core). This was a regression compared to 1.2.8 and has been +fixed.

6 years, 7 months

Some tiny improvements suggested by clang-tidy.

by Sven Panne

Module: check_mk Branch: master Commit: 8b918b05575c4d4ee48353aecf464037ab328d57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b918b05575c4d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 17:22:56 2017 +0100 Some tiny improvements suggested by clang-tidy. Change-Id: I79b9ddc8398bc9329f1bd6ad5a7f576af0aa5f51 --- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/Query.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index e746f39..bcc4b86 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -98,7 +98,7 @@ void OutputBuffer::writeData(ostringstream &os) { void OutputBuffer::setError(ResponseCode code, const string &message) { Warning(_logger) << "error: " << message; // only the first error is being returned - if (_error_message == "") { + if (_error_message.empty()) { _error_message = message + "\n"; _response_code = code; } diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 06eb203..3e23d53 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -87,6 +87,7 @@ Query::Query(const std::list<std::string> &lines, Table *table, : _data_encoding(data_encoding) , _max_response_size(max_response_size) , _output(output) + , _renderer_query(nullptr) , _table(table) , _keepalive(false) , _auth_user(nullptr)

6 years, 7 months

Report invalid table names via response header.

by Sven Panne

Module: check_mk Branch: master Commit: 7eeb2926e602b92f14b6749bc8b7c5ea148912ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eeb2926e602b9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 16:18:13 2017 +0100 Report invalid table names via response header. Change-Id: Ib90d1a5e5fbc0ad16cb8b2782c5394125d9896b6 --- livestatus/src/OutputBuffer.cc | 4 ++-- livestatus/src/Query.cc | 14 +++++++++++--- livestatus/src/Query.h | 2 +- livestatus/src/Store.cc | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 9417b46..e746f39 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -44,8 +44,8 @@ OutputBuffer::OutputBuffer(int fd, const bool &termination_flag, Logger *logger) , _termination_flag(termination_flag) , _logger(logger) // TODO(sp) This is really the wrong default because it hides some early - // errors, e.g. an unknown table name. But we can't change this easily - // because of legacy reasons... :-/ + // errors, e.g. an unknown command. But we can't change this easily because + // of legacy reasons... :-/ , _response_header(ResponseHeader::off) , _response_code(ResponseCode::ok) {} diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d2da61c..06eb203 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -83,7 +83,7 @@ void checkNoArguments(const char *line) { Query::Query(const std::list<std::string> &lines, Table *table, Encoding data_encoding, size_t max_response_size, - OutputBuffer &output) + OutputBuffer &output, Logger *logger) : _data_encoding(data_encoding) , _max_response_size(max_response_size) , _output(output) @@ -101,7 +101,7 @@ Query::Query(const std::list<std::string> &lines, Table *table, , _time_limit_timeout(0) , _current_line(0) , _timezone_offset(0) - , _logger(table->logger()) { + , _logger(logger) { FilterStack filters; FilterStack wait_conditions; for (auto &line : lines) { @@ -118,6 +118,11 @@ Query::Query(const std::list<std::string> &lines, Table *table, header = stripped_line.substr(0, pos); rest = mk::lstrip(stripped_line.substr(pos + 1)); } + // In case of an invalid table name, we just want to parse enough to + // determine the kind of response header. + if (table == nullptr && header != "ResponseHeader") { + continue; + } std::vector<char> rest_copy(rest.begin(), rest.end()); rest_copy.push_back('\0'); char *arguments = &rest_copy[0]; @@ -185,7 +190,7 @@ Query::Query(const std::list<std::string> &lines, Table *table, } } - if (_columns.empty() && !doStats()) { + if (table != nullptr && _columns.empty() && !doStats()) { table->any_column([this](std::shared_ptr<Column> c) { return _columns.push_back(c), _all_columns.insert(c), false; }); @@ -491,6 +496,9 @@ void Query::parseLocaltimeLine(char *line) { bool Query::doStats() const { return !_stats_columns.empty(); } bool Query::process() { + if (_table == nullptr) { + return false; + } // Precondition: output has been reset auto start_time = std::chrono::system_clock::now(); auto renderer = diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index c4dae5a..2909311 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -53,7 +53,7 @@ class Table; class Query { public: Query(const std::list<std::string> &lines, Table *, Encoding data_encoding, - size_t max_response_size, OutputBuffer &output); + size_t max_response_size, OutputBuffer &output, Logger *logger); bool process(); diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 2025908..d0ed454 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -291,22 +291,22 @@ void Store::answerCommandNagios(const ExternalCommand &command) { bool Store::answerGetRequest(const std::list<std::string> &lines, OutputBuffer &output, const std::string &tablename) { + // NOTE: Even with an invalid table name we continue, so we can parse + // headers, especially ResponseHeader. if (tablename.empty()) { output.setError(OutputBuffer::ResponseCode::invalid_request, "Invalid GET request, missing tablename"); - return false; } Table *table = findTable(tablename); if (table == nullptr) { - output.setError(OutputBuffer::ResponseCode::not_found, - "Invalid GET request, no such table '" + - std::string(tablename) + "'"); - return false; + output.setError( + OutputBuffer::ResponseCode::not_found, + "Invalid GET request, no such table '" + tablename + "'"); } return Query(lines, table, _mc->dataEncoding(), _mc->maxResponseSize(), - output) + output, logger()) .process(); }

6 years, 7 months

Fixed namespace comments. Sort using-declarations.

by Sven Panne

Module: check_mk Branch: master Commit: 0be2cd33efabd26ec21c067fc77d184a9ad7d8e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0be2cd33efabd2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 11:33:01 2017 +0100 Fixed namespace comments. Sort using-declarations. Change-Id: I71048dd4ce524c1092942cf61a74ad71fcf95c77 --- agents/windows/RotatingFileHandler.cc | 2 +- agents/windows/SettingsCollector.h | 4 ++-- agents/windows/stringutil.h | 2 +- livestatus/src/BitMask.h | 2 +- livestatus/src/LogCache.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/StringUtils.h | 2 +- livestatus/src/TimeperiodsCache.cc | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/windows/RotatingFileHandler.cc b/agents/windows/RotatingFileHandler.cc index 30976c2..9a36828 100644 --- a/agents/windows/RotatingFileHandler.cc +++ b/agents/windows/RotatingFileHandler.cc @@ -32,8 +32,8 @@ using std::lock_guard; using std::mutex; using std::ofstream; using std::ostringstream; -using std::stringstream; using std::string; +using std::stringstream; // TODO: replace this old C based implementation with // std(::experimental)::filesystem as soon as we upgrade to a MinGW version diff --git a/agents/windows/SettingsCollector.h b/agents/windows/SettingsCollector.h index 43a76d8..d46852a 100644 --- a/agents/windows/SettingsCollector.h +++ b/agents/windows/SettingsCollector.h @@ -61,7 +61,7 @@ public: private: bool m_ClearPending; }; -} +} // namespace BlockMode namespace AddMode { @@ -142,6 +142,6 @@ private: GroupFunction _function; typename ContainerT::iterator _insert_pos; }; -} +} // namespace AddMode #endif // SETTINGS_COLLECTOR_H diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index c60f39d..c4a73d2 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -122,7 +122,7 @@ std::string to_string(const T &source) { str << source; return str.str(); } -} +} // namespace std #endif // _cplusplus < 201103L diff --git a/livestatus/src/BitMask.h b/livestatus/src/BitMask.h index 3e4fcb0..9724a99 100644 --- a/livestatus/src/BitMask.h +++ b/livestatus/src/BitMask.h @@ -54,7 +54,7 @@ struct is_bit_mask { // A helper template to make template definitions a bit shorter template <typename T> constexpr bool is_bit_mask_v = is_bit_mask<T>::value; -} // namespace +} // namespace mk template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> inline constexpr Enum operator&(Enum x, Enum y) { diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 11a72e6..c1f79e9 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -30,9 +30,9 @@ #include "Logger.h" #include "MonitoringCore.h" +using std::chrono::system_clock; using std::make_unique; using std::string; -using std::chrono::system_clock; namespace { // Check memory every N'th new message diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 515a1a8..b429fb7 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -40,8 +40,8 @@ #include <new> #include "cmc.h" using std::bad_alloc; -using std::unique_ptr; using std::to_string; +using std::unique_ptr; #else #include <memory> #include <vector> diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h index 699d5f2..072d4af 100644 --- a/livestatus/src/StringUtils.h +++ b/livestatus/src/StringUtils.h @@ -60,6 +60,6 @@ std::pair<std::string, std::string> nextField( std::string ipv4ToString(in_addr_t ipv4_address); std::string portToString(in_port_t port); #endif -} // namespace +} // namespace mk #endif // StringUtils_h diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 9969419..f6f674b 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -29,11 +29,11 @@ #include <utility> #include "Logger.h" +using std::chrono::minutes; +using std::chrono::system_clock; using std::lock_guard; using std::mutex; using std::string; -using std::chrono::system_clock; -using std::chrono::minutes; extern timeperiod *timeperiod_list;

6 years, 7 months

Bumped clang version to 5.0.

by Sven Panne

Module: check_mk Branch: master Commit: ffeee72739024d8767b6d8030c3a7b4eaf73ea9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffeee72739024d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 11:45:25 2017 +0100 Bumped clang version to 5.0. Change-Id: I59d1b3da1254decea579c4d173c8a321e5a430c0 --- Makefile | 2 +- agents/windows/Environment.cc | 6 +++--- agents/windows/EventLogVista.cc | 17 +++++++---------- agents/windows/dynamic_func.h | 18 ++++++++---------- agents/windows/win_error.cc | 10 +++++----- agents/windows/wmiHelper.cc | 9 +++------ livestatus/src/HostListStateColumn.cc | 5 ++--- 7 files changed, 29 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index fbb3477..0be7d0b 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ CXX_FLAGS := -g -O3 -Wall -Wextra # should be removed when the compiler defaults are in sync again. CXX_FLAGS += -std=c++14 -CLANG_VERSION := 4.0 +CLANG_VERSION := 5.0 CLANG_FORMAT := clang-format-$(CLANG_VERSION) CLANG_TIDY := clang-tidy-$(CLANG_VERSION) SCAN_BUILD := scan-build-$(CLANG_VERSION) diff --git a/agents/windows/Environment.cc b/agents/windows/Environment.cc index b9075b2..a9dde99 100644 --- a/agents/windows/Environment.cc +++ b/agents/windows/Environment.cc @@ -116,9 +116,9 @@ string Environment::determineAgentDirectory(bool use_cwd) const { vector<unsigned char> buffer(MAX_PATH_UNICODE, '\0'); DWORD dsize = MAX_PATH_UNICODE; - if (ERROR_SUCCESS == - _winapi.RegQueryValueEx(key, "ImagePath", NULL, NULL, buffer.data(), - &dsize)) { + if (ERROR_SUCCESS == _winapi.RegQueryValueEx(key, "ImagePath", NULL, + NULL, buffer.data(), + &dsize)) { buffer.resize(dsize); string directory{buffer.begin(), buffer.end()}; // search backwards for backslash diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index b93bada..6e5113d 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -197,9 +197,8 @@ public: std::wstring result; result.resize(128); auto publisher_meta = std::make_unique<ManagedEventHandle>( - *_evt, - _evt->openPublisherMetadata(nullptr, source().c_str(), nullptr, 0, - 0)); + *_evt, _evt->openPublisherMetadata(nullptr, source().c_str(), + nullptr, 0, 0)); if (publisher_meta->get_handle() != nullptr) { for (;;) { DWORD required; @@ -401,10 +400,9 @@ void EventLogVista::seek(uint64_t record_id) { *_evt, evt().createBookmark(bookmarkXml.c_str())); _handle = std::make_unique<ManagedEventHandle>( - *_evt, - evt().subscribe(nullptr, _signal->get_handle(), _path.c_str(), L"*", - bookmark->get_handle(), nullptr, nullptr, - EvtSubscribeStartAfterBookmark)); + *_evt, evt().subscribe(nullptr, _signal->get_handle(), _path.c_str(), + L"*", bookmark->get_handle(), nullptr, nullptr, + EvtSubscribeStartAfterBookmark)); if (_handle->get_handle() == nullptr) { throw win_exception( @@ -429,9 +427,8 @@ uint64_t EventLogVista::getLastRecordId() { EVT_HANDLE event_handle = nullptr; DWORD num_events = 0; - if (evt().next && - evt().next(log->get_handle(), 1, &event_handle, INFINITE, 0, - &num_events)) { + if (evt().next && evt().next(log->get_handle(), 1, &event_handle, INFINITE, + 0, &num_events)) { auto event = std::make_unique<ManagedEventHandle>(*_evt, event_handle); return EventLogRecordVista(event->get_handle(), _evt.get(), diff --git a/agents/windows/dynamic_func.h b/agents/windows/dynamic_func.h index c824070..2915999 100644 --- a/agents/windows/dynamic_func.h +++ b/agents/windows/dynamic_func.h @@ -42,16 +42,14 @@ FuncT dynamic_func(LPCWSTR dllName, LPCSTR funcName, return nullptr; } -// there are two macros to declare a dynamic function. The first requires the -// caller to provide the function signature as OriginalFunctionName_type -// the second variant uses c++11 decltype to deduce the type automatically. -// -// The latter is obviously neater at the call site but in case of windows apis -// it -// requires us to include the header with macros set up such that the function -// get declared. In this case the developers have to take care they don't use -// the -// functions directly + // There are two macros to declare a dynamic function. The first requires + // the caller to provide the function signature as OriginalFunctionName_type + // the second variant uses c++11 decltype to deduce the type automatically. + // + // The latter is obviously neater at the call site but in case of windows + // apis it requires us to include the header with macros set up such that + // the function get declared. In this case the developers have to take care + // they don't use the functions directly #define DYNAMIC_FUNC(funcName, dllName, winapi) \ dynamic_func<funcName_type>(dllName, funcName, winapi) diff --git a/agents/windows/win_error.cc b/agents/windows/win_error.cc index 7b05ebd..24b78cf 100644 --- a/agents/windows/win_error.cc +++ b/agents/windows/win_error.cc @@ -49,8 +49,8 @@ std::string get_win_error_as_string(const WinApiAdaptor &winapi, win_exception::win_exception(const WinApiAdaptor &winapi, const std::string &msg, DWORD error_code /* = GET_LAST_ERROR */) - : std::runtime_error(msg + "; " + - get_win_error_as_string(winapi, - error_code == GET_LAST_ERROR - ? winapi.GetLastError() - : error_code)) {} + : std::runtime_error( + msg + "; " + + get_win_error_as_string(winapi, error_code == GET_LAST_ERROR + ? winapi.GetLastError() + : error_code)) {} diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index a27400b..1d21c2b 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -390,8 +390,7 @@ private: RPC_C_IMP_LEVEL_IMPERSONATE, // impersonation level nullptr, // authentication info EOAC_NONE, // additional capabilities - nullptr // reserved - ); + nullptr); // reserved if (FAILED(res)) { throw ComException("Failed to initialize COM security", res, _winapi); @@ -443,8 +442,7 @@ IWbemServices *Helper::connectServer(IWbemLocator *locator) { 0, // security flags 0, // authority 0, // context object - &services // services proxy - ); + &services); // services proxy if (FAILED(res)) { throw ComException("Failed to connect", res, _winapi); @@ -461,8 +459,7 @@ void Helper::setProxyBlanket(IWbemServices *services) { RPC_C_AUTHN_LEVEL_CALL, // authentication level RPC_C_IMP_LEVEL_IMPERSONATE, // impersonation level nullptr, // client identity - EOAC_NONE // proxy capabilities - ); + EOAC_NONE); // proxy capabilities if (FAILED(res)) { throw ComException("Failed to set proxy blanket", res, _winapi); diff --git a/livestatus/src/HostListStateColumn.cc b/livestatus/src/HostListStateColumn.cc index f7a63cc..1f377da 100644 --- a/livestatus/src/HostListStateColumn.cc +++ b/livestatus/src/HostListStateColumn.cc @@ -96,9 +96,8 @@ void HostListStateColumn::update(host *hst, const contact *auth_user, case Type::num_hst_down: case Type::num_hst_unreach: if (has_been_checked && - current_state == - static_cast<int>(_logictype) - - static_cast<int>(Type::num_hst_up)) { + current_state == static_cast<int>(_logictype) - + static_cast<int>(Type::num_hst_up)) { result++; } break;

6 years, 7 months

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