Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

Added set_cmdline() to set the command of processes (e.g. for ps/top)

by Lars Michelsen

Module: check_mk Branch: master Commit: ad719958eafc999170d6d517ffaf2887f4adcce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad719958eafc99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 27 09:40:22 2017 +0200 Added set_cmdline() to set the command of processes (e.g. for ps/top) Change-Id: I6dc4c048f46c6c06d8b1fb60100b156a22f1a71f --- lib/daemon.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/daemon.py b/lib/daemon.py index 4127c5f..79ea505 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -28,6 +28,8 @@ import os import sys from pwd import getpwnam from grp import getgrnam +import ctypes +import ctypes.util def daemonize(user=0, group=0): @@ -74,3 +76,25 @@ def daemonize(user=0, group=0): os.dup2(so, 2) os.close(si) os.close(so) + + +def set_cmdline(cmdline): + """ + Change the process name and process command line on of the running process + This works at least with Python 2.x on Linux + """ + libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c')) + + argv = ctypes.POINTER(ctypes.c_char_p)() + argc = ctypes.c_int() + ctypes.pythonapi.Py_GetArgcArgv(ctypes.byref(argc), ctypes.byref(argv)) + cmdlen = sum([len(argv[i]) for i in range(argc.value)]) + argc.value + new_cmdline = ctypes.c_char_p(cmdline.ljust(cmdlen, '\0')) + + # replace the command line, which is available via /proc/<pid>/cmdline. + # This is .e.g used by ps + libc.memcpy(argv.contents, new_cmdline, cmdlen) + + # replace the prctl name, which is available via /proc/<pid>/status. + # This is for example used by top and killall + libc.prctl(15, new_cmdline, 0, 0, 0)

7 years

Fixed load test

by Lars Michelsen

Module: check_mk Branch: master Commit: baf44cc0e415a8389c513fe0051c53aa52b15524 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baf44cc0e415a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 23 07:57:23 2017 +0200 Fixed load test Change-Id: Ibe4996ea63739e73607e9eb67a29a633fe256255 --- tests/livestatus/test_liveproxyd.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 043330d..565f736 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -173,14 +173,18 @@ def test_large_number_of_sites(default_cfg, site): site.execute(["cmk", "-O"]) _change_liveproxyd_sites(site, liveproxyd_sites) - live = livestatus.MultiSiteConnection(livestatus_api_sites) - assert live.dead_sites() == {} print livestatus_api_sites.keys() def _num_connections_opened(): + # Need to reconstruct the object on each call because connect is + # currently done in constructor :-/ + live = livestatus.MultiSiteConnection(livestatus_api_sites) + assert live.dead_sites() == {} + live.set_prepend_site(True) rows = live.query("GET status\nColumns: program_version\n") live.set_prepend_site(False) + assert type(rows) == list print [ r[0] for r in rows ] return len(rows) @@ -196,6 +200,5 @@ def test_large_number_of_sites(default_cfg, site): "Liveproxyd sockets not opened after 60 seconds" finally: - #_use_liveproxyd_for_local_site(site, proto="unix") - #site.delete_file("etc/check_mk/conf.d/liveproxyd-test.mk") - pass + _use_liveproxyd_for_local_site(site, proto="unix") + site.delete_file("etc/check_mk/conf.d/liveproxyd-test.mk")

7 years

Centralized standard log formater in cmk.log

by Lars Michelsen

Module: check_mk Branch: master Commit: cda2feb8e5a3f7e0d517a92acb4473230992d4b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cda2feb8e5a3f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 18:04:45 2017 +0200 Centralized standard log formater in cmk.log Change-Id: If5ad46f563025a460d66ed5e26bf91341b3ac49c --- lib/log.py | 6 ++++++ web/htdocs/log.py | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/log.py b/lib/log.py index 3fabfb3..ec3c961 100644 --- a/lib/log.py +++ b/lib/log.py @@ -80,6 +80,12 @@ def get_logger(name): return logger.getChild(name) +def get_formatter(): + """Returns a new message formater instance that uses the standard + Check_MK log format""" + return _logging.Formatter("%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s") + + def setup_console_logging(): """This method enables all log messages to be written to the console without any additional information like date/time, logger-name. Just diff --git a/web/htdocs/log.py b/web/htdocs/log.py index d9d8f76..a7cc0b2 100644 --- a/web/htdocs/log.py +++ b/web/htdocs/log.py @@ -25,9 +25,10 @@ # Boston, MA 02110-1301 USA. import logging as _logging +import cmk.log import cmk.paths -logger = _logging.getLogger("cmk.web") +logger = cmk.log.get_logger("web") def init_logging(): _setup_web_log_logging() @@ -37,9 +38,7 @@ def _setup_web_log_logging(): handler = _logging.FileHandler("%s/web.log" % cmk.paths.log_dir, encoding="UTF-8") - formatter = _logging.Formatter("%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s") - handler.setFormatter(formatter) - + handler.setFormatter(cmk.log.get_formatter()) logger.addHandler(handler)

7 years

Improved standard logging methods

by Lars Michelsen

Module: check_mk Branch: master Commit: aedd1c6d5d0954b8c401e7f11e2b3b3a22618a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aedd1c6d5d0954… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 26 11:44:51 2017 +0200 Improved standard logging methods Change-Id: I942bb3ddb95f3b50b963600a0e4b66bf0165b04e --- lib/log.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/log.py b/lib/log.py index ec3c961..a14a291 100644 --- a/lib/log.py +++ b/lib/log.py @@ -80,10 +80,11 @@ def get_logger(name): return logger.getChild(name) -def get_formatter(): +def get_formatter(format="%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s"): """Returns a new message formater instance that uses the standard - Check_MK log format""" - return _logging.Formatter("%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s") + Check_MK log format by default. You can also set another format + if you like.""" + return _logging.Formatter(format) def setup_console_logging(): @@ -123,25 +124,27 @@ def set_verbosity(verbosity): raise NotImplementedError() -# TODO: Experimental. Not yet used. class LogMixin(object): """Inherit from this class to provide logging support. Makes a logger available via "self.logger" for objects and "self.cls_logger" for the class. """ - _logger = None - _cls_logger = None + _parent_logger = None + _logger = None + _cls_logger = None @property def logger(self): if not self._logger: - self._logger = _logging.getLogger('.'.join([__name__, self.__class__.__name__])) + parent = self._parent_logger or logger + self._logger = parent.getChild('.'.join([self.__class__.__name__])) return self._logger @classmethod def cls_logger(cls): if not cls._cls_logger: - cls._cls_logger = _logging.getLogger('.'.join([__name__, cls.__name__])) + parent = self._parent_logger or logger + cls._cls_logger = parent.getChild('.'.join([cls.__name__])) return cls._cls_logger

7 years

Improved tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 43ce9db54ba5698be52b1498c1f54b39b988ad39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43ce9db54ba569… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 23 14:44:21 2017 +0200 Improved tests Change-Id: Ifcd0480a7602f6a207e0b0f84fe14252b1352af3 --- livestatus/api/python/livestatus.py | 3 --- pytest.ini | 2 ++ tests/livestatus/test_liveproxyd.py | 22 ++++++++++++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 9cdfacf..5df2c38 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -179,10 +179,7 @@ class Helpers: # TODO: Add more functionality to the Query class: # - set_prepend_site # - set_only_sites -# - set_limit -# - set_auth_user # - set_auth_domain -# - set_timeout # All these are mostly set for a single query and reset back to another # value after the query. But nearly all of these usages does not care # about resetting the option in case of an exception. This could be diff --git a/pytest.ini b/pytest.ini index 1c3715b..253a1d9 100644 --- a/pytest.ini +++ b/pytest.ini @@ -10,3 +10,5 @@ markers = packaging: This is a test to execute to verify the packaging of the testbuilds. gui_crawl: All linked pages of the Web interface are visited and searched for errors html_gentest: Generate test cases for htmllib refactoring. +filterwarnings = + ignore::ImportWarning diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 565f736..4ab3503 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -2,7 +2,6 @@ import os import time -import livestatus import pytest from testlib import web @@ -88,6 +87,8 @@ def test_omd_toggle(default_cfg, site, use_liveproxyd): @pytest.mark.parametrize(("proto"), [ "unix", "tcp" ]) def test_simple_query(default_cfg, site, proto): + import livestatus + if proto == "tcp": site.open_livestatus_tcp() @@ -124,15 +125,26 @@ def test_simple_query(default_cfg, site, proto): def test_large_number_of_sites(default_cfg, site): + import livestatus + _toggle_liveproxyd(site, use_liveproxyd=True) - site_sockets, num_sites, num_channels = {}, 100, 5 + # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits + exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() + assert exit_code == 0 + + site_sockets, num_sites, num_channels = {}, 400, 3 for site_num in range(num_sites): # Currently connect to local site site_id = "site%03d" % site_num + if site_num % 2 == 0: + to_livestatus = None + else: + to_livestatus = ('127.0.0.1', 6999) + site_sockets[site_id] = { - "to_livestatus" : None, + "to_livestatus" : to_livestatus, "to_proxy" : "unix:%s/tmp/run/liveproxy/%s" % (site.root, site_id), } @@ -174,7 +186,6 @@ def test_large_number_of_sites(default_cfg, site): _change_liveproxyd_sites(site, liveproxyd_sites) - print livestatus_api_sites.keys() def _num_connections_opened(): # Need to reconstruct the object on each call because connect is # currently done in constructor :-/ @@ -186,12 +197,11 @@ def test_large_number_of_sites(default_cfg, site): live.set_prepend_site(False) assert type(rows) == list - print [ r[0] for r in rows ] return len(rows) # Wait up to 30 seconds for all connections to be established. When opening so # many connections to one cmc at the time some connects may fail temporarily - timeout = time.time() + 60 + timeout = time.time() + 90 while timeout > time.time() and _num_connections_opened() != len(livestatus_api_sites): time.sleep(0.5)

7 years

Enforce to use pylint 1.6.4 at the moment (new 1.7.1 has some issues)

by Lars Michelsen

Module: check_mk Branch: master Commit: cc65e8d1660b004a035175d1843dd3e05c46ac7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc65e8d1660b00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 23 08:15:34 2017 +0200 Enforce to use pylint 1.6.4 at the moment (new 1.7.1 has some issues) Change-Id: Ib518e6fa3f282a5322f8d39964c867c775801402 --- tests/pylint/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/Makefile b/tests/pylint/Makefile index ba226bf..fcedd33 100644 --- a/tests/pylint/Makefile +++ b/tests/pylint/Makefile @@ -2,6 +2,6 @@ help: @echo "see make in tests/ directory" setup: - sudo pip install --upgrade pylint + sudo pip install --upgrade pylint==1.6.4 sudo apt-get install \ enchant

7 years

4898 Liveproxy daemon: Log level can now be configuration via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 83bd74932c416c770b6576244def911bdad1dc55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bd74932c416c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 18:12:38 2017 +0200 4898 Liveproxy daemon: Log level can now be configuration via WATO Change-Id: I66356a82d61e9ffabb946b95c1944211884fd178 --- .werks/4898 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4898 b/.werks/4898 new file mode 100644 index 0000000..e664e2b --- /dev/null +++ b/.werks/4898 @@ -0,0 +1,10 @@ +Title: Liveproxy daemon: Log level can now be configuration via WATO +Level: 1 +Component: liveproxy +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1498147944 +Class: feature + +

7 years

tests: suppress dd stderr when writing a file

by Lars Michelsen

Module: check_mk Branch: master Commit: fe81ac1433910e3e7d058bdd162b63e9e850cabc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe81ac1433910e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 18:20:40 2017 +0200 tests: suppress dd stderr when writing a file Change-Id: I7dcfda998335a15fd40ad0d6d622164ed3e864df --- tests/livestatus/test_liveproxyd.py | 1 - tests/testlib/__init__.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 8ce6584..043330d 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -173,7 +173,6 @@ def test_large_number_of_sites(default_cfg, site): site.execute(["cmk", "-O"]) _change_liveproxyd_sites(site, liveproxyd_sites) - live = livestatus.MultiSiteConnection(livestatus_api_sites) assert live.dead_sites() == {} diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 767364d..006b33f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -277,7 +277,8 @@ class Site(object): def write_file(self, rel_path, content): if not self._is_running_as_site_user(): p = self.execute(["dd", "of=%s/%s" % (self.root, rel_path)], - stdout=subprocess.PIPE, stdin=subprocess.PIPE) + stdout=subprocess.PIPE, stdin=subprocess.PIPE, + stderr=open(os.devnull, "w")) p.communicate(content) if p.wait() != 0: raise Exception("Failed to write file %s. Exit-Code: %d" % (rel_path, p.wait()))

7 years

Some internal cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: ed055ee33d6743af4650cae9695890cc50c41161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed055ee33d6743… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 23 08:01:46 2017 +0200 Some internal cleanups Change-Id: Id4878ac0697291dbc91d5af32142463ae53c0ea4 --- Makefile | 2 +- livestatus/api/python/livestatus.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 246ca39..e81ca3f 100644 --- a/Makefile +++ b/Makefile @@ -394,7 +394,7 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion ifeq ($(ENTERPRISE),yes) - sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' enterprise/bin/liveproxyd + sed -i 's/^__version__ = ".*/__version__ = "$(NEW_VERSION)"/' enterprise/bin/liveproxyd sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' enterprise/bin/cmcdump sed -i 's/^__version__ = ".*/__version__ = "$(NEW_VERSION)"/' enterprise/agents/plugins/cmk-update-agent endif diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index ddb1d09..9cdfacf 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -176,7 +176,17 @@ class Helpers: return result - +# TODO: Add more functionality to the Query class: +# - set_prepend_site +# - set_only_sites +# - set_limit +# - set_auth_user +# - set_auth_domain +# - set_timeout +# All these are mostly set for a single query and reset back to another +# value after the query. But nearly all of these usages does not care +# about resetting the option in case of an exception. This could be +# handled better using the query class class Query(object): """This object can be passed to all livestatus methods accepting a livestatus query. The object can be used to hand over the handling code some flags, for @@ -508,6 +518,9 @@ class SingleSiteConnection(BaseConnection, Helpers): # socket: socketurl (obligatory) # timeout: timeout for tcp/unix in seconds +# TODO: Move the connect/disconnect stuff to separate methods. Then make +# it possible to connect/disconnect duing existance of a single object. + class MultiSiteConnection(Helpers): def __init__(self, sites, disabled_sites = None): if disabled_sites is None:

7 years

Added missing manpage

by Simon Betz

Module: check_mk Branch: master Commit: e217c377710061cd9eb67417300757584881ed43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e217c377710061… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 27 13:30:26 2017 +0200 Added missing manpage Change-Id: I39b30cbec96e93d454feba2b4628f8235ee164ad --- checkman/postgres_instances | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/checkman/postgres_instances b/checkman/postgres_instances new file mode 100644 index 0000000..6aec78e --- /dev/null +++ b/checkman/postgres_instances @@ -0,0 +1,13 @@ +title: PostgreSQL Instances +agents: linux +catalog: app/postgresql +license: GPL +distribution: check_mk +description: + This check monitors the instances of a PostgreSQL database. + + If instance is running, service status is OK, otherwise CRIT. + +inventory: + One service per instance is created. +

7 years

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017