Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

clang-tidy fixes for llvm-namespace-comment check.

by Sven Panne

Module: check_mk Branch: master Commit: ca1f1042f4989f7c1e62760d7532fb845aea4528 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca1f1042f4989f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 16:11:22 2016 +0100 clang-tidy fixes for llvm-namespace-comment check. --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/waittriggers.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index bd429b3..45521d3 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -59,7 +59,7 @@ bool timeout_reached(const struct timeval *start, int timeout_ms) { pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) { return make_pair(list<string>(), r); } -} +} // namespace InputBuffer::InputBuffer(int fd, const int *termination_flag) : _fd(fd) diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index 73d1b55..af3e3e6 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -51,7 +51,7 @@ condition_variable cond_downtime; condition_variable cond_comment; condition_variable cond_command; condition_variable cond_program; -} +} // namespace struct trigger *trigger_all() { return to_trigger(&cond_all);

8 years, 8 months

clang-tidy fixes for clang-analyzer-security.insecureAPI.strcpy check.

by Sven Panne

Module: check_mk Branch: master Commit: 1f40978d20fb3c05d5e6f92f6e8798c869c8827d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f40978d20fb3c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 16:02:17 2016 +0100 clang-tidy fixes for clang-analyzer-security.insecureAPI.strcpy check. --- livestatus/src/OutputBuffer.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 9e605f1..261e4d1 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -36,6 +36,8 @@ #include "Query.h" #include "logger.h" +using std::string; + #define WRITE_TIMEOUT_USEC 100000 OutputBuffer::OutputBuffer() : _max_size(INITIAL_OUTPUT_BUFFER_SIZE) { @@ -146,9 +148,8 @@ void OutputBuffer::setError(unsigned code, const char *format, ...) { va_start(ap, format); vsnprintf(buffer, sizeof(buffer) - 1, format, ap); logger(LG_INFO, "error: %s", buffer); - strcat(buffer, "\n"); va_end(ap); - _error_message = buffer; + _error_message = string(buffer) + "\n"; _response_code = code; } }

8 years, 8 months

clang-format tweaks

by Sven Panne

Module: check_mk Branch: master Commit: 561610ece707258c467675ad08a0f29840f7b696 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561610ece70725… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 16:15:13 2016 +0100 clang-format tweaks --- agents/windows/check_mk_agent.cc | 2 +- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/TableStateHistory.cc | 9 +++++---- livestatus/src/waittriggers.cc | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 01cc45c..99998b8 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1298,7 +1298,7 @@ void section_ps(OutputProxy &out) { } //// Note: CPU utilization is determined out of usermodetime and - ///kernelmodetime + /// kernelmodetime out.output("(%s,%" PRIu64 ",%" PRIu64 ",%d,%lu,%" PRIu64 ",%" PRIu64 ",%" PRIu64 ",%lu,%lu)\t%s\n", user.c_str(), virtual_size / 1024, diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 45521d3..dad51ab 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -59,7 +59,7 @@ bool timeout_reached(const struct timeval *start, int timeout_ms) { pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) { return make_pair(list<string>(), r); } -} // namespace +} // namespace InputBuffer::InputBuffer(int fd, const int *termination_flag) : _fd(fd) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ed5d7cf..7a2ff98 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -690,16 +690,17 @@ int TableStateHistory::updateHostServiceState(Query *query, _notification_periods.find(hs_state->_notification_period); if (it_status != _notification_periods.end()) { hs_state->_in_notification_period = it_status->second; - } else // No notification period information available -> within - // notification period + } else + // No notification period information available -> within + // notification period hs_state->_in_notification_period = 1; // Same for service period it_status = _notification_periods.find(hs_state->_service_period); if (it_status != _notification_periods.end()) { hs_state->_in_service_period = it_status->second; - } else // No service period information available -> within service - // period + } else + // No service period information available -> within service period hs_state->_in_service_period = 1; } diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index af3e3e6..d8701ec 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -51,7 +51,7 @@ condition_variable cond_downtime; condition_variable cond_comment; condition_variable cond_command; condition_variable cond_program; -} // namespace +} // namespace struct trigger *trigger_all() { return to_trigger(&cond_all);

8 years, 8 months

Fixed some case errors in man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 544440107d67d0889c15a419fc94c6b66b666d3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=544440107d67d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 2 15:31:42 2016 +0100 Fixed some case errors in man page --- checkman/mem.win | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/mem.win b/checkman/mem.win index f57edd1..d63818d 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -10,13 +10,13 @@ description: Please note that Microsoft themselves use this naming in some applications. - Due to how windows optimizes memory management, physical memory + Due to how Windows optimizes memory management, physical memory is in practice almost always fully utilized. The Memory usage this check displays says how much memory is actually required by processes, in contrast to caches that could be freed if the need arises. - In the same vein windows may hold data in ram and pagefile at the same - time or it may hold data in the pagefile even when there is ram available, + In the same vein Windows may hold data in RAM and pagefile at the same + time or it may hold data in the pagefile even when there is RAM available, when it determines this may improve performance. As a result, the real pagefile usage is not only hard to determine, it's also utterly useless when we want to determine

8 years, 8 months

#3065 FIX mem.win: renamed "Pagefile" to "Commit Charge" to clarify what the number actually expresses

by Sebastian Herbord

Module: check_mk Branch: master Commit: 6c95fff0e57fe0a6ac29a5c3d6b5d3fe4dcd1e95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c95fff0e57fe0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Feb 2 15:24:55 2016 +0100 #3065 FIX mem.win: renamed "Pagefile" to "Commit Charge" to clarify what the number actually expresses Please see the manpage for a short explanation on what the numbers actually express. --- .werks/3065 | 9 +++++++++ ChangeLog | 1 + checkman/mem.win | 29 ++++++++++++++++++++++++++--- checks/mem | 8 ++++---- web/plugins/metrics/check_mk.py | 6 ++++++ 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.werks/3065 b/.werks/3065 new file mode 100644 index 0000000..ba99164 --- /dev/null +++ b/.werks/3065 @@ -0,0 +1,9 @@ +Title: mem.win: renamed "Pagefile" to "Commit Charge" to clarify what the number actually expresses +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454422778 +Class: fix + +Please see the manpage for a short explanation on what the numbers actually express. diff --git a/ChangeLog b/ChangeLog index a3adce9..7173abf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -240,6 +240,7 @@ * 3063 FIX: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system * 3064 FIX: netscaler_health: no longer discovers non-running fans (i.e. in virtual appliances) * 2987 FIX: esx_vsphere_counters: Improved accuracy of all counter values... + * 3065 FIX: mem.win: renamed "Pagefile" to "Commit Charge" to clarify what the number actually expresses... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checkman/mem.win b/checkman/mem.win index 296e52c..f57edd1 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -5,7 +5,30 @@ license: GPL distribution: check_mk description: This check measures the current usage of physical RAM and - of the Windows page file. + of the commit charge. + The "commit charge" was previously confusingly named "pagefile". + Please note that Microsoft themselves use this naming in + some applications. + + Due to how windows optimizes memory management, physical memory + is in practice almost always fully utilized. The Memory usage this + check displays says how much memory is actually required by processes, + in contrast to caches that could be freed if the need arises. + + In the same vein windows may hold data in ram and pagefile at the same + time or it may hold data in the pagefile even when there is ram available, + when it determines this may improve performance. + As a result, the real pagefile usage is not only hard to + determine, it's also utterly useless when we want to determine + resource usage on the system. + + The commit charge instead tells us how much of the memory used in + total (RAM + swap) is really required, ignoring overlap and caches. + Commit Charge minus Memory Usage is approximately the amount + of the pagefile used for "relevant" data, but further optimizations + may lead to offsets (to the point where Commit Charge - Memory Usage + can be negative). + item: {None} @@ -32,7 +55,7 @@ examples: perfdata: Two variables: {memory}: the current memory usage in MB, {pagefile}: the - current page file usage in MB. + current commit charge in MB. [parameters] parameters (dict): This check uses a dictionary as parameter. The following @@ -42,7 +65,7 @@ parameters (dict): This check uses a dictionary as parameter. The following (e.g. {80.0}) are interpreted as percentages of {used} space. Integer values (e.g. {2048}) are interpreted as MB of {free} space. - {"pagefile"} Warning and critical levels for page file usage. The same + {"pagefile"} Warning and critical levels for commit charge. The same rules apply as for {memory}. {"average"} This optional parameters sets a value in minutes for averaging. diff --git a/checks/mem b/checks/mem index cb35047..6cdb238 100644 --- a/checks/mem +++ b/checks/mem @@ -439,9 +439,9 @@ def check_mem_windows(item, params, info): MB = 1024.0 * 1024 now = time.time() - for title, what, paramname in [ - ( "Memory", "Mem", "memory" ), - ( "Page file", "Page", "pagefile" )]: + for title, what, paramname in [ + ("Memory usage", "Mem", "memory"), + ("Commit Charge", "Page", "pagefile")]: total_kb = meminfo[what + "Total"] free_kb = meminfo[what + "Free"] used_kb = total_kb - free_kb @@ -449,7 +449,7 @@ def check_mem_windows(item, params, info): free_mb = free_kb / 1024.0 perc = 100.0 * used_kb / total_kb - infotext = "%s usage: %.1f%% (%.1f/%.1f GB)" % \ + infotext = "%s: %.1f%% (%.1f/%.1f GB)" % \ (title, perc, used_kb / MB, total_kb / MB) if type(params[paramname]) == tuple: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 813ec4c..e7a4694 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -469,6 +469,12 @@ metric_info["mem_used"] = { "unit" : "bytes", } +metric_info["pagefile_used"] = { + "color": "#408f20", + "title" : _("Commit Charge"), + "unit" : "bytes", +} + metric_info["mem_used_percent"] = { "color": "#80ff40", "title" : _("RAM used"),

8 years, 8 months

Fix crash in service details of services without perf data

by Mathias Kettner

Module: check_mk Branch: master Commit: 35a2b383c97e9aa730b46cdd0792a5516128235c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35a2b383c97e9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 2 15:05:53 2016 +0100 Fix crash in service details of services without perf data --- web/htdocs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 844dd1a..8bae21d 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -310,7 +310,7 @@ def parse_perf_data(perf_data_string, check_command=None): check_command = check_command.split("!")[0] if not perf_data_string: - return None, check_command + return [], check_command # Split the perf data string into parts. Preserve quoted strings! try:

8 years, 8 months

#3041 FIX Fixed deselecting view checkbox options like " Always show checkboxes" in dashboard embedded views

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d3f19bbf63064b7eeb4f8e088a453ca1fb279a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d3f19bbf63064… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 15:03:00 2016 +0100 #3041 FIX Fixed deselecting view checkbox options like "Always show checkboxes" in dashboard embedded views --- .werks/3041 | 9 +++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 2 ++ web/htdocs/views.py | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/.werks/3041 b/.werks/3041 new file mode 100644 index 0000000..c6f7fb5 --- /dev/null +++ b/.werks/3041 @@ -0,0 +1,9 @@ +Title: Fixed deselecting view checkbox options like "Always show checkboxes" in dashboard embedded views +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1454421727 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 73f57d7..a3adce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -290,6 +290,7 @@ * 2970 FIX: Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore * 3035 FIX: Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition * 3040 FIX: Removed all summary_hosts related filters from shipped views... + * 3041 FIX: Fixed deselecting view checkbox options like "Always show checkboxes" in dashboard embedded views WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9f1a31f..caed08f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1074,6 +1074,8 @@ def page_edit_dashlet(): dashlet.update(type_properties) elif handle_input_func: + # The returned dashlet must be equal to the parameter! It is not replaced/re-added + # to the dashboard object. FIXME TODO: Clean this up! dashlet = handle_input_func(ident, dashlet) if context_specs: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5f054c0..d1db483 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -642,9 +642,17 @@ def transform_valuespec_value_to_view(view): # at the moment. if ident == 'view': if "options" in attrs: + # First set all options to false + for option in dict(view_editor_options()).keys(): + view[option] = False + + # Then set the selected single options for option in attrs['options']: view[option] = True + + # And cleanup del attrs['options'] + view.update(attrs) del view["view"]

8 years, 8 months

Cleaned up dashboard rendering code and improved error handling in case of single dashlet issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 0043ebf65bb1d428ab9586b5e611338a1f548463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0043ebf65bb1d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 14:13:43 2016 +0100 Cleaned up dashboard rendering code and improved error handling in case of single dashlet issues --- web/htdocs/dashboard.css | 8 + web/htdocs/dashboard.py | 476 +++++++++++++++++++++++++--------------------- 2 files changed, 266 insertions(+), 218 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0043ebf65b…

8 years, 8 months

Graph dashlet: Fixed error handling in case a host can not be found

by Lars Michelsen

Module: check_mk Branch: master Commit: b8b99e644dc7fdd486dfa84e8c9e185123b41987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b99e644dc7fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 14:15:23 2016 +0100 Graph dashlet: Fixed error handling in case a host can not be found --- web/plugins/dashboard/dashlets.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index b61e29c..2331d77 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -351,7 +351,10 @@ def dashlet_graph_reload_js(nr, dashlet): else: html.live.set_prepend_site(True) query = "GET hosts\nFilter: name = %s\nColumns: name" % lqencode(host) - site = html.live.query_column(query)[0] + try: + site = html.live.query_column(query)[0] + except IndexError: + raise MKUserError("host", _("The host could not be found on any active site.")) html.live.set_prepend_site(False) # New graphs which have been added via "add to visual" option don't have a timerange

8 years, 8 months

Added size limit and fixed formating of crash report local vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 17575b2bc2e1ad3539e80b2bebcae07f42383cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17575b2bc2e1ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 12:00:54 2016 +0100 Added size limit and fixed formating of crash report local vars --- web/htdocs/crash_reporting.py | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 07ea45d..15dcb9a 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -385,9 +385,39 @@ def show_agent_output(tardata): output_box(_("Agent output"), agent_output) -# FIXME: Maybe we need to introduce some kind of size limit def get_local_vars_of_last_exception(): - return inspect.trace()[-1][0].f_locals + local_vars = {} + for key, val in inspect.trace()[-1][0].f_locals.items(): + local_vars[key] = format_var_for_export(val) + return local_vars + + +def format_var_for_export(val): + if inspect.isclass(val) or inspect.isroutine(val) or type(val).__name__ == "instance": + return "%s" % val + + elif isinstance(val, dict): + for item_key, item_val in val.items(): + val[item_key] = format_var_for_export(item_val) + + elif isinstance(val, list): + for index, item in enumerate(val): + val[index] = format_var_for_export(item) + + elif isinstance(val, tuple): + new_val = () + for item in val: + new_val += (format_var_for_export(item),) + val = new_val + + # Check and limit size + if type(val) in (str, unicode): + size_limit = 1024*1024 + size = len(val) + if size > size_limit: + val = val[:size_limit] + "... (%d bytes stripped)" % (size - size_limit) + + return val # Slightly duplicate code with modules/check_mk_base.py. Maybe create some kind of central library?

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016