Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: fb3a3eed2c4c55c7e8b81a5be8e3bc4cae7df413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb3a3eed2c4c55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 08:40:46 2018 +0200 Reduce possible timing problems a bit Change-Id: I06003f86a545dded751385c06bf8aa53296179d2 --- tests/integration/notifications/test_simple_rbn.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/notifications/test_simple_rbn.py b/tests/integration/notifications/test_simple_rbn.py index 6546b75..44ee160 100644 --- a/tests/integration/notifications/test_simple_rbn.py +++ b/tests/integration/notifications/test_simple_rbn.py @@ -43,8 +43,8 @@ def test_simple_rbn_notification(test_config, site, core): site.send_host_check_result("notify-test", 1, "FAKE DOWN", expected_state=1) # Now check for appearing log lines - one after the other - l.check_logged("Got raw notification (notify-test)") - l.check_logged("notifying hh via mail") - l.check_logged("Creating spoolfile:") - l.check_logged("(notify-test) for local delivery") - l.check_logged("Output: Spooled mail to local mail transmission agent") + l.check_logged("Got raw notification (notify-test)", timeout=20) + l.check_logged("notifying hh via mail", timeout=20) + l.check_logged("Creating spoolfile:", timeout=20) + l.check_logged("(notify-test) for local delivery", timeout=20) + l.check_logged("Output: Spooled mail to local mail transmission agent", timeout=20)

6 years, 4 months

Test that some often used perl modules are available

by Lars Michelsen

Module: check_mk Branch: master Commit: 6177d1238b86c87307075810eaea36661969856e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6177d1238b86c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 08:24:05 2018 +0200 Test that some often used perl modules are available Change-Id: I4160130704ff8d6749dd8ff8666427eea900821f --- tests/integration/omd/test_perl.py | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/integration/omd/test_perl.py b/tests/integration/omd/test_perl.py new file mode 100644 index 0000000..4d5da07 --- /dev/null +++ b/tests/integration/omd/test_perl.py @@ -0,0 +1,47 @@ + +def test_perl_modules(site): + # TODO: Complete this list + test_modules = [ + "Getopt::Long", + "File::stat", + "File::Find", + "File::Path", + "Net::SNMP", + "SNMP", + "Nagios::Plugin", + "Test::Simple", + "Try::Tiny", + "Params::Validate", + "Module::Runtime", + "Module::Metadata", + "Module::Implementation", + "Module::Build", + "Math::Calc::Units", + "Config::Tiny", + "Class::Accessor", + + # Webinject + "Carp", + "LWP", + "URI", + "HTTP::Request::Common", + "HTTP::Cookies", + "XML::Simple", + "Time::HiRes", + "Crypt::SSLeay", + "XML::Parser", + "Data::Dumper", + "File::Temp", + + # Check_oracle_health + "File::Basename", + "IO::File", + "File::Copy", + "Sys::Hostname", + "Data::Dumper", + "Net::Ping", + ] + + for module in test_modules: + p = site.execute(["perl", "-e", "use %s" % module]) + assert p.wait() == 0, "Failed to load module: %s" % module

6 years, 4 months

Added YAPF formatting.

by Sven Panne

Module: check_mk Branch: master Commit: 253b9fbba5612af85e3aec2708463aa4d4eabf8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=253b9fbba5612a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 29 15:19:20 2018 +0200 Added YAPF formatting. Change-Id: I499d72fb2f51c2082f296cf9d64ec017c06694cc --- .style.yapf | 5 +++++ tests/static/Makefile | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.style.yapf b/.style.yapf new file mode 100644 index 0000000..1584e60 --- /dev/null +++ b/.style.yapf @@ -0,0 +1,5 @@ +[style] +based_on_style=google +blank_line_before_nested_class_or_def=False +column_limit=100 +indent_dictionary_value=True diff --git a/tests/static/Makefile b/tests/static/Makefile index 83415ee..479ee2a 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -2,12 +2,18 @@ FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py set MYPYPATH := $(realpath typeshed) PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv -.PHONY: sanitize format-autopep8 test-mypy test-pylint +.PHONY: sanitize format format-autopep8 format-yapf test-mypy test-pylint -sanitize: format-autopep8 test-mypy test-pylint +sanitize: format test-mypy test-pylint +format: format-yapf + +# A bit ugly and sometimes breaks things, but let's keep it for comparison. format-autopep8: .venv - $(PIPENV) run autopep8 -i $(FILES_TO_CHECK) + $(PIPENV) run autopep8 -i $(FILES_TO_CHECK) + +format-yapf: .venv + $(PIPENV) run yapf -i $(FILES_TO_CHECK) test-mypy: .venv MYPYPATH="$(MYPYPATH)" $(PIPENV) run mypy --py2 --follow-imports=silent --strict-optional $(FILES_TO_CHECK) @@ -31,4 +37,4 @@ Pipfile.lock: Pipfile touch .venv clean: - rm -rf .venv + rm -rf .mypy_cache .venv

6 years, 4 months

YAPFed a few files as a trial balloon.

by Sven Panne

Module: check_mk Branch: master Commit: d9c67752a5e5d1bf3c2260283685a70cd02903ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9c67752a5e5d1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 29 16:28:12 2018 +0200 YAPFed a few files as a trial balloon. Change-Id: Iea98d1f57cc95f2064e5c63c6a49edff5c8825b9 --- cmk/ec/defaults.py | 77 ++++++++++++--------- cmk/ec/export.py | 29 +++----- cmk/ec/settings.py | 194 ++++++++++++++++++++++++++++------------------------- 3 files changed, 156 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d9c67752a5…

6 years, 4 months

5806 FIX Periodic service discovery: Fixed scenario where process could get stuck

by Andreas Boesl

Module: check_mk Branch: master Commit: cb28971fc4a5d0efd4507f0bdd5b96fcef98f7bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb28971fc4a5d0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 8 11:21:17 2018 +0200 5806 FIX Periodic service discovery: Fixed scenario where process could get stuck The process discovery (cmk --discover-marked-hosts) triggered by the cronjob had no timeout handling implemented. The python process could get stuck if the connection to the remote host was never closed. This could consume lots of memory over time, since the discovery process is triggered every 5 minutes. Change-Id: I348a85821c316f1ed99b229190597f61ec8b9bc1 --- .werks/5806 | 14 ++++ cmk_base/discovery.py | 228 +++++++++++++++++++++++++++++--------------------- 2 files changed, 148 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb28971fc4…

6 years, 4 months

Remove "<<<check_mk>>>" section from special agent. The section is reserved for cmk-agents.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5e86398f92c00b42f9021af9f267034600392d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e86398f92c00b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue May 22 15:21:27 2018 +0200 Remove "<<<check_mk>>>" section from special agent. The section is reserved for cmk-agents. Change-Id: I69a411611c86c5bb619ec590980b941ade5e49eb --- agents/special/agent_hivemanager | 4 ---- 1 file changed, 4 deletions(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index 86b228a..1855597 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -47,10 +47,6 @@ def get_url(address): print e sys.exit(2) -print "<<<check_mk>>>" -print "Version: 1.2.5" -print "AgentOS: Hivemanager" - print "<<<hivemanager_devices:sep(124)>>>" address = "https://%s/hm/api/v1/devices" % ip informations = ['hostName', 'clients', 'alarm', 'connection', 'upTime',

6 years, 4 months

Remove "<<<check_mk>>>" section from special agent. The section is reserved for cmk-agents.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1adc221f59059a0b192dec18ede9518a3e85eeb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1adc221f59059a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue May 22 15:26:58 2018 +0200 Remove "<<<check_mk>>>" section from special agent. The section is reserved for cmk-agents. Change-Id: Ibdc722591b1c88551372b055b754780038652452 --- agents/special/agent_hivemanager_ng | 3 --- 1 file changed, 3 deletions(-) diff --git a/agents/special/agent_hivemanager_ng b/agents/special/agent_hivemanager_ng index 4d8754c..b668537 100755 --- a/agents/special/agent_hivemanager_ng +++ b/agents/special/agent_hivemanager_ng @@ -62,9 +62,6 @@ def parse_args(): def main(): args = parse_args() - print("<<<check_mk>>>") - print("Version: 1.4.0") - print("AgentOS: Aerohive HiveManagerNG") print("<<<hivemanager_ng_devices:sep(124)>>>") address = "%s/xapi/v1/monitor/devices" % args.url

6 years, 4 months

Count the SSL/VPN connections for " F5 BIG-IP Access Policy Manager SSL VPN and access gateway"

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4d7c0b5f038773ed40b159758820cae3e364b8e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d7c0b5f038773… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue May 22 08:22:10 2018 +0200 Count the SSL/VPN connections for "F5 BIG-IP Access Policy Manager SSL VPN and access gateway" Change-Id: Iefa3296f63c8269ec2df13ad7a71a7e6eca8a458 --- checkman/f5_bigip_apm | 13 +++++++++++ checks/f5_bigip_apm | 52 +++++++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 6 +++++ 3 files changed, 71 insertions(+) diff --git a/checkman/f5_bigip_apm b/checkman/f5_bigip_apm new file mode 100644 index 0000000..ddc4d2b --- /dev/null +++ b/checkman/f5_bigip_apm @@ -0,0 +1,13 @@ +title: F5 Big-IP: number of current SSL/VPN connections +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 Big-IP loadbalancers + for the total number of current SSL/VPN connections + {ampGlobalConnectivityStatCurConns}. + +inventory: + One service is created. + diff --git a/checks/f5_bigip_apm b/checks/f5_bigip_apm new file mode 100644 index 0000000..5ea3e23 --- /dev/null +++ b/checks/f5_bigip_apm @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + + +def inventory_f5_bigip_apm(info): + discovered = [] + if info[0][0]: + discovered.append((None, None)) + return discovered + + +def check_f5_bigip_apm(item, _no_params, info): + count = info[0][0] + perfdata = [('connections_ssl_vpn', int(count), '', '', 0, '')] + return 0, 'Connections: %s' % count, perfdata + + +check_info['f5_bigip_apm'] = { + 'inventory_function' : inventory_f5_bigip_apm, + 'check_function' : check_f5_bigip_apm, + 'service_description' : 'SSL/VPN Connections', + 'snmp_info' : ('.1.3.6.1.4.1.3375.2.6.1.5.3', [ + '0', # F5-BIGIP-AMP-MIB::apmGlobalConnectivityStatCurConns + ]), + 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in \ + oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in \ + oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), + 'has_perfdata' : True, +} diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fe2054f..1f2462a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1510,6 +1510,12 @@ metric_info["connections_ssl"] = { "color" : "13/a", } +metric_info["connections_ssl_vpn"] = { + "title" : _("SSL/VPN connections"), + "unit" : "count", + "color" : "13/a", +} + metric_info["connections_async_writing"] = { "title" : _("Asynchronous writing connections"), "unit" : "count",

6 years, 4 months

Moved static checks to a separate directory. Use pipenv for isolation.

by Sven Panne

Module: check_mk Branch: master Commit: d170b323b7b0b69a8c7a0768da97d8b2a88cb9db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d170b323b7b0b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 29 12:50:03 2018 +0200 Moved static checks to a separate directory. Use pipenv for isolation. Change-Id: Ie83fcfd6506b9d4190c830ee8ff84b581221d9a4 --- tests/.gitignore | 1 - tests/Makefile | 37 ++------ tests/static/.gitignore | 1 + tests/static/Makefile | 34 +++++++ tests/static/Pipfile | 15 +++ tests/static/Pipfile.lock | 152 +++++++++++++++++++++++++++++++ tests/{ => static}/typeshed/pathlib2.pyi | 0 7 files changed, 210 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d170b323b7…

6 years, 4 months

Remove '<<<check_mk>>>' section from agent output. The corresponding information is not lost, as it appears in '<<<emcvnx_info>>>'.

by Moritz Kiemer

Module: check_mk Branch: master Commit: cdfcfcb5bf713a6c8784f3129256672b65a7b643 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdfcfcb5bf713a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed May 23 10:15:35 2018 +0200 Remove '<<<check_mk>>>' section from agent output. The corresponding information is not lost, as it appears in '<<<emcvnx_info>>>'. Change-Id: I1289cde09cdcfd3f2f95e7590e62de1b5cfd5e75 --- agents/special/agent_emcvnx | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 8f631f7..8f63ef1 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -195,21 +195,6 @@ if cmdout: "credentials if you don't have a security file.\n") sys.exit(1) -# Try to gather the version of the agent -emcvnx_version = None -for line in cmdout: - tokens = re.split("\s+", line) - if tokens[0] == "Agent" and tokens[1] == "Rev:": - emcvnx_version = "_".join(tokens[2:]) - -print "<<<check_mk>>>" -print "Version: %s" % emcvnx_version - -# maybe we could fill AgentOS: by reading "Model:" line of naviseccli output -# in section "Agent/Host Information", but need a call of naviseccli with an -# other commandline argument -#print "AgentOS: %s " % emcvnx_model - print "<<<emcvnx_info:sep(58)>>>" for line in cmdout: print line

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018