Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Sergey Kipnis

Module: check_mk Branch: master Commit: 5ef40cccad0da9be0d9629ccb56b8dce10b0e648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef40cccad0da9… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Oct 25 09:45:13 2018 +0200 Warnings off with cast Correct function pointer declaration Correct support for MS VC with WINAPI and WINBOOL Warnings off Specific Visual Support with WINAPI and WINBOOL Correction of function pointer declaration clang-formatted, static_cast used Change-Id: I61da5f739d44fb7c80ef5119d674dd148268cfe9 --- agents/windows/CrashHandler.h | 4 ++++ agents/windows/Crypto.cc | 20 +++++++++++--------- agents/windows/EventLogVista.cc | 24 ++++++++++++++---------- agents/windows/RotatingFileHandler.cc | 2 +- agents/windows/WinApi.cc | 9 +++++++-- agents/windows/WinApiInterface.h | 3 +++ agents/windows/sections/SectionPluginGroup.h | 4 ++++ agents/windows/sections/SectionUptime.h | 2 +- agents/windows/types.cc | 2 +- agents/windows/types.h | 2 +- 10 files changed, 47 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5ef40cccad…

5 years, 11 months

BI aggregation groups: Cleanup tree representation

by Simon Betz

Module: check_mk Branch: master Commit: 7a6b7010b5f700ae995c6d77067495d14cd02b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a6b7010b5f700… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 25 16:45:37 2018 +0200 BI aggregation groups: Cleanup tree representation Change-Id: Ib12995834d7de0997d24a7e5a2c5b36005079807 --- cmk/gui/bi.py | 47 ++++++++++---------------------------- cmk/gui/plugins/sidebar/bi.py | 21 +++++++++-------- cmk/gui/plugins/visuals/filters.py | 6 ++--- cmk/gui/plugins/wato/bi.py | 32 +++++++------------------- 4 files changed, 34 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7a6b7010b5…

5 years, 11 months

removed some incorrect/obsolete comments

by Andreas Boesl

Module: check_mk Branch: master Commit: c3c1ece759229d57fe3ab1fcbe746617bf274514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c1ece759229d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 26 12:53:49 2018 +0200 removed some incorrect/obsolete comments Change-Id: Ie80dc7f4336c2e818dd63e9694058ec2eb91ba02 --- cmk/gui/bi.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index cc1d23f..3395341 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -259,7 +259,6 @@ def get_aggregation_group_trees(): # aggregation group definitions: # - "GROUP" # - ["GROUP_1", "GROUP2", ..] - # - [["GROUP1"], ["PATH", "TO", "GROUP2"]] migrate_bi_configuration() # convert bi_packs into legacy variables groups = [] for aggr_def in config.aggregations + config.host_aggregations: @@ -3644,7 +3643,6 @@ def migrate_bi_configuration(): def _convert_aggregation(aggr_tuple): - # Convert group string or list of group string to list of list of group strings O.o old_groups = aggr_tuple[1] updated_groups = [] if isinstance(old_groups, list):

5 years, 11 months

fortigate_ipsecvpn: Improved long output

by Simon Betz

Module: check_mk Branch: master Commit: 69ca55ff603c0007833113bcbef7035c7d76bfa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69ca55ff603c00… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 24 11:37:37 2018 +0200 fortigate_ipsecvpn: Improved long output Change-Id: Ie0da5348ff3c2c123d056eae945b4ced7cae0a83 --- checks/fortigate_ipsecvpn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index 2be2bee..7c7e51f 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -72,8 +72,9 @@ def check_fortigate_ipsecvpn(item, params, info): long_output = [] for title, tunnels in [ - ("Down", tunnels_down), - ("Ignored", tunnels_ignored), + ("Down and not ignored", set(tunnels_down) - set(tunnels_ignored)), + ("Down", tunnels_down), + ("Ignored", tunnels_ignored), ]: if tunnels: long_output.append("%s:" % title)

5 years, 11 months

azure: YAPF and use fancy new api functions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 528ddcde801c3b0e29ff8876d553f38d64b48916 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=528ddcde801c3b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 25 13:51:11 2018 +0200 azure: YAPF and use fancy new api functions Change-Id: I1a161cdfbd33e721c362d891d3185c03cb08304b --- checks/azure.include | 93 +++++++++++++++----------------- checks/azure_agent_info | 14 +++-- checks/azure_databases | 141 +++++++++++++++++++++++++----------------------- checks/azure_sites | 37 ++++++------- 4 files changed, 139 insertions(+), 146 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=528ddcde80…

5 years, 11 months

Spelling fix

by Konstantin Büttner

Module: check_mk Branch: master Commit: 72152756a4bb82d4f553a85b18ee735bfc6c61b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72152756a4bb82… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 26 09:24:38 2018 +0200 Spelling fix Change-Id: Ic2e3fc08e7a4104f759d13adad4f82645b609944 --- checks/ps.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ps.include b/checks/ps.include index c3a11a0..cf48fb3 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -465,7 +465,7 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" perfdata = [ ("count", count, okmax+1, warnmax+1, 0) ] if count == 0 and not extended_perfdata: # No matching process found. Therefore we don't know yet, - # wether the agents sends extended data for processes. + # whether the agents sends extended data for processes. # We need to know this in order to create the RRD with the # correct number of DSes. To just look at the first process # in the agent output to make sure. We assume that at least

5 years, 11 months

Minor formatting fix

by Konstantin Büttner

Module: check_mk Branch: master Commit: eced0f1a98ea7e4fa053cfc505c1e1e6e2427065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eced0f1a98ea7e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 26 09:06:22 2018 +0200 Minor formatting fix Change-Id: I0437154de57e66bc1f81288653bc2deb8f32d732 --- checks/bluecat_ntp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/bluecat_ntp b/checks/bluecat_ntp index 3728d86..15c5143 100644 --- a/checks/bluecat_ntp +++ b/checks/bluecat_ntp @@ -32,10 +32,12 @@ factory_settings["bluecat_ntp"] = { "stratum" : ( 8, 10 ), } + def inventory_bluecat_ntp(info): if len(info) > 0 and info[0][0] != 'NULL': return [(None, None)] + def check_bluecat_ntp(item, params, info): oper_state, sys_leap, stratum = map(int, info[0]) oper_states = { @@ -75,6 +77,7 @@ def check_bluecat_ntp(item, params, info): state = 1 yield state, "Stratum: %s" % stratum + check_info["bluecat_ntp"] = { "check_function" : check_bluecat_ntp, "inventory_function" : inventory_bluecat_ntp,

5 years, 11 months

Fix discover API, use without parameters

by Óscar Nájera

Module: check_mk Branch: master Commit: 1bd2ad913d2e4e1f465fe4b737e9f362424951a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bd2ad913d2e4e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 25 14:48:50 2018 +0200 Fix discover API, use without parameters Change-Id: Ie96513d91a3790fd17e22d06e9ed1bd035312891 --- cmk_base/check_api.py | 3 +++ tests/unit/cmk_base/test_check_api.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index a24215a..da68a34 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -642,6 +642,9 @@ def discover(selector=None, default_params=None): if callable(selector): return _discovery(selector) + if selector is None and default_params is None: + return _discovery(lambda *args: args[0]) + return _discovery diff --git a/tests/unit/cmk_base/test_check_api.py b/tests/unit/cmk_base/test_check_api.py index 534314b..b8eac78 100644 --- a/tests/unit/cmk_base/test_check_api.py +++ b/tests/unit/cmk_base/test_check_api.py @@ -56,6 +56,10 @@ def test_discover_single(parsed, result): ({ "one": None, "two": None, + }, None, [("one", {}), ("two", {})]), + ({ + "one": None, + "two": None, }, lambda k, v: k, [("one", {}), ("two", {})]), ({ "one": None,

5 years, 11 months

Fixed wrong Htpasswd() call

by Lars Michelsen

Module: check_mk Branch: master Commit: 827f219f2afe91524c0a055037805200dba49900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=827f219f2afe91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 17:24:29 2018 +0200 Fixed wrong Htpasswd() call Change-Id: If4c0ce24c21dbf87de351cdde14bbffe144119fd --- cmk/gui/userdb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 3cdb7c8..6ea6d14 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -30,6 +30,7 @@ import time import os import traceback import copy +import pathlib2 as pathlib import cmk.utils import cmk.paths @@ -241,7 +242,7 @@ def user_exists(username): if _user_exists_according_to_profile(username): return True - return Htpasswd(cmk.paths.htpasswd_file).exists(username) + return Htpasswd(pathlib.Path(cmk.paths.htpasswd_file)).exists(username) def _user_exists_according_to_profile(username):

5 years, 11 months

fixed werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: a771082615114284ed4c5788220433c7487fa1fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7710826151142… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 25 13:13:11 2018 +0200 fixed werk text Change-Id: I42b4a2ca207db94a8da272f07a564f366f60df53 --- .werks/4026 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4026 b/.werks/4026 index a4928bb..4efe220 100644 --- a/.werks/4026 +++ b/.werks/4026 @@ -6,7 +6,7 @@ Version: 1.5.0i1 Date: 1487595108 Class: feature -The mk_logwatch plugin is no longer restricted to windows. +The mk_logwatch plugin is no longer restricted to linux. It now runs as a frozen python binary under windows, which requires no extra python installation. The plugin reads its configuration from the config/logwatch.cfg file.

5 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018