Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 95704aa49d708924d9fd123cb72172eda0a38ad3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95704aa49d7089… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 11:21:40 2018 +0200 Check for failed accept(). Change-Id: Ic1d74843d8ab48d030e7d22f8b42181dff89e242 --- livestatus/src/module.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index bf50124..7f43f90 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -194,8 +194,10 @@ void *main_thread(void *data) { if (retval > 0 && poller.isFileDescriptorSet(g_unix_socket, PollEvents::in)) { int cc = accept(g_unix_socket, nullptr, nullptr); - if (cc > g_max_fd_ever) { - g_max_fd_ever = cc; + if (cc == -1) { + generic_error ge("cannot accept client connection"); + Warning(fl_logger_livestatus) << ge; + continue; } if (fcntl(cc, F_SETFD, FD_CLOEXEC) == -1) { generic_error ge( @@ -203,6 +205,9 @@ void *main_thread(void *data) { Alert(fl_logger_livestatus) << ge; break; } + if (cc > g_max_fd_ever) { + g_max_fd_ever = cc; + } fl_client_queue->addConnection(cc); // closes fd g_num_queued_connections++; counterIncrement(Counter::connections);

6 years, 4 months

Fixed unintended loss of precision in staleness calculation.

by Sven Panne

Module: check_mk Branch: master Commit: dba10b6390bc624ab0de79dd69c23f70f60bd55d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba10b6390bc62… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 10:17:14 2018 +0200 Fixed unintended loss of precision in staleness calculation. Change-Id: Ie953882964b550f1972bf15346da643f1b210216 --- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 0574c19..e8b33be 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -49,7 +49,7 @@ double HostSpecialDoubleColumn::getValue(Row row) const { switch (_type) { case Type::staleness: { extern int interval_length; - return (time(nullptr) - hst->last_check) / + return static_cast<double>(time(nullptr) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * interval_length); } diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 0266947..20bcb30 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -47,7 +47,8 @@ double ServiceSpecialDoubleColumn::getValue(Row row) const { switch (_type) { case Type::staleness: { extern int interval_length; - time_t check_result_age = time(nullptr) - svc->last_check; + double check_result_age = + static_cast<double>(time(nullptr) - svc->last_check); if (svc->check_interval != 0) { return check_result_age / (svc->check_interval * interval_length);

6 years, 4 months

Fix for hicpp-use-auto check.

by Sven Panne

Module: check_mk Branch: master Commit: e4d534b8270468943544ffd06a7a9c86d8f549f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4d534b8270468… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 10:41:18 2018 +0200 Fix for hicpp-use-auto check. Change-Id: Ia2addbfeb07f29f410377685bcf3f99890263293 --- livestatus/src/ServiceSpecialDoubleColumn.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 20bcb30..ec6b388 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -47,7 +47,7 @@ double ServiceSpecialDoubleColumn::getValue(Row row) const { switch (_type) { case Type::staleness: { extern int interval_length; - double check_result_age = + auto check_result_age = static_cast<double>(time(nullptr) - svc->last_check); if (svc->check_interval != 0) { return check_result_age /

6 years, 4 months

Fixed exception type.

by Sven Panne

Module: check_mk Branch: master Commit: d59780795df58b54baa4f53029ddfdc94190e87e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d59780795df58b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 14:58:50 2018 +0200 Fixed exception type. Change-Id: I5586b64414fc37d2af8604342d154ce4ae467c37 --- livestatus/src/Query.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index bba16f9..1d7f19a 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -230,8 +230,9 @@ void Query::parseAndOrLine(char *line, Filter::Kind kind, void Query::parseNegateLine(char *line, FilterStack &filters) { checkNoArguments(line); if (filters.empty()) { - throw("error combining filters for table '" + _table.name() + - "': expected 1 filters, but only 0 are on stack"); + throw std::runtime_error( + "error combining filters for table '" + _table.name() + + "': expected 1 filters, but only 0 are on stack"); } auto top = std::move(filters.back()); @@ -262,8 +263,9 @@ void Query::parseStatsAndOrLine(char *line, void Query::parseStatsNegateLine(char *line) { checkNoArguments(line); if (_stats_columns.empty()) { - throw("error combining filters for table '" + _table.name() + - "': expected 1 filters, but only 0 are on stack"); + throw std::runtime_error( + "error combining filters for table '" + _table.name() + + "': expected 1 filters, but only 0 are on stack"); } auto to_negate = _stats_columns.back()->stealFilter(); _stats_columns.pop_back();

6 years, 4 months

Fixed (probably harmless?) race condition.

by Sven Panne

Module: check_mk Branch: master Commit: 117617cc7c423a3763ef5acf46a1f10dd3bf5f8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=117617cc7c423a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 13:56:32 2018 +0200 Fixed (probably harmless?) race condition. Change-Id: I886637fbcf2f6c628e71d7c4bdac4dd3bf62226e --- configure.ac | 2 +- livestatus/src/module.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5f9c9d1..6ff8253 100644 --- a/configure.ac +++ b/configure.ac @@ -168,7 +168,7 @@ AC_TYPE_UINT64_T AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT -AC_CHECK_FUNCS([memmove select socket strerror strtoul]) +AC_CHECK_FUNCS([accept4 memmove select socket strerror strtoul]) AC_ARG_WITH(nagios4,AC_HELP_STRING([--with-nagios4],[enabled compilation for nagios 4]), [ CPPFLAGS="${CFLAGS} -DNAGIOS4" diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 7f43f90..2ec373d 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -193,18 +193,24 @@ void *main_thread(void *data) { int retval = poller.poll(std::chrono::milliseconds(2500)); if (retval > 0 && poller.isFileDescriptorSet(g_unix_socket, PollEvents::in)) { +#if HAVE_ACCEPT4 + int cc = accept4(g_unix_socket, nullptr, nullptr, SOCK_CLOEXEC); +#else int cc = accept(g_unix_socket, nullptr, nullptr); +#endif if (cc == -1) { generic_error ge("cannot accept client connection"); Warning(fl_logger_livestatus) << ge; continue; } +#if !HAVE_ACCEPT4 if (fcntl(cc, F_SETFD, FD_CLOEXEC) == -1) { generic_error ge( "cannot set close-on-exec bit on client socket"); Alert(fl_logger_livestatus) << ge; break; } +#endif if (cc > g_max_fd_ever) { g_max_fd_ever = cc; }

6 years, 4 months

Tweaked clang-tidy configuration.

by Sven Panne

Module: check_mk Branch: master Commit: cb4d33c7b54c1c50039968c23f9ce47045dcd5da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb4d33c7b54c1c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 15:01:35 2018 +0200 Tweaked clang-tidy configuration. Change-Id: I821c26f46e2b34fe1689e66b788481fdf9b860c6 --- .clang-tidy | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 44a6a7d..7925f01 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -7,9 +7,12 @@ # * cppcoreguidelines-pro-bounds-constant-array-index ("do not use array subscript when the index is not an integer constant expression; use gsl::at() instead") # * cppcoreguidelines-pro-bounds-pointer-arithmetic ("do not use pointer arithmetic") # * google-runtime-int ("consider replacing 'unsigned long' with 'uint64'") +# * hicpp-no-array-decay ("do not implicitly decay an array into a pointer; consider using gsl::array_view or an explicit cast instead") # # * undesirable checks: # * cppcoreguidelines-pro-type-static-cast-downcast ("do not use static_cast to downcast from a base to a derived class; use dynamic_cast instead") +# * fuchsia-default-arguments ("calling a function that uses a default argument is disallowed") +# * fuchsia-overloaded-operator ("cannot overload 'operatorFOO'") # * google-runtime-references ("non-const reference parameter 'foo', make it const or use a pointer") # * hicpp-no-assembler ("do not use inline assembler in safety-critical code") triggered by ntohs/htons # * llvm-include-order ("#includes are not sorted properly") @@ -19,10 +22,13 @@ # * android-cloexec-open ("'open' should use O_CLOEXEC where possible") Ancient CentOS 5 doesn't have O_CLOEXEC # * cert-env33-c ("calling 'system' uses a command processor") # * cert-err34-c ("'atoi' used to convert a string to an integer value, but function will not report conversion errors; consider using 'strtol' instead") +# * cppcoreguidelines-owning-memory ("deleting a pointer through a type that is not marked 'gsl::owner<>'; consider using a smart pointer instead") We won't fix this for 1.5.0 # * cppcoreguidelines-pro-type-member-init ("uninitialized record type: 'foo'") # * cppcoreguidelines-pro-type-reinterpret-cast ("do not use reinterpret_cast") # * cppcoreguidelines-pro-type-vararg ("do not call c-style vararg functions") # * hicpp-member-init: alias for cppcoreguidelines-pro-type-member-init +# * hicpp-signed-bitwise ("use of a signed integer operand with a binary bitwise operator") +# * hicpp-vararg ("do not call c-style vararg functions") # * llvm-header-guard ("header guard does not follow preferred style") tricky to get right with the current bear/clang-tidy/symlink situation # # * desirable checks, but some places need to be suppressed: @@ -36,7 +42,7 @@ # * hicpp-special-member-functions # * modernize-use-default-member-init # -Checks: '*,-android-cloexec-fopen,-android-cloexec-open,-cert-env33-c,-cert-err34-c,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-google-runtime-references,-hicpp-member-init,-hicpp-no-assembler,-llvm-header-guard,-llvm-include-order,-modernize-use-bool-literals,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-modernize-use-default-member-init' +Checks: '*,-android-cloexec-fopen,-android-cloexec-open,-cert-env33-c,-cert-err34-c,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-fuchsia-default-arguments,-fuchsia-overloaded-operator,-google-runtime-int,-google-runtime-references,-hicpp-member-init,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-signed-bitwise,-hicpp-vararg,-llvm-header-guard,-llvm-include-order,-modernize-use-bool-literals,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-modernize-use-default-member-init' CheckOptions: - key: google-readability-namespace-comments.SpacesBeforeComments value: '1'

6 years, 4 months

6002 FIX cisco_asa_failover: If a failover occurs the check goes WARN as the related manpage describes.

by Simon Betz

Module: check_mk Branch: master Commit: ed6f1ca1e68049ebc84510d516e2c59c146e328e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed6f1ca1e68049… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 14:53:57 2018 +0200 6002 FIX cisco_asa_failover: If a failover occurs the check goes WARN as the related manpage describes. Change-Id: I65f4087ed90f5df51036dbcefddbc0b80e85841d --- .werks/6002 | 11 +++++++++++ checks/cisco_asa_failover | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6002 b/.werks/6002 new file mode 100644 index 0000000..762c38d --- /dev/null +++ b/.werks/6002 @@ -0,0 +1,11 @@ +Title: cisco_asa_failover: If a failover occurs the check goes WARN as the related manpage describes. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525783907 + + diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index 7b5f87a..5716555 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -41,7 +41,7 @@ factory_settings["cisco_asa_failover_default_levels"] = { "primary" : "active", "secondary" : "standby", - "failover_state" : 0, + "failover_state" : 1, }

6 years, 4 months

6001 FIX ps.include: Checks crashed if parameters ' Levels on CPU utilization of a single process' or ' Enable per-process details in long-output' are used

by Simon Betz

Module: check_mk Branch: master Commit: 44e966935ee10a4ab740269769b33c75d5ba0fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44e966935ee10a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 14:28:45 2018 +0200 6001 FIX ps.include: Checks crashed if parameters 'Levels on CPU utilization of a single process' or 'Enable per-process details in long-output' are used Change-Id: I0235b4645073f406d9d0db1830b3bfdece508eff --- .werks/6001 | 10 ++++++++++ checks/ps.include | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6001 b/.werks/6001 new file mode 100644 index 0000000..f0b584c --- /dev/null +++ b/.werks/6001 @@ -0,0 +1,10 @@ +Title: ps.include: Checks crashed if parameters 'Levels on CPU utilization of a single process' or 'Enable per-process details in long-output' are used +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525782403 +Class: fix + + diff --git a/checks/ps.include b/checks/ps.include index b30ca7d..4a5f40c 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -414,9 +414,9 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" kernel_perc = kernel_per_sec / 100000.0 / cpu_cores percent_cpu += user_perc + kernel_perc handle_count += handle_c - process.append([("cpu usage (user space)", (user_perc, "%")), - ("cpu usage (kernel space)", (kernel_perc, "%")), - ("pid", (pid, ""))]) + process.append(("cpu usage (user space)", (user_perc, "%"))) + process.append(("cpu usage (kernel space)", (kernel_perc, "%"))) + process.append(("pid", (pid, ""))) else: # process_info[3] contains the used CPU time and possibly, separated by /, also # the total elapsed time since the birth of the process.

6 years, 4 months

logwatch: compute pattern hash with hashlib

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 52fc4fa3cd0f328ac317a000a65c57f9a6e1ccdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52fc4fa3cd0f32… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue May 8 12:53:23 2018 +0200 logwatch: compute pattern hash with hashlib Change-Id: Ia1838c8a2693265594b9506abb07514a6f342fd2 --- checks/logwatch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index a54eb4c..e32dfe8 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -504,6 +504,7 @@ def logwatch_username(): def check_logwatch_generic(item, params, loglines, found, groups=False): + import hashlib logdir = logwatch_dir + "/" + host_name() # Create directories, if neccessary @@ -605,7 +606,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): except Exception, e: raise MKGeneralException("User %s cannot open file for writing: %s" % (logwatch_username(), e)) - pattern_hash = hash(repr(patterns)) + pattern_hash = hashlib.sha256(repr(patterns)).hexdigest() net_lines = 0 # parse cached log lines if log_exists: @@ -613,7 +614,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): # changed initline = logwatch_file.readline().rstrip('\n') if initline.startswith('[[[') and initline.endswith(']]]'): - old_pattern_hash = int(initline[3:-3]) + old_pattern_hash = initline[3:-3] skip_reclassification = old_pattern_hash == pattern_hash else: logwatch_file.seek(0) @@ -675,7 +676,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): if not skip_reclassification and collect_block.output_lines: logwatch_file.seek(0) logwatch_file.truncate() - logwatch_file.write("[[[%d]]]\n" % pattern_hash) + logwatch_file.write("[[[%s]]]\n" % pattern_hash) if collect_block.output_lines: logwatch_file.writelines(collect_block.output_lines)

6 years, 4 months

5805 FIX windows services: service discovery was unable to ignore disabled rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a4d44e5c47ba106d44aedade9f1bb50b4432613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a4d44e5c47ba1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 7 14:51:19 2018 +0200 5805 FIX windows services: service discovery was unable to ignore disabled rules Change-Id: I5bde4632291ee77c901b2b53f5eb07c9ac7d8afe --- .werks/5805 | 10 ++++++++++ checks/services | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/.werks/5805 b/.werks/5805 new file mode 100644 index 0000000..b3a29e4 --- /dev/null +++ b/.werks/5805 @@ -0,0 +1,10 @@ +Title: windows services: service discovery was unable to ignore disabled rules +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525697446 +Class: fix + + diff --git a/checks/services b/checks/services index 11e92be..cd85a65 100644 --- a/checks/services +++ b/checks/services @@ -118,6 +118,11 @@ def inventory_windows_services(info): # Filter WATO compatible rules by tags/hostlist rules = [] for rule in inventory_services_rules: + if len(rule) >= 4: + options = rule[3] + if options.get("disabled"): + continue + # 1. Get all rules matching the current host taglist, hostlist = rule[1:3] if not hosttags_match_taglist(tags_of_host(host_name()), taglist) \

6 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018