Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Refreshed Pipfile.lock after Pipfile changes in b6668bbb2.

by Sven Panne

Module: check_mk Branch: master Commit: c40d73e3c365734549487e6d068d25572db18ba0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c40d73e3c36573… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 25 08:38:14 2019 +0100 Refreshed Pipfile.lock after Pipfile changes in b6668bbb2. Change-Id: Icd5a83923e4cb5a5af17feee45d2371b70072a88 --- Pipfile.lock | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 73c4f44..0624f42 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5d8f69a83ce41ca3d51d618ccc3b8be542e3028e8636a7ac3115eef8d01203d7" + "sha256": "85eac5968e6f89ffb7b7646ecc728d51a36334d1f4df5b31d9b5346eaa37048d" }, "pipfile-spec": 6, "requires": { @@ -1049,10 +1049,10 @@ }, "dill": { "hashes": [ - "sha256:624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3" + "sha256:f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f" ], "index": "pypi", - "version": "==0.2.8.2" + "version": "==0.2.9" }, "docker": { "hashes": [ @@ -1079,6 +1079,12 @@ "index": "pypi", "version": "==1.1.6" }, + "fancycompleter": { + "hashes": [ + "sha256:d2522f1f3512371f295379c4c0d1962de06762eb586c199620a2a5d423539b12" + ], + "version": "==0.8" + }, "funcparserlib": { "hashes": [ "sha256:b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d" @@ -1090,7 +1096,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1261,6 +1267,13 @@ "index": "pypi", "version": "==5.1.0" }, + "pdbpp": { + "hashes": [ + "sha256:535085916fcfb768690ba0aeab2967c2a2163a0a60e5b703776846873e171399" + ], + "index": "pypi", + "version": "==0.9.3" + }, "pluggy": { "hashes": [ "sha256:8ddc32f03971bfdf900a81961a48ccf2fb677cf7715108f85295c67405798616", @@ -1300,6 +1313,13 @@ "index": "pypi", "version": "==2.0.0" }, + "pygments": { + "hashes": [ + "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", + "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d" + ], + "version": "==2.3.1" + }, "pylint": { "hashes": [ "sha256:02c2b6d268695a8b64ad61847f92e611e6afcff33fd26c3a2125370c4662905d", @@ -1308,6 +1328,12 @@ "index": "pypi", "version": "==1.9.4" }, + "pyrepl": { + "hashes": [ + "sha256:3bcbbf1e47d2b80819b805aceea16dc90832ba4800035d595fa3c4bf48fcd4d7" + ], + "version": "==0.8.4" + }, "pytest": { "hashes": [ "sha256:41568ea7ecb4a68d7f63837cf65b92ce8d0105e43196ff2b26622995bb3dc4b2", @@ -1417,10 +1443,10 @@ }, "soupsieve": { "hashes": [ - "sha256:009d8865916766f7f452880d08ff94ed4c5445011a3deaac67543b82bdb0b9ee", - "sha256:97599c45a1ddfe9ab0a0cba889b7f214b3e310b703f176a0610c0b54e207cc04" + "sha256:466910df7561796a60748826781ebe9a888f7a1668a636ae86783f44d10aae73", + "sha256:87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445" ], - "version": "==1.7.1" + "version": "==1.7.3" }, "stevedore": { "hashes": [ @@ -1445,11 +1471,17 @@ "index": "pypi", "version": "==0.54.0" }, + "wmctrl": { + "hashes": [ + "sha256:d806f65ac1554366b6e31d29d7be2e8893996c0acbb2824bbf2b1f49cf628a13" + ], + "version": "==0.3" + }, "wrapt": { "hashes": [ - "sha256:e03f19f64d81d0a3099518ca26b04550026f131eced2e76ced7b85c6b8d32128" + "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" ], - "version": "==1.11.0" + "version": "==1.11.1" }, "yapf": { "hashes": [

5 years, 8 months

yapf datasource_programs.py

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7565f3aaf38d077658d167d9ec8b802c6ffae4da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7565f3aaf38d07… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 20:57:53 2019 +0100 yapf datasource_programs.py Change-Id: I80062522e96c5484fa918a685c056787dde06b9b --- cmk/gui/plugins/wato/datasource_programs.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 5e47d74..7e86555 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1277,16 +1277,18 @@ register_rule( allow_empty=False, size=45, )), - ("--tenant-id", TextAscii( - title=_("Tenant ID / Directory ID"), - allow_empty=False, - size=45, - )), - ("--client-id", TextAscii( - title=_("Client ID / Application ID"), - allow_empty=False, - size=45, - )), + ("--tenant-id", + TextAscii( + title=_("Tenant ID / Directory ID"), + allow_empty=False, + size=45, + )), + ("--client-id", + TextAscii( + title=_("Client ID / Application ID"), + allow_empty=False, + size=45, + )), ("--secret", Password( title=_("Secret"), allow_empty=False,

5 years, 8 months

mk_jolokia: refactor towards instance class (1)

by Moritz Kiemer

Module: check_mk Branch: master Commit: e96da94f8830c6abd3c4b485feda04c7e3e569ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e96da94f8830c6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 11:07:48 2019 +0100 mk_jolokia: refactor towards instance class (1) Change-Id: I88468512cbfebd7237481265b7099a0ec8da2914 --- agents/plugins/mk_jolokia.py | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 4dafc96..6050f69 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -223,6 +223,15 @@ def sanitize_config(config): return config +def _get_base_url(inst): + return "%s://%s:%d/%s" % ( + inst["protocol"].strip('/'), + inst["server"].strip('/'), + inst["port"], + inst["suburi"], + ) + + def fetch_url(request_url, post_data=None): if VERBOSE: sys.stderr.write("DEBUG: Fetching: %s\n" % request_url) @@ -251,16 +260,8 @@ def _get_post_data(path, service_url, service_user, service_password, function): return json.dumps(data) -def fetch_var(protocol, - server, - port, - path, - suburi, - service_url, - service_user, - service_password, - function="read"): - base_url = "%s://%s:%d/%s" % (protocol, server, port, suburi) +def fetch_var(inst, path, service_url, service_user, service_password, function="read"): + base_url = _get_base_url(inst) if service_url is not None: post_data = _get_post_data(path, service_url, service_user, service_password, function) @@ -343,8 +344,8 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, inst["suburi"], - inst["service_url"], inst["service_user"], inst["service_password"]) + values = fetch_var(inst, path, inst["service_url"], inst["service_user"], + inst["service_password"]) item_list = make_item_list((), values, itemspec) for subinstance, value in item_list: @@ -377,16 +378,7 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - value = fetch_var( - inst["protocol"], - inst["server"], - inst["port"], - mbean, - inst["suburi"], - None, - None, - None, - function="search") + value = fetch_var(inst, mbean, None, None, None, function="search") try: paths = make_item_list((), value, "")[0][1] except IndexError: @@ -510,8 +502,7 @@ def prepare_http_opener(inst): def generate_jolokia_info(inst): # Determine type of server - value = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], None, - None, None) + value = fetch_var(inst, "", None, None, None) server_info = make_item_list((), value, "") if not server_info:

5 years, 8 months

mk_jolokia: refactor towards instance class (4)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 647c76cf9aa174e92979e8e5b0718e660902102a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=647c76cf9aa174… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 11:55:41 2019 +0100 mk_jolokia: refactor towards instance class (4) Change-Id: I2c741f7d122746eedac93ac24df8e733018a39ab --- agents/plugins/mk_jolokia.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 24e04f5..ed20775 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -227,14 +227,16 @@ class JolokiaInstance(object): super(JolokiaInstance, self).__init__() self.config = self._sanitize_config(config) + self.name = self.config["instance"] + self.base_url = self._get_base_url() -def _get_base_url(inst): - return "%s://%s:%d/%s" % ( - inst["protocol"].strip('/'), - inst["server"].strip('/'), - inst["port"], - inst["suburi"], - ) + def _get_base_url(self): + return "%s://%s:%d/%s" % ( + self.config["protocol"].strip('/'), + self.config["server"].strip('/'), + self.config["port"], + self.config["suburi"], + ) def fetch_url(request_url, post_data=None): @@ -266,13 +268,12 @@ def _get_post_data(path, service_url, service_user, service_password, function): def fetch_var(inst, path, service_url, service_user, service_password, function="read"): - base_url = _get_base_url(inst) if service_url is not None: post_data = _get_post_data(path, service_url, service_user, service_password, function) - json_data = fetch_url(base_url, post_data) + json_data = fetch_url(inst.base_url, post_data) else: - request_url = "%s/%s/%s" % (base_url, function, path) if path else base_url + "/" + request_url = "%s/%s/%s" % (inst.base_url, function, path) if path else inst.base_url + "/" json_data = fetch_url(request_url) try: @@ -283,7 +284,7 @@ def fetch_var(inst, path, service_url, service_user, service_password, function= return [] if obj.get('status', 200) != 200: - sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % base_url) + sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % inst.base_url) sys.stderr.write(' Response: %s\n' % json_data) return [] @@ -362,11 +363,11 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): continue if len(subinstance) > 1: - item = ",".join((inst.config["instance"],) + subinstance[:-1]) + item = ",".join((inst.name,) + subinstance[:-1]) elif inst_add is not None: - item = ",".join((inst.config["instance"], inst_add)) + item = ",".join((inst.name, inst_add)) else: - item = inst.config["instance"] + item = inst.name if title: if subinstance: tit = title + "." + subinstance[-1] @@ -511,7 +512,7 @@ def generate_jolokia_info(inst): server_info = make_item_list((), value, "") if not server_info: - sys.stderr.write("%s ERROR: Empty server info\n" % (inst.config["instance"],)) + sys.stderr.write("%s ERROR: Empty server info\n" % (inst.name,)) raise SkipInstance() info_dict = dict(server_info) @@ -520,7 +521,7 @@ def generate_jolokia_info(inst): if inst.config.get("product"): product = inst.config["product"] agentversion = info_dict.get(('agent',), "unknown") - yield inst.config["instance"], product, version, agentversion + yield inst.name, product, version, agentversion def generate_values(inst, var_list):

5 years, 8 months

mk_jolokia: refactor towards instance class (3)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 913cdbc579a0dd1540df7b3e234b9222c86f6a52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=913cdbc579a0dd… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 11:49:43 2019 +0100 mk_jolokia: refactor towards instance class (3) Change-Id: Ib9e3ad68d48b0ae628773d73b3d5ef9fec191f70 --- agents/plugins/mk_jolokia.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index dd8284f..24e04f5 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -349,8 +349,8 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - values = fetch_var(inst, path, inst["service_url"], inst["service_user"], - inst["service_password"]) + values = fetch_var(inst.config, path, inst.config["service_url"], inst.config["service_user"], + inst.config["service_password"]) item_list = make_item_list((), values, itemspec) for subinstance, value in item_list: @@ -362,11 +362,11 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): continue if len(subinstance) > 1: - item = ",".join((inst["instance"],) + subinstance[:-1]) + item = ",".join((inst.config["instance"],) + subinstance[:-1]) elif inst_add is not None: - item = ",".join((inst["instance"], inst_add)) + item = ",".join((inst.config["instance"], inst_add)) else: - item = inst["instance"] + item = inst.config["instance"] if title: if subinstance: tit = title + "." + subinstance[-1] @@ -383,7 +383,7 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - value = fetch_var(inst, mbean, None, None, None, function="search") + value = fetch_var(inst.config, mbean, None, None, None, function="search") try: paths = make_item_list((), value, "")[0][1] except IndexError: @@ -528,9 +528,9 @@ def generate_values(inst, var_list): mbean, path, title, itemspec, do_search = var[:5] value_type = var[5] if len(var) >= 6 else None - queries = _get_queries(do_search, inst.config, itemspec, title, path, mbean) + queries = _get_queries(do_search, inst, itemspec, title, path, mbean) - for item, title, value in _process_queries(inst.config, queries): + for item, title, value in _process_queries(inst, queries): if value_type: yield item, title, value, value_type else:

5 years, 8 months

mk_jolokia: refactor towards instance class (2)

by Moritz Kiemer

Module: check_mk Branch: master Commit: a72e3de5cd976aced09f5014d970f861bf52f421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72e3de5cd976a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 11:40:52 2019 +0100 mk_jolokia: refactor towards instance class (2) Change-Id: I9ce2fda89806e855ba5f9f5687ee76552e6646f0 --- agents/plugins/mk_jolokia.py | 89 +++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 6050f69..dd8284f 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -188,39 +188,44 @@ def cached(function): return cached_function -def sanitize_config(config): - - instance = config.get("instance") - err_msg = "%s in configuration" - if instance: - err_msg += " for %s" % instance - - required_keys = {"protocol", "server", "port", "suburi"} - auth_mode = config.get("mode") - if auth_mode in ("digest", "basic", "basic_preemtive"): - required_keys |= {"user", "password"} - elif auth_mode == "https": - required_keys |= {"client_cert", "client_key"} - if config.get("service_url") is not None and config.get("service_user") is not None: - required_keys.add("service_password") - missing_keys = required_keys - set(config.keys()) - if missing_keys: - raise ValueError(err_msg % ("Missing keys " % ", ".join(missing_keys))) - - if not instance: - config["instance"] = str(config["port"]) - config["instance"] = config["instance"].replace(" ", "_") - - # port must be (or look like) an integer - try: - config["port"] = int(config["port"]) - except ValueError: - raise ValueError(err_msg % ("Invalid port %r" % config["port"])) +class JolokiaInstance(object): + @staticmethod + def _sanitize_config(config): + instance = config.get("instance") + err_msg = "%s in configuration" + if instance: + err_msg += " for %s" % instance + + required_keys = {"protocol", "server", "port", "suburi"} + auth_mode = config.get("mode") + if auth_mode in ("digest", "basic", "basic_preemtive"): + required_keys |= {"user", "password"} + elif auth_mode == "https": + required_keys |= {"client_cert", "client_key"} + if config.get("service_url") is not None and config.get("service_user") is not None: + required_keys.add("service_password") + missing_keys = required_keys - set(config.keys()) + if missing_keys: + raise ValueError(err_msg % ("Missing keys " % ", ".join(missing_keys))) + + if not instance: + config["instance"] = str(config["port"]) + config["instance"] = config["instance"].replace(" ", "_") + + # port must be (or look like) an integer + try: + config["port"] = int(config["port"]) + except ValueError: + raise ValueError(err_msg % ("Invalid port %r" % config["port"])) + + if config.get("server") == "use fqdn": + config["server"] = socket.getfqdn() - if config.get("server") == "use fqdn": - config["server"] = socket.getfqdn() + return config - return config + def __init__(self, config): + super(JolokiaInstance, self).__init__() + self.config = self._sanitize_config(config) def _get_base_url(inst): @@ -400,17 +405,17 @@ def _process_queries(inst, queries): def query_instance(inst): try: - prepare_http_opener(inst) + prepare_http_opener(inst.config) except () if DEBUG else Exception, exc: sys.stderr.write("ERROR: %s\n" % exc) raise SkipInstance() write_section('jolokia_info', generate_jolokia_info(inst)) - shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) + shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst.config["product"], []) write_section('jolokia_metrics', generate_values(inst, shipped_vars)) - write_section('jolokia_generic', generate_values(inst, inst.get("custom_vars"))) + write_section('jolokia_generic', generate_values(inst, inst.config.get("custom_vars"))) class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): @@ -502,20 +507,20 @@ def prepare_http_opener(inst): def generate_jolokia_info(inst): # Determine type of server - value = fetch_var(inst, "", None, None, None) + value = fetch_var(inst.config, "", None, None, None) server_info = make_item_list((), value, "") if not server_info: - sys.stderr.write("%s ERROR: Empty server info\n" % (inst["instance"],)) + sys.stderr.write("%s ERROR: Empty server info\n" % (inst.config["instance"],)) raise SkipInstance() info_dict = dict(server_info) version = info_dict.get(('info', 'version'), "unknown") product = info_dict.get(('info', 'product'), "unknown") - if inst.get("product"): - product = inst["product"] + if inst.config.get("product"): + product = inst.config["product"] agentversion = info_dict.get(('agent',), "unknown") - yield inst["instance"], product, version, agentversion + yield inst.config["instance"], product, version, agentversion def generate_values(inst, var_list): @@ -523,9 +528,9 @@ def generate_values(inst, var_list): mbean, path, title, itemspec, do_search = var[:5] value_type = var[5] if len(var) >= 6 else None - queries = _get_queries(do_search, inst, itemspec, title, path, mbean) + queries = _get_queries(do_search, inst.config, itemspec, title, path, mbean) - for item, title, value in _process_queries(inst, queries): + for item, title, value in _process_queries(inst.config, queries): if value_type: yield item, title, value, value_type else: @@ -553,7 +558,7 @@ def main(configs_iterable=None): configs_iterable = yield_configured_instances() for config in configs_iterable: - instance = sanitize_config(config) + instance = JolokiaInstance(config) try: query_instance(instance) except SkipInstance:

5 years, 8 months

mk_jolokia: refactor towards instance class (5)

by Moritz Kiemer

Module: check_mk Branch: master Commit: ac4624fe255cce5ba58cd614f33bbcc6631bd6e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac4624fe255cce… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 13:04:49 2019 +0100 mk_jolokia: refactor towards instance class (5) Change-Id: I60fb7755e5cab05bad74aa1ea46d7f41146b77d4 --- agents/plugins/mk_jolokia.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index ed20775..36125ba 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -228,6 +228,9 @@ class JolokiaInstance(object): self.config = self._sanitize_config(config) self.name = self.config["instance"] + self.product = self.config["product"] + self.custom_vars = self.config.get("custom_vars", []) + self.base_url = self._get_base_url() def _get_base_url(self): @@ -413,10 +416,10 @@ def query_instance(inst): write_section('jolokia_info', generate_jolokia_info(inst)) - shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst.config["product"], []) + shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst.product, []) write_section('jolokia_metrics', generate_values(inst, shipped_vars)) - write_section('jolokia_generic', generate_values(inst, inst.config.get("custom_vars"))) + write_section('jolokia_generic', generate_values(inst, inst.custom_vars)) class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): @@ -518,8 +521,8 @@ def generate_jolokia_info(inst): info_dict = dict(server_info) version = info_dict.get(('info', 'version'), "unknown") product = info_dict.get(('info', 'product'), "unknown") - if inst.config.get("product"): - product = inst.config["product"] + if inst.product: + product = inst.product agentversion = info_dict.get(('agent',), "unknown") yield inst.name, product, version, agentversion

5 years, 8 months

6657 Kubernetes checks for node Network and Filesystem usage

by Óscar Nájera

Module: check_mk Branch: master Commit: 8740677036dd52a53fac75791c88dc8fd9d0e97a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8740677036dd52… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Jan 16 15:10:26 2019 +0100 6657 Kubernetes checks for node Network and Filesystem usage Kubernetes special agent obtains the node statistics of network and filesystem usage for each node. Corresponding checks are available at node or cluster level. CMK-1541 Change-Id: I6b6b2182c31c53f9d89e97981a49a7a427645931 --- .werks/6657 | 11 +++ checkman/k8s_stats.fs | 12 ++++ checkman/k8s_stats.network | 14 ++++ checks/k8s_stats | 105 ++++++++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 10 +++ cmk/special_agents/agent_kubernetes.py | 27 +++++-- doc/treasures/kubernetes/check_mk_rbac.yaml | 1 + 7 files changed, 175 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8740677036…

5 years, 8 months

Längere Eingabefelder in Azure-Regel

by Mathias Kettner

Module: check_mk Branch: master Commit: 06811ca89070573b493353ee87907ee0e01b4f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06811ca8907057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 24 13:43:14 2019 +0100 Längere Eingabefelder in Azure-Regel --- checkman/k8s_pods_fs | 2 +- cmk/gui/plugins/wato/datasource_programs.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checkman/k8s_pods_fs b/checkman/k8s_pods_fs index 634ee14..6dfbd89 100644 --- a/checkman/k8s_pods_fs +++ b/checkman/k8s_pods_fs @@ -1,4 +1,4 @@ -title: Kubernetes pods Filesystem resources +title: Kubernetes pods filesystem resources agents: linux catalog: containerization/kubernetes license: GPL diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index c67ee48..5e47d74 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1275,18 +1275,22 @@ register_rule( ("--subscription-id", TextAscii( title=_("Subscription ID"), allow_empty=False, + size=45, )), ("--tenant-id", TextAscii( title=_("Tenant ID / Directory ID"), allow_empty=False, + size=45, )), ("--client-id", TextAscii( title=_("Client ID / Application ID"), allow_empty=False, + size=45, )), ("--secret", Password( title=_("Secret"), allow_empty=False, + size=45, )), ( "config",

5 years, 8 months

7075 FIX Fixed possible "omd backup" error when persisted sections change during backup

by Lars Michelsen

Module: check_mk Branch: master Commit: 6639af3b189daf58a68b1a7a9380244b8275068f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6639af3b189daf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 24 13:24:03 2019 +0100 7075 FIX Fixed possible "omd backup" error when persisted sections change during backup When persisted sections of Check_MK in <tt>var/check_mk/persisted/*</tt> and <tt>var/check_mk/persisted_sections/*</tt> vanished during the backup, the backup job could fail in previous versions. Change-Id: Iaf1ccd337c9aba833876abf40bd56e57dd62021a --- .werks/7075 | 13 +++++++++++++ omd/packages/omd/omdlib/main.py | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/7075 b/.werks/7075 new file mode 100644 index 0000000..bedc1be --- /dev/null +++ b/.werks/7075 @@ -0,0 +1,13 @@ +Title: Fixed possible "omd backup" error when persisted sections change during backup +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1547802040 + +When persisted sections of Check_MK in <tt>var/check_mk/persisted/*</tt> and +<tt>var/check_mk/persisted_sections/*</tt> vanished during the backup, the backup +job could fail in previous versions. diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index 1c4498d..e5bc7ae 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -3497,6 +3497,13 @@ def backup_site_files_to_tarfile(site, tar, options): exclude.append("*.mk.new*") exclude.append("var/log/.liveproxyd.state.new*") + # exclude section cache because files may vanish during backup. It would + # be better to have them in the backup and simply don't make the backup + # fail in case a file vanishes during the backup, but the tarfile module + # does not allow this. + exclude.append("var/check_mk/persisted/*") + exclude.append("var/check_mk/persisted_sections/*") + def filter_files(filename): for glob_pattern in exclude: # patterns are relative to site directory, filename is full path.

5 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019