Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5ca6642c4e3cdd898f463750d76e8cf37729f140 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ca6642c4e3cdd… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 19 15:22:22 2018 +0100 fix typo in skype.sip_stack metric FEED-3122 Change-Id: I83e4ffa9922f03f2922648eeaf05ae0e725eb673 --- cmk/gui/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index b504d8b..452e272 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -3877,7 +3877,7 @@ metric_info["usrv_queue_latency"] = { "color": "42/a" } -metric_info["srv_sproc_latency"] = { +metric_info["usrv_sproc_latency"] = { "title": _("USrv - Sproc Latency"), "unit": "s", "color": "42/a"

5 years, 10 months

another yapf

by Andreas Boesl

Module: check_mk Branch: master Commit: 456adcdc92094a53ecb3d8256201033594a82986 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=456adcdc92094a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:54:40 2018 +0100 another yapf Change-Id: I45ae4832cb1bd3959bd7fb1a28473f2b1b4b025b --- cmk/gui/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 3c1fc58..7d39575 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -475,7 +475,7 @@ class InventoryHousekeeping(object): self._inventory_delta_cache_path = Path(cmk.paths.var_dir) / "inventory_delta_cache" def run(self): - if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists(# pylint: disable=no-member + if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists( # pylint: disable=no-member ): return

5 years, 10 months

fixed pyint warnings

by Andreas Boesl

Module: check_mk Branch: master Commit: 095cda04941e8eadf566f75e9e1acf9720d6e5ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=095cda04941e8e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:33:15 2018 +0100 fixed pyint warnings Change-Id: I1d517f6bf43e81ee7c2e048a5827dc0af43ea6c2 --- cmk/gui/inventory.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 11fa579..6b2ee96 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -45,7 +45,7 @@ import cmk.gui.userdb as userdb import cmk.gui.sites as sites from cmk.gui.i18n import _ from cmk.gui.globals import html -from cmk.gui.exceptions import MKException, MKGeneralException, MKAuthException, MKUserError, RequestTimeout +from cmk.gui.exceptions import MKException, MKGeneralException, MKAuthException, MKUserError def get_inventory_data(inventory_tree, tree_path): @@ -200,7 +200,7 @@ def get_history_deltas(hostname, search_timestamp=None): return tree_lookup[timestamp] delta_history = [] - for idx, timestamp in enumerate(required_timestamps): + for _idx, timestamp in enumerate(required_timestamps): cached_delta_path = os.path.join(cmk.paths.var_dir, "inventory_delta_cache", hostname, "%s_%s" % (previous_timestamp, timestamp)) @@ -229,7 +229,7 @@ def get_history_deltas(hostname, search_timestamp=None): delta_history.append((timestamp, delta_data)) except RequestTimeout: raise - except Exception, e: + except Exception: return [] # No inventory for this host previous_timestamp = timestamp @@ -475,8 +475,8 @@ class InventoryHousekeeping(object): self._inventory_delta_cache_path = Path(cmk.paths.var_dir) / "inventory_delta_cache" def run(self): - if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists( - ): # pylint: disable=no-member + if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists(# pylint: disable=no-member + ): return last_cleanup = self._inventory_delta_cache_path / "last_cleanup" @@ -519,7 +519,7 @@ class InventoryHousekeeping(object): timestamps = set(["None"]) # 'None' refers to the histories start try: timestamps.add("%d" % (self._inventory_path / hostname).stat().st_mtime) - except OSError, e: + except OSError: pass for filename in [

5 years, 10 months

more pylint fixes

by Andreas Boesl

Module: check_mk Branch: master Commit: f2efa5fce50a93989a134911461460c43f537370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2efa5fce50a93… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:38:08 2018 +0100 more pylint fixes Change-Id: I082af60b5bc94de93048b0890af0d110d65e7baa --- cmk/gui/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 6b2ee96..3c1fc58 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -45,7 +45,7 @@ import cmk.gui.userdb as userdb import cmk.gui.sites as sites from cmk.gui.i18n import _ from cmk.gui.globals import html -from cmk.gui.exceptions import MKException, MKGeneralException, MKAuthException, MKUserError +from cmk.gui.exceptions import MKException, MKGeneralException, MKAuthException, MKUserError, RequestTimeout def get_inventory_data(inventory_tree, tree_path):

5 years, 10 months

yapfed

by Andreas Boesl

Module: check_mk Branch: master Commit: b02ab0d24d3fdfb19ad2e64508ff58fe91a52f54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b02ab0d24d3fdf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:25:41 2018 +0100 yapfed Change-Id: I0ad6d6db4234755e6ce8230699b96739d6b53188 --- cmk/gui/inventory.py | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 9de6da4..52ecc3b 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -151,9 +151,9 @@ def load_delta_tree(hostname, timestamp): return delta_history[0][1][3] -def get_history_deltas(hostname, search_timestamp = None): +def get_history_deltas(hostname, search_timestamp=None): if '/' in hostname: - return None # just for security reasons + return None # just for security reasons inventory_path = "%s/inventory/%s" % (cmk.paths.var_dir, hostname) if not os.path.exists(inventory_path): @@ -176,10 +176,11 @@ def get_history_deltas(hostname, search_timestamp = None): if new_timestamp_idx == 0: required_timestamps = [search_timestamp] else: - previous_timestamp = all_timestamps[new_timestamp_idx-1] + previous_timestamp = all_timestamps[new_timestamp_idx - 1] required_timestamps = [search_timestamp] tree_lookup = {} + def get_tree(timestamp): if timestamp is None: return StructuredDataTree() @@ -190,19 +191,17 @@ def get_history_deltas(hostname, search_timestamp = None): if timestamp == latest_timestamp: inventory_tree = load_filtered_inventory_tree(hostname) if inventory_tree is None: - return + return tree_lookup[timestamp] = inventory_tree else: inventory_archive_path = "%s/%s" % (inventory_archive_dir, timestamp) - tree_lookup[timestamp] = _filter_tree(StructuredDataTree().load_from(inventory_archive_path)) + tree_lookup[timestamp] = _filter_tree( + StructuredDataTree().load_from(inventory_archive_path)) return tree_lookup[timestamp] - delta_history = [] for idx, timestamp in enumerate(required_timestamps): - cached_delta_path = os.path.join(cmk.paths.var_dir, - "inventory_delta_cache", - hostname, + cached_delta_path = os.path.join(cmk.paths.var_dir, "inventory_delta_cache", hostname, "%s_%s" % (previous_timestamp, timestamp)) cached_data = None @@ -225,20 +224,19 @@ def get_history_deltas(hostname, search_timestamp = None): delta_data = current_tree.compare_with(previous_tree) new, changed, removed, delta_tree = delta_data - cmk.store.save_file(cached_delta_path, repr((new, changed, removed, delta_tree.get_raw_tree()))) + cmk.store.save_file(cached_delta_path, + repr((new, changed, removed, delta_tree.get_raw_tree()))) delta_history.append((timestamp, delta_data)) except htmllib.RequestTimeout: raise except Exception, e: - return [] # No inventory for this host + return [] # No inventory for this host previous_timestamp = timestamp return delta_history - - def parent_path(invpath): # Gets the parent path by dropping the last component if invpath == ".": @@ -477,17 +475,20 @@ class InventoryHousekeeping(object): self._inventory_delta_cache_path = Path(cmk.paths.var_dir) / "inventory_delta_cache" def run(self): - if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists(): # pylint: disable=no-member + if not self._inventory_delta_cache_path.exists() or not self._inventory_archive_path.exists( + ): # pylint: disable=no-member return last_cleanup = self._inventory_delta_cache_path / "last_cleanup" # TODO: remove with pylint 2 - if last_cleanup.exists() and time.time() - last_cleanup.stat().st_mtime < 3600 * 12: # pylint: disable=no-member + if last_cleanup.exists() and time.time() - last_cleanup.stat().st_mtime < 3600 * 12: # pylint: disable=no-member return # TODO: remove with pylint 2 - inventory_archive_hosts = set([x.name for x in self._inventory_archive_path.iterdir() if x.is_dir()]) # pylint: disable=no-member - inventory_delta_cache_hosts = set([x.name for x in self._inventory_delta_cache_path.iterdir() if x.is_dir()]) # pylint: disable=no-member + inventory_archive_hosts = set( + [x.name for x in self._inventory_archive_path.iterdir() if x.is_dir()]) # pylint: disable=no-member + inventory_delta_cache_hosts = set( + [x.name for x in self._inventory_delta_cache_path.iterdir() if x.is_dir()]) # pylint: disable=no-member folders_to_delete = inventory_delta_cache_hosts - inventory_archive_hosts for foldername in folders_to_delete: @@ -496,7 +497,11 @@ class InventoryHousekeeping(object): inventory_delta_cache_hosts -= folders_to_delete for hostname in inventory_delta_cache_hosts: available_timestamps = self._get_timestamps_for_host(hostname) - for filename in [x.name for x in (self._inventory_delta_cache_path / hostname).iterdir() if not x.is_dir()]: + for filename in [ + x.name + for x in (self._inventory_delta_cache_path / hostname).iterdir() + if not x.is_dir() + ]: delete = False try: first, second = filename.split("_") @@ -508,17 +513,17 @@ class InventoryHousekeeping(object): (self._inventory_delta_cache_path / hostname / filename).unlink() # TODO: remove with pylint 2 - last_cleanup.touch() # pylint: disable=no-member - + last_cleanup.touch() # pylint: disable=no-member def _get_timestamps_for_host(self, hostname): - timestamps = set(["None"]) # 'None' refers to the histories start + timestamps = set(["None"]) # 'None' refers to the histories start try: timestamps.add("%d" % (self._inventory_path / hostname).stat().st_mtime) except OSError, e: pass - for filename in [x for x in (self._inventory_archive_path / hostname).iterdir() if not x.is_dir()]: + for filename in [ + x for x in (self._inventory_archive_path / hostname).iterdir() if not x.is_dir() + ]: timestamps.add(filename.name) return timestamps -

5 years, 10 months

added WK6688: Title: Improved performance for HS/SW history archive

by Andreas Boesl

Module: check_mk Branch: master Commit: daccb3bd7e04b2ef320eb3ffb25abf3a337c9237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daccb3bd7e04b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:24:15 2018 +0100 added WK6688: Title: Improved performance for HS/SW history archive Change-Id: I19fd9aa5e4a0e090134dc7d07ab61e3c4810f40d --- .werks/6688 | 12 ++ cmk/gui/inventory.py | 184 ++++++++++++++++----- cmk/gui/plugins/cron/inventory.py | 30 ++++ cmk/gui/plugins/views/inventory.py | 6 +- .../cmk/structured_data/test_structured_data.py | 21 +++ 5 files changed, 210 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=daccb3bd7e…

5 years, 10 months

fixed import error

by Andreas Boesl

Module: check_mk Branch: master Commit: e522c9329f617a78d7f44dd59ad9438e3eb2e822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e522c9329f617a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 19:28:15 2018 +0100 fixed import error Change-Id: Ib2da64bee522f0918947c318c4bfc2b6eff11236 --- cmk/gui/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 52ecc3b..11fa579 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -227,7 +227,7 @@ def get_history_deltas(hostname, search_timestamp=None): cmk.store.save_file(cached_delta_path, repr((new, changed, removed, delta_tree.get_raw_tree()))) delta_history.append((timestamp, delta_data)) - except htmllib.RequestTimeout: + except RequestTimeout: raise except Exception, e: return [] # No inventory for this host

5 years, 10 months

Dynamic configuration: First steps

by Lars Michelsen

Module: check_mk Branch: master Commit: b9b7214df62165e9362e09bb676b8da452904213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9b7214df62165… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 20:15:06 2018 +0100 Dynamic configuration: First steps * The dcd is now deployed by OMD for all Check_MK sites * A basic dcd implementation is available as python package under the name "cmk.cee.dcd" * Some unit tests have been added * Integration tests for the OMD integration have been added * Logging is already configurable, just like for the other daemons CMK-1140 Change-Id: Ie1a86beaf7cb99b65c89279b3db414940d7019f9 --- tests/integration/omd/test_dcd_integration.py | 32 +++++++++++++++++++++++++++ tests/integration/omd/test_init_scripts.py | 2 ++ tests/unit/cmk/gui/test_watolib.py | 1 + 3 files changed, 35 insertions(+) diff --git a/tests/integration/omd/test_dcd_integration.py b/tests/integration/omd/test_dcd_integration.py new file mode 100644 index 0000000..720c94b --- /dev/null +++ b/tests/integration/omd/test_dcd_integration.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import subprocess + +import cmk + + +def test_dcd_exists(site): + assert site.file_exists("bin/dcd") + + +def test_dcd_path(site): + p = site.execute(["which", "dcd"], stdout=subprocess.PIPE) + path = p.stdout.read().strip() + assert path == "/omd/sites/%s/bin/dcd" % site.id + + +def test_dcd_version(site): + p = site.execute(["dcd", "-V"], stderr=subprocess.PIPE) + version = p.stderr.read() + assert version.startswith("dcd version %s" % cmk.__version__) + + +def test_dcd_daemon(site): + p = site.execute(["omd", "status", "--bare", "dcd"], stdout=subprocess.PIPE) + assert p.wait() == 0 + assert p.stdout.read() == "dcd 0\nOVERALL 0\n" + + +def test_dcd_logrotate(site): + assert site.file_exists("etc/logrotate.d/dcd") diff --git a/tests/integration/omd/test_init_scripts.py b/tests/integration/omd/test_init_scripts.py index 18e553b..74a0a4a 100644 --- a/tests/integration/omd/test_init_scripts.py +++ b/tests/integration/omd/test_init_scripts.py @@ -4,6 +4,7 @@ import os import stat + def test_init_scripts(site): scripts = [ "apache", @@ -22,6 +23,7 @@ def test_init_scripts(site): if site.version.edition() == "enterprise": scripts += [ "cmc", + "dcd", "liveproxyd", "mknotifyd", ] diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index ce42537..87fcf9e 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -33,6 +33,7 @@ def test_registered_config_domains(): 'apache', 'ca-certificates', 'check_mk', + 'dcd', 'diskspace', 'ec', 'liveproxyd',

5 years, 10 months

Fixed pylint issue

by Lars Michelsen

Module: check_mk Branch: master Commit: c0f7de0037ce368b29ac604d074bd48fc3a80c1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0f7de0037ce36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 16:01:52 2018 +0100 Fixed pylint issue Change-Id: I9d152edad2ff64c385f2eaee516b15e66d92231d --- cmk/regex.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/regex.py b/cmk/regex.py index 83750c0..0540a23 100644 --- a/cmk/regex.py +++ b/cmk/regex.py @@ -29,7 +29,6 @@ import re from typing import Dict, Pattern # pylint:disable=unused-import from cmk.exceptions import MKGeneralException -from cmk.gui.exceptions import MKUserError from cmk.i18n import _ g_compiled_regexes = {} # type: Dict[str, Pattern]

5 years, 10 months

6689 WATO API: Introduced new functions set_all_sites/get_all_sites

by Andreas Boesl

Module: check_mk Branch: master Commit: aededfdd27c2e4ea3b976b1830268a21bb09e54a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aededfdd27c2e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 16 10:44:05 2018 +0100 6689 WATO API: Introduced new functions set_all_sites/get_all_sites The new request <tt>get_all_sites</tt> allows you to fetch all site configurations with a single call. This call returns a python dictionary with the following content F+: {'configuration_hash': 'bba0d7cd362dc42af2f36f3d7dfed193', 'sites': {'heute': {'alias': u'Local site heute', 'disable_wato': True, 'disabled': False, 'insecure': False, 'multisiteurl': '', 'persist': False, 'replicate_ec': False, 'replication': '', 'socket': 'tcp:1.2.3.4:6557', 'timeout': 10, 'user_login': True}}} F-: The response from the previous call can be modified, e.g. add a new site and written back with the request <tt>set_all_sites</tt>. F+: {'configuration_hash': '3a11df6985ff799eca7310f35a8f575d', 'sites': {'heute': {'alias': u'Local site heute', 'disable_wato': True, 'disabled': False, 'insecure': False, 'multisiteurl': '', 'persist': False, 'replicate_ec': False, 'replication': '', 'socket': 'tcp:1.2.3.4:6557', 'timeout': 10, 'user_login': True}, 'new_site': {'alias': u'Local site heute', 'disable_wato': True, 'disabled': False, 'insecure': False, 'multisiteurl': '', 'persist': False, 'replicate_ec': False, 'replication': '', 'socket': 'tcp:1.2.3.4:6557', 'timeout': 10, 'user_login': True}}} F-: CMK-1105 Change-Id: I3c678f4a4677ae5a349673a749f90ec16acab79c --- .werks/6689 | 53 +++ cmk/gui/plugins/webapi/webapi.py | 36 ++ tests/integration/cmk/gui/test_webapi.py | 341 +++++++++----- tests/testlib/__init__.py | 770 +++++++++++++++---------------- 4 files changed, 702 insertions(+), 498 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aededfdd27…

5 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018