Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 9358e2e5ca9e46007b60f7158ac34917ffb3876d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9358e2e5ca9e46… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 09:05:13 2018 +0200 jar_signature: Fixed unused variables Change-Id: Ib28a570a2930d047f251fd27fa2e1968d8d6bc53 --- checks/jar_signature | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/jar_signature b/checks/jar_signature index 3f0fe48..999c94c 100644 --- a/checks/jar_signature +++ b/checks/jar_signature @@ -92,16 +92,19 @@ def check_jar_signature(item, _no_params, info): state = 0 if expired_since >= 0: - state = 2 status_text = "Certificate expired on %s (%s ago) " % (expiry_date_text, get_age_human_readable(expired_since)) + state = 2 + else: status_text = "Certificate will expire on %s (in %s)" % (expiry_date_text, get_age_human_readable(-expired_since)) if -expired_since <= crit: state = 2 - status_txt = "(less than %s)" % (get_age_human_readable(crit)) elif -expired_since <= warn: state = 1 - status_txt = "(less than %s)" % (get_age_human_readable(warn)) + if state: + status_text += " (warn/crit below %s/%s)" % ( + get_age_human_readable(warn), + get_age_human_readable(crit)) return state, status_text

6 years

Fixed broken views (pick issue in master)

by Lars Michelsen

Module: check_mk Branch: master Commit: c29e8f48059ab3e833bc2f6462deb5056456bb96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c29e8f48059ab3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 09:17:23 2018 +0200 Fixed broken views (pick issue in master) Change-Id: I2c4083ea6704c2339e4bbfb8e6122b303e0ecf48 --- cmk/gui/plugins/views/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index 3a69ad5..0ffaa96 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -364,7 +364,7 @@ def url_to_view(row, view_name): if display_options.disabled(display_options.I): return None - view = get_permitted_views(load_all_views()) + view = get_permitted_views(load_all_views()).get(view_name) if view: # Get the context type of the view to link to, then get the parameters of this # context type and try to construct the context from the data of the row

6 years

generictests: Fix mystical bug, and prevent silently not testing anything

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4ee56925af4c54de9f1881fca0cfede34ee793ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ee56925af4c54… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 5 15:14:44 2018 +0200 generictests: Fix mystical bug, and prevent silently not testing anything Change-Id: I830501eb52aad0216a0d6b69206ff9195de622d7 --- tests/unit/checks/generictests/checkhandler.py | 4 ++-- tests/unit/checks/generictests/run.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/unit/checks/generictests/checkhandler.py b/tests/unit/checks/generictests/checkhandler.py index 7eb4c93..03792c2 100644 --- a/tests/unit/checks/generictests/checkhandler.py +++ b/tests/unit/checks/generictests/checkhandler.py @@ -1,12 +1,12 @@ import cmk_base.config as config import cmk_base.check_api as check_api - +import copy class CheckHandler(object): """Collect the info on all checks""" def __init__(self): config.load_all_checks(check_api.get_check_api_context) - self.info = config.check_info + self.info = copy.deepcopy(config.check_info) self.cache = {} def get_applicables(self, checkname): diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 1fb24e4..eb6d44e 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -78,7 +78,6 @@ def parse(check_manager, dataset):# . If the .parsed attribute is present, it is compared to the result. """ print("parse: %r" % dataset.checkname) - info = getattr(dataset, 'info', None) parsed_expected = getattr(dataset, 'parsed', None) @@ -180,8 +179,10 @@ def check_listed_result(check, list_entry, info_arg, immu):# . def run(check_manager, dataset, write=False): """Run all possible tests on 'dataset'""" print("START: %r" % dataset) - immu = Immutables() + checklist = checkhandler.get_applicables(dataset.checkname) + assert checklist + immu = Immutables() # test the parse function parsed = parse(check_manager, dataset) immu.register(parsed, 'parsed') @@ -189,8 +190,9 @@ def run(check_manager, dataset, write=False): # get the expected check results, if present checks_expected = getattr(dataset, 'checks', {}) + # LOOP OVER ALL (SUB)CHECKS - for sname in checkhandler.get_applicables(dataset.checkname): + for sname in checklist: subcheck = (sname + '.').split('.')[1] check = check_manager.get_check(sname)

6 years

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 3c05d053402edcbfba9973d8544c0d0cef8ab66b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c05d053402edc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 08:59:50 2018 +0200 Reserved 20 Werk IDS Change-Id: I7831fee782889415e83211537050fea647ee344f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9af4a61..6eceed0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6589 +6609

6 years

dell_powerconnect_temp: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: eb63ef542df6d16859d745e6e3c1a2f9593b2cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb63ef542df6d1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 12 13:17:20 2018 +0200 dell_powerconnect_temp: Minor cleanup Change-Id: Ie087ec1c0b3a88bbb49b43cbc2c40e40d035cb4c --- checks/dell_powerconnect_temp | 54 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 6426e1c..b16f0b0 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -31,29 +31,61 @@ # Temperature is in Celcius by default. # Tested with Dell PowerConnect 5448 and 5424 models. + factory_settings["dell_powerconnect_temp_default_values"] = { "levels" : (35, 40), } + def inventory_dell_powerconnect_temp(checkname, info): for _temp, _state in info: return [("Ambient", {})] -def check_dell_powerconnect_temp(_no_item, params, info): - translate_status = { - '1' : (0, 'ok'), - '2' : (1, 'unavailable'), - '3' : (2, 'nonoperational'), - } - for temp, state in info: - return check_temperature(float(temp), params, "dell_powerconnect", - dev_status=translate_status[state][0], - dev_status_name=translate_status[state][1]) + +def parse_dell_powerconnect_temp(info): + try: + temp_str, dev_status = info[0] + except (IndexError, ValueError): + return None + try: + temp = float(temp_str) + except ValueError: + temp = None + return temp, {'1': 'OK', + '2': 'unavailable', + '3': 'non operational', + }.get(dev_status, "unknown[%s]" % dev_status) + + +def inventory_dell_powerconnect_temp(checkname, parsed): + if parsed: + return [("Ambient", {})] + + +def check_dell_powerconnect_temp(_no_item, params, parsed): + if parsed is None: + return + + temp, dev_state_readable = parsed + if dev_state_readable == "OK": + state = 0 + elif dev_state_readable == "unavailable": + state = 1 + elif dev_state_readable == "non operational": + state = 2 + else: + state = 3 + + if temp is None: + return state, "Status: %s" % dev_state_readable + return check_temperature(temp, params, "dell_powerconnect", + dev_status=state, dev_status_name=dev_state_readable) check_info["dell_powerconnect_temp"] = { - "inventory_function" : inventory_dell_powerconnect_temp, + "parse_function" : parse_dell_powerconnect_temp, "check_function" : check_dell_powerconnect_temp, + "inventory_function" : inventory_dell_powerconnect_temp, "service_description" : "Temperature %s", "default_levels_variable" : "dell_powerconnect_temp_default_values", "has_perfdata" : True,

6 years

Fix broken omd in daily build

by Lars Michelsen

Module: check_mk Branch: master Commit: fab385502453a3df473a878fbdeea791af104a35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab385502453a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 12 20:20:20 2018 +0200 Fix broken omd in daily build Change-Id: I66dedc260a5dee8627466764b0874282a0888d7f --- Makefile | 2 +- omd/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 114cdf4..8bd5f7d 100644 --- a/Makefile +++ b/Makefile @@ -288,13 +288,13 @@ version: if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi setversion: + $(MAKE) -C omd NEW_VERSION=$(NEW_VERSION) setversion sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" defines.make ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkbackup ; \ sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' cmk/__init__.py bin/mkbench bin/livedump; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion - $(MAKE) -C omd NEW_VERSION=$(NEW_VERSION) setversion $(MAKE) -C docker NEW_VERSION=$(NEW_VERSION) setversion ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise NEW_VERSION=$(NEW_VERSION) setversion diff --git a/omd/Makefile b/omd/Makefile index f5e52e7..e4204db 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -290,8 +290,8 @@ setversion: NEW_OMD_VERSION=$(NEW_VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) ; \ if [ -n "$$NEW_OMD_VERSION" ] && [ "$$NEW_OMD_VERSION" != "$(OMD_VERSION)" ]; then \ sed -ri 's/^(OMD_SERIAL[[:space:]]*= *).*/\1'"$(NEW_SERIAL)/" Makefile.omd ; \ - sed -ri 's/^(OMD_VERSION[[:space:]]*= *).*/\1"'"$$NEW_OMD_VERSION"'"/' packages/omd/omd ; \ - fi + fi ; \ + sed -ri 's/^(OMD_VERSION[[:space:]]*= *).*/\1"'"$$NEW_OMD_VERSION"'"/' packages/omd/omd test: t/test_all.sh

6 years

Minor fixes for recent docker stuff

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d3656242b048697ef318a433e7c9c6fe200d9bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d3656242b0486… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 12 19:49:05 2018 +0200 Minor fixes for recent docker stuff Change-Id: I4486f5b6bc0c6160db0af682b57806ab3c5b479d --- docker/Makefile | 18 ++++++++++-------- tests/Makefile | 1 + tests/docker/test_docker.py | 8 ++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 2817f89..39df048 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -32,12 +32,12 @@ SHELL := /bin/bash -e -o pipefail .PHONY: help setup setversion image image-daily clean test-lint-dockerfile test-lint-entrypoint help: - @echo "make setup - Prepare local (Ubuntu) system for building" - @echo "make image - Build container image for current edition, branch, version" - @echo "make image-daily - Build container image for current edition, branch, daily" - @echo "make clean - Cleanup docker images on current docker node" - @echo "make test-lint - Execute linter tests on docker specific files" - @echo "make test - Execute docker containerizing tests" + @echo "make setup - Prepare local (Ubuntu) system for building" + @echo "make image - Build container image for current edition, branch, version" + @echo "make image-daily - Build container image for current edition, branch, daily" + @echo "make clean - Cleanup docker images on current docker node" + @echo "make test-lint-dockerfile - Execute linter tests on docker specific files" + @echo "make test-lint-entrypoint - Execute linter tests on docker entrypoint script" setup: sudo apt-get install docker-ce @@ -86,5 +86,7 @@ test-lint-entrypoint: shellcheck $(SHELLCHECK_OUTPUT_ARGS) docker-entrypoint.sh clean: - -docker rmi $(DOCKER_REPO_NAME)/check-mk-enterprise:latest - -docker rmi $(DOCKER_REPO_NAME)/check-mk-enterprise:1.5.0p2 + -docker rmi $(DOCKER_REPO_NAME)/check-mk-enterprise:latest || true + -docker rmi $(DOCKER_REPO_NAME)/check-mk-enterprise:1.5.0p2 || true + [ -e needed-packages ] && rm needed-packages || true + ls check-mk-*-docker-*.tar.gz >/dev/null 2>&1 && rm check-mk-*-docker-*.tar.gz || true diff --git a/tests/Makefile b/tests/Makefile index 268bc33..d42dcaa 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,6 +16,7 @@ help: @echo "test-packaging - Run packaging tests" @echo "test-bandit - Run bandit (security) tests" @echo "test-shellcheck - Run shellcheck tests" + @echo "test-docker - Run docker tests" # This target needs to be phony so it is run every time because only the other # makefile can determine that there's nothing to be done. diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index f2a8ae7..b2ec081 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -28,6 +28,7 @@ import pytest import docker import os import time +import subprocess import testlib @@ -50,7 +51,14 @@ def _image_name(edition, version): return "docker-tests/check-mk-%s-%s-%s" % (edition, branch_name, version.version) +def _prepare_build(): + assert subprocess.Popen(["make", "needed-packages"], + stdout=open(os.devnull, "w"), cwd=build_path).wait() == 0 + + def _build(request, client, edition, version, add_args=None): + _prepare_build() + image, build_logs = client.images.build(path=build_path, tag=_image_name(edition, version), buildargs={ "CMK_VERSION": version.version, "CMK_EDITION": edition,

6 years

First version of official docker image

by Lars Michelsen

Module: check_mk Branch: master Commit: 0374d0f5fef25c7310b9799600f2c92bc92fdda8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0374d0f5fef25c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Sep 1 20:38:54 2018 +0200 First version of official docker image Notes on the changes so far: * The user manual draft (README.asciidoc) covers expected regular use cases and the specific features we provide with our container * The tests verify all the functionality described in the user manual draft * The Makefile is work in progress. It'll change during integration with the CI and release system. The image and image-daily targets don't produce files, they build the image in the local docker library. CMK-819 CMK-893 CMK-894 Change-Id: I25ec22fb3f0057bc55920ab84c243a1fb95b22b9 --- Makefile | 2 + Pipfile | 1 + Pipfile.lock | 173 ++++++++++++------------- docker/.gitignore | 2 + docker/Dockerfile | 87 +++++++++++++ docker/Makefile | 90 +++++++++++++ docker/README.asciidoc | 298 ++++++++++++++++++++++++++++++++++++++++++++ docker/docker-entrypoint.sh | 75 +++++++++++ tests/Makefile | 4 + tests/conftest.py | 3 + tests/docker/test_docker.py | 290 ++++++++++++++++++++++++++++++++++++++++++ tests/testlib/__init__.py | 27 ++-- 12 files changed, 949 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0374d0f5fe…

6 years

Fixed unused-variable warnings in checks/[bcd]*.

by Sven Panne

6 years

6466 FIX netgear_fans: Don't crash on empty info

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3d7d2760d2530d746173d48c94f884e751fedb6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7d2760d2530d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 12 13:27:28 2018 +0200 6466 FIX netgear_fans: Don't crash on empty info Change-Id: Ie40f2cb42954c88c0bf7e298f0f672f9de3372bf --- .werks/6466 | 11 +++++++++++ checks/netgear_fans | 23 ++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/6466 b/.werks/6466 new file mode 100644 index 0000000..f7a806f --- /dev/null +++ b/.werks/6466 @@ -0,0 +1,11 @@ +Title: netgear_fans: Don't crash on empty info +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536751625 + + diff --git a/checks/netgear_fans b/checks/netgear_fans index bf69dcd..62e540c 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -99,8 +99,11 @@ def netgear_map_state_txt_to_int(state_nr, version): def parse_netgear_fans(info): versioninfo, sensorinfo = info - parsed = { "__version__" : versioninfo[0][0], - "__fans__" : {}, } + if versioninfo == []: + parsed = { "__fans__" : {} } + else: + parsed = { "__version__" : versioninfo[0][0], + "__fans__" : {}, } for oid_end, sstate, reading_str in sensorinfo: parsed["__fans__"].setdefault("%s" % oid_end.replace(".", "/"), { "state" : sstate, @@ -118,13 +121,15 @@ def inventory_netgear_fans(parsed): def check_netgear_fans(item, params, parsed): - if item in parsed["__fans__"]: - data = parsed["__fans__"][item] - reading_str = data["reading_str"] - if reading_str != "Not Supported": - yield check_fan(int(data["reading_str"]), params) - state, state_readable = netgear_map_state_txt_to_int(data["state"], parsed["__version__"]) - yield state, "Status: %s" % state_readable + data = parsed["__fans__"].get(item) + if data is None: + return + + reading_str = data["reading_str"] + if reading_str != "Not Supported": + yield check_fan(int(data["reading_str"]), params) + state, state_readable = netgear_map_state_txt_to_int(data["state"], parsed.get("__version__", "")) + yield state, "Status: %s" % state_readable check_info['netgear_fans'] = {

6 years

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018