Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

Revert "htmllib refactoring: popup-trigger and context-buttons"

by Lars Michelsen

Module: check_mk Branch: master Commit: f12c57be510d03ef3845d30de0636a5c7bf4462e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f12c57be510d03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 27 16:37:15 2016 +0200 Revert "htmllib refactoring: popup-trigger and context-buttons" This reverts commit 37438839b7788573a03b8ea0aaf8d5770532046a. --- tests/web/classes.py | 348 ++++++----------------- tests/web/test_html.py | 31 +-- tests/web/test_htmllib_integration.py | 57 ++-- tests/web/tools.py | 121 +++----- web/htdocs/htmllib.py | 508 +++++++++++++++++----------------- web/plugins/views/inventory.py | 2 +- web/plugins/views/painters.py | 8 +- 7 files changed, 421 insertions(+), 654 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f12c57be51…

7 years, 11 months

Add missing file from Werk #4036

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e4538e069bc15426c4a8fd3941dc90e9d8af737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e4538e069bc15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:18:02 2016 +0200 Add missing file from Werk #4036 --- lib/cpu_tracking.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/lib/cpu_tracking.py b/lib/cpu_tracking.py new file mode 100644 index 0000000..2e3b070 --- /dev/null +++ b/lib/cpu_tracking.py @@ -0,0 +1,85 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import os, time + +try: + _ +except NameError: + _ = lambda x: x # Fake i18n when not available + +current_phase = None + +def start(initial_phase): + global times, last_time_snapshot, current_phase, phase_stack + times = {} + last_time_snapshot = _time_snapshot() + current_phase = initial_phase + phase_stack = [] + set_phase(initial_phase) + + +def end(): + set_phase(None) + + +def set_phase(phase): + global current_phase + if current_phase != None: + _add_times_to_phase() + current_phase = phase + + +def push_phase(phase): + if current_phase != None: + phase_stack.append(current_phase) + set_phase(phase) + + +def pop_phase(): + if current_phase != None: + set_phase(phase_stack[-1]) + del phase_stack[-1] + + +def get_times(): + return times + + +def _add_times_to_phase(): + global last_time_snapshot + new_time_snapshot = _time_snapshot() + for phase in current_phase, "TOTAL": + phase_times = times.get(phase, [ 0.0 ] * len(new_time_snapshot)) + times[phase] = [ + phase_times[i] + new_time_snapshot[i] - last_time_snapshot[i] + for i in range(len(new_time_snapshot)) ] + last_time_snapshot = new_time_snapshot + + +def _time_snapshot(): + return list(os.times()[:4]) + [ time.time() ] +

7 years, 11 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 901aed94f83371808da8c493f76b587d2b49a2cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=901aed94f83371… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:13:43 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index edfadbd..596dd59 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4036 +4046

7 years, 11 months

4036 Measurement of time used by Check_MK now includes time waited for agent

by Mathias Kettner

Module: check_mk Branch: master Commit: c3e57e8b48441b6e7dc435215d2f6f074e87a20d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3e57e8b48441b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:14:32 2016 +0200 4036 Measurement of time used by Check_MK now includes time waited for agent Now in the graph you can see how much time was spent waiting for the monitoring agent. --- .werks/4036 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 29 ++++++++++++++++++---------- modules/snmp.py | 2 ++ web/htdocs/metrics.py | 2 +- web/plugins/metrics/check_mk.py | 42 +++++++++++++++++++++++++++++++++++++++-- 6 files changed, 73 insertions(+), 13 deletions(-) diff --git a/.werks/4036 b/.werks/4036 new file mode 100644 index 0000000..321f3a9 --- /dev/null +++ b/.werks/4036 @@ -0,0 +1,10 @@ +Title: Measurement of time used by Check_MK now includes time waited for agent +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i2 +Date: 1477574025 +Class: feature + +Now in the graph you can see how much time was spent waiting for the monitoring +agent. diff --git a/ChangeLog b/ChangeLog index 6e1b24f..34fc4c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.4.0i2: Core & Setup: + * 4036 Measurement of time used by Check_MK now includes time waited for agent... * 3648 FIX: Fixed log file parsing of host states... * 3965 FIX: Nagios: Improved handling of broken core config... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f41cedf..3f58475 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -58,6 +58,7 @@ from cmk.regex import regex import cmk.tty as tty import cmk.render as render import cmk.crash_reporting as crash_reporting +import cmk.cpu_tracking as cpu_tracking import cmk.paths import cmk_base.agent_simulator @@ -689,9 +690,12 @@ def get_agent_info(hostname, ipaddress, max_cache_age): # as ssh or rsh or agent_vsphere) instead of a TCP connect. commandline = get_datasource_program(hostname, ipaddress) if commandline: + cpu_tracking.push_phase("ds") output = get_agent_info_program(commandline) else: + cpu_tracking.push_phase("agent") output = get_agent_info_tcp(hostname, ipaddress) + cpu_tracking.pop_phase() # Got new data? Write to cache file write_cache_file(hostname, output) @@ -1162,9 +1166,9 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero # This is the main check function - the central entry point to all and # everything def do_check(hostname, ipaddress, only_check_types = None): - console.verbose("Check_mk version %s\n" % cmk.__version__) + cpu_tracking.start("busy") + console.verbose("Check_MK version %s\n" % cmk.__version__) - start_time = time.time() expected_version = agent_target_version(hostname) @@ -1233,16 +1237,21 @@ def do_check(hostname, ipaddress, only_check_types = None): if checkresult_file_fd != None: close_checkresult_file() - run_time = time.time() - start_time - if check_mk_perfdata_with_times: - if opt_keepalive: - times = get_keepalive_times() - else: - times = os.times() + cpu_tracking.end() + phase_times = cpu_tracking.get_times() + total_times = phase_times["TOTAL"] + run_time = total_times[4] + if check_mk_perfdata_with_times: output += "execution time %.1f sec|execution_time=%.3f user_time=%.3f "\ - "system_time=%.3f children_user_time=%.3f children_system_time=%.3f\n" %\ - (run_time, run_time, times[0], times[1], times[2], times[3]) + "system_time=%.3f children_user_time=%.3f children_system_time=%.3f" %\ + (run_time, run_time, total_times[0], total_times[1], total_times[2], total_times[3]) + + for phase, times in phase_times.items(): + if phase in [ "agent", "snmp", "ds" ]: + t = times[4] - sum(times[:4]) # real time - CPU time + output += " cmk_time_%s=%.3f" % (phase, t) + output += "\n" else: output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) diff --git a/modules/snmp.py b/modules/snmp.py index 8ce7743..3b0bffb 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -243,12 +243,14 @@ def perform_snmpwalk(hostname, ip, check_type, base_oid, fetchoid): snmp_contexts = [None] for context_name in snmp_contexts: + cpu_tracking.push_phase("snmp") if is_inline_snmp_host(hostname): rows = inline_snmpwalk_on_suboid(hostname, check_type, fetchoid, base_oid, context_name=context_name, ipaddress=ip) else: rows = snmpwalk_on_suboid(hostname, ip, fetchoid, context_name=context_name) + cpu_tracking.pop_phase() # I've seen a broken device (Mikrotik Router), that broke after an # update to RouterOS v6.22. It would return 9 time the same OID when diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index a9a17de..648f32e 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # Frequently used variable names: -# perf_data_string: Raw performance data as sent by the core, e.g "foor=17M;1;2;4;5" +# perf_data_string: Raw performance data as sent by the core, e.g "foo=17M;1;2;4;5" # perf_data: Split performance data, e.g. [("foo", "17", "M", "1", "2", "4", "5")] # translated_metrics: Completely parsed and translated into metrics, e.g. { "foo" : { "value" : 17.0, "unit" : { "render" : ... }, ... } } # color: RGB color representation ala HTML, e.g. "#ffbbc3" or "#FFBBC3", len() is always 7! diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6fbbbf1..e73ae02 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1714,7 +1714,7 @@ metric_info["hours_since_service"] = { } metric_info["execution_time"] = { - "title" : _("Execution time"), + "title" : _("Total execution time"), "unit" : "s", "color" : "#d080af", } @@ -2285,6 +2285,25 @@ metric_info["livestatus_overflows_rate"] = { "color" : "16/a", } +metric_info["cmk_time_agent"] = { + "title" : _("Time spent waiting for Check_MK agent"), + "unit" : "s", + "color" : "35/a", +} + +metric_info["cmk_time_snmp"] = { + "title" : _("Time spent waiting for SNMP responses"), + "unit" : "s", + "color" : "36/a", +} + +metric_info["cmk_time_ds"] = { + "title" : _("Time spent waiting for special agent"), + "unit" : "s", + "color" : "34/a", +} + + metric_info["num_open_events"] = { "title" : _("Open events"), "unit" : "count", @@ -5907,6 +5926,25 @@ graph_info.append({ ( "user_time,children_user_time,system_time,children_system_time,+,+,+#888888", "line", _("Total") ), ], "omit_zero_metrics" : True, + "conflicting_metrics" : [ "cmk_time_agent", "cmk_time_snmp", "cmk_time_ds" ], +}) + + +graph_info.append({ + "title" : _("Time usage by phase"), + "metrics" : [ + ( "user_time,children_user_time,+", "stack", _("CPU time in user space") ), + ( "system_time,children_system_time,+", "stack", _("CPU time in operating system") ), + ( "cmk_time_agent", "stack" ), + ( "cmk_time_snmp", "stack" ), + ( "cmk_time_ds", "stack" ), + ( "execution_time", "line" ), + ], + "optional_metrics" : [ + "cmk_time_agent", + "cmk_time_snmp", + "cmk_time_ds" + ], }) graph_info.append({ @@ -5952,7 +5990,7 @@ graph_info.append({ "load1:warn", "load1:crit", ], - "optional_metrics" : [ "load15" ], + "optional_metrics" : [ "load15", ], }) graph_info.append({

7 years, 11 months

4037 FIX Fix graphs that have optional metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: 8733f8cc295c09a79279386004d8e5a8d39f7c6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8733f8cc295c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:16:43 2016 +0200 4037 FIX Fix graphs that have optional metrics These graphs templates are not very common, but they can be painted even if a check does not certain metrics. The bug resulted in these graphs not being shown and single graphs for each of their metrics instead. --- .werks/4037 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 5 ++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4037 b/.werks/4037 new file mode 100644 index 0000000..3c8819e --- /dev/null +++ b/.werks/4037 @@ -0,0 +1,12 @@ +Title: Fix graphs that have optional metrics +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1477574118 +Class: fix + +These graphs templates are not very common, but they can be +painted even if a check does not certain metrics. The bug +resulted in these graphs not being shown and single graphs +for each of their metrics instead. diff --git a/ChangeLog b/ChangeLog index 34fc4c8..0450755 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output * 3902 FIX: Graph search view: Changing painter options made page empty * 3969 FIX: CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98... + * 4037 FIX: Fix graphs that have optional metrics... WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 648f32e..124e26a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -619,7 +619,10 @@ def evaluate_literal(expression, translated_metrics): unit = translated_metrics[varname]["unit"] if color == None: - color = parse_color_into_hexrgb(metric_info[varname]["color"]) + if varname in metric_info: + color = parse_color_into_hexrgb(metric_info[varname]["color"]) + else: + color = "#808080" return value, unit, color

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 7eba86ab588944e1add755c64dde323a73c4fac2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eba86ab588944… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 27 14:32:29 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 81bd123..eb72f3e 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -403,7 +403,7 @@ int open_unix_socket() { strncpy(sockaddr.sun_path, g_socket_path, sizeof(sockaddr.sun_path)); if (bind(g_unix_socket, reinterpret_cast<struct sockaddr *>(&sockaddr), sizeof(sockaddr)) < 0) { - generic_error ge("cannot bind UNIX socket to adress " + + generic_error ge("cannot bind UNIX socket to address " + string(g_socket_path)); Error(fl_logger_nagios) << ge; close(g_unix_socket);

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b9cde49cdf500aefd8424dc03f9dc48a8344aa46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9cde49cdf500a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 27 14:25:05 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/EventConsoleConnection.cc | 4 ++-- livestatus/src/Store.cc | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index 0d53f61..50e47cd 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -59,7 +59,7 @@ void EventConsoleConnection::run() { close(_socket); return; } - Informational(&_logger) << "successfully connected"; + Debug(&_logger) << "successfully connected"; if (!writeRequest()) { generic_error ge("cannot write"); @@ -69,7 +69,7 @@ void EventConsoleConnection::run() { Alert(&_logger) << ge; } - Informational(&_logger) << "closing connection"; + Debug(&_logger) << "closing connection"; close(_socket); } diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index c6db114..5aa95c9 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -41,7 +41,7 @@ extern Encoding g_data_encoding; extern unsigned long g_max_cached_messages; using std::chrono::duration_cast; -using std::chrono::microseconds; +using std::chrono::milliseconds; using std::chrono::system_clock; using std::list; using std::lock_guard; @@ -130,10 +130,18 @@ list<string> getLines(InputBuffer *input) { } // namespace void Store::logRequest(const string &line, const list<string> &lines) { - Informational info(_logger); - info << "Request: " << line; - for (const auto &l : lines) { - info << R"(\n)" << l; + Informational log(_logger); + log << "request: " << line; + if (_logger->isLoggable(LogLevel::debug)) { + for (const auto &l : lines) { + log << R"(\n)" << l; + } + } else { + size_t s = lines.size(); + if (s > 0) { + log << R"(\n{)" << s << (s == 1 ? " line follows" : " lines follow") + << "...}"; + } } } @@ -235,8 +243,8 @@ void Store::answerGetRequest(const list<string> &lines, OutputBuffer *output, auto start = system_clock::now(); Query(lines, table, g_data_encoding).process(output); - auto elapsed = duration_cast<microseconds>(system_clock::now() - start); - Informational(_logger) << "Time to process request: " << elapsed.count() - << "us. Size of answer: " << output->size() + auto elapsed = duration_cast<milliseconds>(system_clock::now() - start); + Informational(_logger) << "processed request in " << elapsed.count() + << " ms, replied with " << output->size() << " bytes"; }

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 94e83aee382e83eef43cdfcc9baf08eec18a614a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94e83aee382e83… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 27 12:08:48 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Query.cc | 7 ++++--- livestatus/src/Store.cc | 23 ++++++++++++++++++----- livestatus/src/Store.h | 2 ++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index baa8566..1c211e2 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -99,7 +99,6 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding) line_copy.push_back('\0'); char *buffer = &line_copy[0]; rstrip(buffer); - Informational(_logger) << "Query: " << buffer; if (strncmp(buffer, "Filter:", 7) == 0) { parseFilterLine(lstrip(buffer + 7), _filter); @@ -712,8 +711,10 @@ void Query::parseLocaltimeLine(char *line) { return; } _timezone_offset = full * 1800; - Debug(_logger) << "Timezone difference is " << (_timezone_offset / 3600.0) - << " hours"; + if (_timezone_offset != 0) { + Debug(_logger) << "timezone difference is " << _timezone_offset / 3600.0 + << " hours"; + } } bool Query::doStats() { return !_stats_columns.empty(); } diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 7b8d788..c6db114 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -129,6 +129,14 @@ list<string> getLines(InputBuffer *input) { } } // namespace +void Store::logRequest(const string &line, const list<string> &lines) { + Informational info(_logger); + info << "Request: " << line; + for (const auto &l : lines) { + info << R"(\n)" << l; + } +} + bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { output->reset(); InputBuffer::Result res = input->readRequest(); @@ -142,17 +150,21 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } string l = input->nextLine(); const char *line = l.c_str(); - Informational(_logger) << "Query: " << line; if (strncmp(line, "GET ", 4) == 0) { - answerGetRequest(getLines(input), output, - lstrip(const_cast<char *>(line) + 4)); + auto lines = getLines(input); + logRequest(l, lines); + answerGetRequest(lines, output, lstrip(const_cast<char *>(line) + 4)); } else if (strcmp(line, "GET") == 0) { // only to get error message - answerGetRequest(getLines(input), output, ""); + auto lines = getLines(input); + logRequest(l, lines); + answerGetRequest(lines, output, ""); } else if (strncmp(line, "COMMAND ", 8) == 0) { + logRequest(l, {}); answerCommandRequest(lstrip(const_cast<char *>(line) + 8)); output->setDoKeepalive(true); } else if (strncmp(line, "LOGROTATE", 9) == 0) { + logRequest(l, {}); Informational(_logger) << "Forcing logfile rotation"; rotate_log_file(time(nullptr)); schedule_new_event(EVENT_LOG_ROTATION, 1, get_next_log_rotation_time(), @@ -160,7 +172,8 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { reinterpret_cast<void *>(get_next_log_rotation_time), 1, nullptr, nullptr, 0); } else { - Warning(_logger) << "Invalid request '" << line << "'"; + logRequest(l, {}); + Warning(_logger) << "Invalid request '" << l << "'"; output->setError(OutputBuffer::ResponseCode::invalid_request, "Invalid request method"); } diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 1380081..68ac738 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -102,6 +102,8 @@ private: void addTable(Table *table); Table *findTable(const std::string &name); + void logRequest(const std::string &line, + const std::list<std::string> &lines); void answerGetRequest(const std::list<std::string> &lines, OutputBuffer *, const char *); void answerCommandRequest(const char *);

7 years, 11 months

3741 FIX omd_status: Fix labelling and structure of several metric graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 0155f3d03aa26ce0a707299bc877cd79e2ef69a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0155f3d03aa26c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 11:46:00 2016 +0200 3741 FIX omd_status: Fix labelling and structure of several metric graphs --- .werks/3741 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 13 ++++++++++--- web/plugins/metrics/check_mk.py | 39 ++++++++++++++++++++++++++++++--------- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/.werks/3741 b/.werks/3741 new file mode 100644 index 0000000..9f682cc --- /dev/null +++ b/.werks/3741 @@ -0,0 +1,10 @@ +Title: omd_status: Fix labelling and structure of several metric graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1477561533 + + diff --git a/ChangeLog b/ChangeLog index 2c9c0a2..6e1b24f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated... * 3985 FIX: mrpe: fixed broken long output when using the CMC... * 4035 FIX: df_zos: Fixed ignoring last filesystem after new discovery... + * 3741 FIX: omd_status: Fix labelling and structure of several metric graphs Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f654dea..668e70a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -744,10 +744,17 @@ def metric_number_with_precision(v, *args, **kwargs): if v < 0: return "-" + metric_number_with_precision(-v, *args, **kwargs) - kwargs["base"] = 1000.0 - scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(v, *args, **kwargs) + subargs = { + "base": 1000.0, + "precision": kwargs.get("precision", 2), + } + scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(v, *args, **subargs) scaled_value = float(v) / scale_factor - return (u"%%.%df %%s" % places_after_comma) % (scaled_value, scale_symbol) + text = ((u"%%.%df %%s" % places_after_comma) % (scaled_value, scale_symbol)).rstrip() + if kwargs.get("drop_zeroes"): + text = text.rstrip("0").rstrip(".") + return text + def metric_number_with_precision_list(values, *args, **kwargs): diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 479e065..6fbbbf1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -71,7 +71,7 @@ unit_info[""] = { unit_info["count"] = { "title" : _("Count"), "symbol" : "", - "render" : lambda v: metric_number_with_precision(v), + "render" : lambda v: metric_number_with_precision(v, drop_zeroes=True), "stepping" : "integer", # for vertical graph labels } @@ -2191,8 +2191,8 @@ metric_info["host_check_rate"] = { metric_info["monitored_hosts"] = { "title" : _("Monitored hosts"), - "unit" : "1/s", - "color" : "52/a", + "unit" : "count", + "color" : "52/b", } metric_info["hosts_active"] = { @@ -2233,8 +2233,8 @@ metric_info["service_check_rate"] = { metric_info["monitored_services"] = { "title" : _("Monitored services"), - "unit" : "1/s", - "color" : "21/a", + "unit" : "count", + "color" : "21/b", } metric_info["livestatus_connect_rate"] = { @@ -6767,18 +6767,39 @@ graph_info.append({ }) graph_info.append({ - "title" : _("Check helper usage"), "metrics" : [ - ( "helper_usage_cmk", "area" ), + ( "livestatus_usage", "area" ), + ], + "range" : (0, 100), +}) + + +graph_info.append({ + "metrics" : [ + ( "livestatus_overflows_rate", "area" ), + ], +}) + + +graph_info.append({ + "metrics" : [ + ( "helper_usage_cmk", "area" ), + ], + "range" : (0, 100), +}) + +graph_info.append({ + "metrics" : [ ( "helper_usage_generic", "area" ), ], + "range" : (0, 100), }) graph_info.append({ "title" : _("Average check latency"), "metrics" : [ - ( "average_latency_cmk", "area" ), - ( "average_latency_generic", "area" ), + ( "average_latency_cmk", "line" ), + ( "average_latency_generic", "line" ), ], })

7 years, 11 months

Fix notification icon

by Mathias Kettner

Module: check_mk Branch: master Commit: d79d0befc8f7a449a2a10ee4b9ef16e02643523f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d79d0befc8f7a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 11:17:18 2016 +0200 Fix notification icon --- web/htdocs/images/icon_notifications.png | Bin 4083 -> 4436 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_notifications.png b/web/htdocs/images/icon_notifications.png index 5d4b3b5..3a79840 100644 Binary files a/web/htdocs/images/icon_notifications.png and b/web/htdocs/images/icon_notifications.png differ

7 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016