Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

7082 FIX Fixed "omd create" when fstab has 0 bytes

by Lars Michelsen

Module: check_mk Branch: master Commit: aeaeefb9742c87d6b23dc4bb7565de47e8167582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeaeefb9742c87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 09:00:05 2019 +0100 7082 FIX Fixed "omd create" when fstab has 0 bytes The "omd create" command failed with a "IndexError: string index out of range" in case a /etc/fstab file existed but was empty. While regular systems most likely have entries in there, this can often happen for containers. CMK-1636 Change-Id: I8acc7921276801a3f2f4e132f96fd66e54300aee --- .werks/7082 | 13 +++++++++ omd/packages/omd/omdlib/main.py | 14 +++++++--- tests/unit/omdlib/test_omdlib_main.py | 50 +++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/.werks/7082 b/.werks/7082 new file mode 100644 index 0000000..b42816b --- /dev/null +++ b/.werks/7082 @@ -0,0 +1,13 @@ +Title: Fixed "omd create" when fstab has 0 bytes +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1549523521 + +The "omd create" command failed with a "IndexError: string index out of range" +in case a /etc/fstab file existed but was empty. While regular systems most likely +have entries in there, this can often happen for containers. diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index d152e63..6a2a97e 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -1681,13 +1681,18 @@ def unmount_tmpfs(site, output=True, kill=False): return False +# Extracted to separate function to be able to monkeypatch the path for tests +def fstab_path(): + return "/etc/fstab" + + def add_to_fstab(site, tmpfs_size=None): - if not os.path.exists("/etc/fstab"): + if not os.path.exists(fstab_path()): return # Don't do anything in case there is no fstab # tmpfs /opt/omd/sites/b01/tmp tmpfs user,uid=b01,gid=b01 0 0 mountpoint = "/opt" + site.tmp_dir - sys.stdout.write("Adding %s to /etc/fstab.\n" % mountpoint) + sys.stdout.write("Adding %s to %s.\n" % (mountpoint, fstab_path())) # No size option: using up to 50% of the RAM sizespec = '' @@ -1695,9 +1700,10 @@ def add_to_fstab(site, tmpfs_size=None): sizespec = ',size=%s' % tmpfs_size # Ensure the fstab has a newline char at it's end before appending - complete_last_line = file("/etc/fstab").read()[-1] != "\n" + previous_fstab = file(fstab_path()).read() + complete_last_line = previous_fstab and not previous_fstab.endswith("\n") - with file("/etc/fstab", "a+") as fstab: + with file(fstab_path(), "a+") as fstab: if complete_last_line: fstab.write("\n") diff --git a/tests/unit/omdlib/test_omdlib_main.py b/tests/unit/omdlib/test_omdlib_main.py index db517a8..f779b9b 100644 --- a/tests/unit/omdlib/test_omdlib_main.py +++ b/tests/unit/omdlib/test_omdlib_main.py @@ -1,3 +1,4 @@ +import pytest from pathlib2 import Path import omdlib.main @@ -24,3 +25,52 @@ def test_initialize_site_ca(monkeypatch, tmpdir): omdlib.main.initialize_site_ca(omdlib.main.SiteContext(site_id)) assert (ca_path / "ca.pem").exists() assert (ca_path / "sites" / ("%s.pem" % site_id)).exists() + + +(a)pytest.fixture() +def site_context(): + return omdlib.main.SiteContext("unit") + + +(a)pytest.fixture() +def tmp_fstab(tmp_path, monkeypatch): + fstab_path = tmp_path / "fstab" + monkeypatch.setattr(omdlib.main, "fstab_path", lambda: str(fstab_path)) + return fstab_path + + +def test_add_to_fstab_not_existing(tmp_fstab, site_context): + assert not tmp_fstab.exists() + omdlib.main.add_to_fstab(site_context) + assert not tmp_fstab.exists() + + +def test_add_to_fstab(tmp_fstab, site_context): + tmp_fstab.open("w", encoding="utf-8").write(u"# system fstab bla\n") + omdlib.main.add_to_fstab(site_context) + assert tmp_fstab.open().read() == ( + "# system fstab bla\n" + "tmpfs /opt/omd/sites/unit/tmp tmpfs noauto,user,mode=755,uid=unit,gid=unit 0 0\n") + + +def test_add_to_fstab_with_size(tmp_fstab, site_context): + tmp_fstab.open("w", encoding="utf-8").write(u"# system fstab bla\n") + omdlib.main.add_to_fstab(site_context, tmpfs_size="1G") + assert tmp_fstab.open().read() == ( + "# system fstab bla\n" + "tmpfs /opt/omd/sites/unit/tmp tmpfs noauto,user,mode=755,uid=unit,gid=unit,size=1G 0 0\n") + + +def test_add_to_fstab_no_newline_at_end(tmp_fstab, site_context): + tmp_fstab.open("w", encoding="utf-8").write(u"# system fstab bla") + omdlib.main.add_to_fstab(site_context) + assert tmp_fstab.open().read() == ( + "# system fstab bla\n" + "tmpfs /opt/omd/sites/unit/tmp tmpfs noauto,user,mode=755,uid=unit,gid=unit 0 0\n") + + +def test_add_to_fstab_empty(tmp_fstab, site_context): + tmp_fstab.open("w", encoding="utf-8").write(u"") + omdlib.main.add_to_fstab(site_context) + assert tmp_fstab.open().read() == ( + "tmpfs /opt/omd/sites/unit/tmp tmpfs noauto,user,mode=755,uid=unit,gid=unit 0 0\n")

5 years, 7 months

Fixed web integration test

by Lars Michelsen

Module: check_mk Branch: master Commit: e41713e6d5ac9b04af89d8fb39ec48a82db3b1da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e41713e6d5ac9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 08:31:45 2019 +0100 Fixed web integration test Change-Id: I45bfe8b5e369ade27ea399d8789b5e5cc1e45295 --- tests/integration/cmk/gui/test_webapi.py | 56 +++++++++++++------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 64e9fdf..51c28c1 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -212,17 +212,13 @@ def test_get_all_sites(web, site): assert site.id in response["sites"] -(a)pytest.mark.parametrize( - "sock_spec", - [ - "tcp:1.2.3.4:6557", - ( - "tcp", - { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }), - ]) +(a)pytest.mark.parametrize("sock_spec", [ + "tcp:1.2.3.4:6557", + ("tcp", { + "address": ("1.2.3.4", 6557), + "tls": ("plain_text", {}), + }), +]) def test_set_site(web, site, sock_spec): original_site = web.get_site(site.id) assert site.id == original_site["site_id"] @@ -232,12 +228,10 @@ def test_set_site(web, site, sock_spec): new_site_config["socket"] = sock_spec expected_site_config = copy.deepcopy(original_site["site_config"]) - expected_site_config["socket"] = ( - "tcp", - { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }) + expected_site_config["socket"] = ("tcp", { + "address": ("1.2.3.4", 6557), + "tls": ("plain_text", {}), + }) try: web.set_site(new_site_id, new_site_config) @@ -253,17 +247,13 @@ def test_set_site(web, site, sock_spec): web.delete_site(new_site_id) -(a)pytest.mark.parametrize( - "sock_spec", - [ - "tcp:1.2.3.4:6557", - ( - "tcp", - { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }), - ]) +(a)pytest.mark.parametrize("sock_spec", [ + "tcp:1.2.3.4:6557", + ("tcp", { + "address": ("1.2.3.4", 6557), + "tls": ("plain_text", {}), + }), +]) def test_set_all_sites(web, site, sock_spec): response = web.get_all_sites() del response["configuration_hash"] @@ -274,12 +264,10 @@ def test_set_all_sites(web, site, sock_spec): new_site_config["socket"] = sock_spec expected_site_config = copy.deepcopy(copy.deepcopy(response["sites"][site.id])) - expected_site_config["socket"] = ( - "tcp", - { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }) + expected_site_config["socket"] = ("tcp", { + "address": ("1.2.3.4", 6557), + "tls": ("plain_text", {}), + }) response["sites"][new_site_id] = new_site_config

5 years, 7 months

7140 FIX postgres_instance: go to state CRIT if psql has been stopped

by Moritz Kiemer

Module: check_mk Branch: master Commit: d0c194284d2f90eb414fc5b1a259a80597f21815 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0c194284d2f90… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 6 08:13:05 2019 +0100 7140 FIX postgres_instance: go to state CRIT if psql has been stopped Change-Id: I7e71b74acacc575e1ff09a17a50a82ae8d80cff4 --- .werks/7140 | 10 ++++++++++ checks/postgres_instances | 17 +++++++---------- checks/postgres_version | 27 ++++++++++++++++----------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.werks/7140 b/.werks/7140 new file mode 100644 index 0000000..b19f994 --- /dev/null +++ b/.werks/7140 @@ -0,0 +1,10 @@ +Title: postgres_instance: go to state CRIT if psql has been stopped +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549437078 +Class: fix + + diff --git a/checks/postgres_instances b/checks/postgres_instances index 199b466..8c0ffdf 100644 --- a/checks/postgres_instances +++ b/checks/postgres_instances @@ -47,29 +47,26 @@ def parse_postgres_instances(info): if line[0].startswith("[[[") and line[0].endswith("]]]"): db_id = line[0][3:-3] is_single = True + parsed.setdefault(db_id.upper(), {}) elif len(line) >= 4: if not is_single: db_id = line[3].split("/")[-1] - parsed.setdefault(db_id.upper(), {"pid": line[0]}) + parsed.update(db_id.upper(), {"pid": line[0]}) return parsed -def inventory_postgres_instances(parsed): - for db_id in parsed: - yield db_id, None - - -def check_postgres_instances(item, params, parsed): - if item in parsed: - return 0, "Status: running with PID %s" % parsed[item]["pid"] +def check_postgres_instances(item, _no_params, parsed): + pid = parsed.get(item, {}).get("pid") + if pid is not None: + return 0, "Status: running with PID %s" % pid return 2, "Instance %s not running" % item check_info['postgres_instances'] = { 'parse_function': parse_postgres_instances, - 'inventory_function': inventory_postgres_instances, + 'inventory_function': discover(), 'check_function': check_postgres_instances, 'service_description': 'PostgreSQL Instance %s', } diff --git a/checks/postgres_version b/checks/postgres_version index 73db616..072d77d 100644 --- a/checks/postgres_version +++ b/checks/postgres_version @@ -26,11 +26,19 @@ # <<<postgres_version>>> # PostgreSQL 9.3.6 on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 4.8.2-19ubuntu1) 4.8.2, 64-bit - -# instance +# +# # instance # <<<postgres_version>>> # [[[foobar]]] # PostgreSQL 9.3.6 on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 4.8.2-19ubuntu1) 4.8.2, 64-bit +# +# # In case the server has been stopped: +# <<<postgres_version:sep(1)>>> +# +# psql: could not connect to server: No such file or directory +# Is the server running locally and accepting +# connections on Unix domain socket "/var/run/postgresql/.s.PGSQL.5437"? +# def parse_postgres_version(info): @@ -44,19 +52,16 @@ def parse_postgres_version(info): return parsed -def inventory_postgres_version(parsed): - for instance in parsed: - yield instance, None - - -def check_postgres_version(item, _no_params, parsed): - if item in parsed: - yield 0, parsed[item] +@get_parsed_item_data +def check_postgres_version(_no_item, _no_params, data): + if "could not connect" in data: + raise MKCounterWrapped("Login into database failed") + yield 0, data check_info['postgres_version'] = { "parse_function": parse_postgres_version, - "inventory_function": inventory_postgres_version, + "inventory_function": discover(), "check_function": check_postgres_version, "service_description": "PostgreSQL Version %s", }

5 years, 7 months

aws_ec2_summary: Removed WARN state if at least one instance is not running

by Simon Betz

Module: check_mk Branch: master Commit: b342d0876b83b74fdfd443e21c1053c102c787bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b342d0876b83b7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 6 16:04:26 2019 +0100 aws_ec2_summary: Removed WARN state if at least one instance is not running Change-Id: I0071a4de1891d2a5d6cf10672f9acd77afb4db57 --- checks/aws_ec2_summary | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/checks/aws_ec2_summary b/checks/aws_ec2_summary index b54c5a4..b6684b1 100644 --- a/checks/aws_ec2_summary +++ b/checks/aws_ec2_summary @@ -55,11 +55,7 @@ def check_aws_ec2_summary(item, params, parsed): yield 0, "Instances: %s" % sum([len(v) for v in instances_by_state.itervalues()]) for instance_state, instances in instances_by_state.iteritems(): - if instance_state == 'running': - state = 0 - else: - state = 1 - yield state, "%s: %s" % (instance_state, len(instances)) + yield 0, "%s: %s" % (instance_state, len(instances)) if long_output: yield 0, "\n%s" % "\n".join(long_output)

5 years, 7 months

7032 logwatch: Optional shared log pointer for several ip addresses

by Florian Kromer

Module: check_mk Branch: master Commit: 5481f3395227f315e084b2fa11e46b5a144fe0fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5481f3395227f3… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Jan 17 15:48:12 2019 +0100 7032 logwatch: Optional shared log pointer for several ip addresses For more details refer to the description of werk 7032. CMK-1349 Change-Id: I4bfa78987fcb2ae7c5ac70966ed00b64b6405759 --- .werks/7032 | 26 ++ agents/cfg_examples/logwatch.cfg | 23 ++ agents/plugins/mk_logwatch | 445 +++++++++++++++------ tests/unit/agents/plugins/test_mk_logwatch.py | 211 ++++++++++ .../unit/agents/plugins/test_mk_logwatch_bakery.py | 66 +++ 5 files changed, 656 insertions(+), 115 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5481f33952…

5 years, 7 months

aws_s3, aws_s3.summary: Show location and tagging information and renamed summary service

by Simon Betz

Module: check_mk Branch: master Commit: 0e423f8f4d6e22f27ce89f8c8b246be7eafe6fc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e423f8f4d6e22… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 6 13:16:56 2019 +0100 aws_s3, aws_s3.summary: Show location and tagging information and renamed summary service Change-Id: I8b4631ab5666873bcc7dda6c67c6283afdc65514 --- agents/special/agent_aws | 10 +++- checkman/{aws_s3_summary => aws_s3.summary} | 0 checks/aws_s3 | 86 +++++++++++++++++++++++++++-- checks/aws_s3_summary | 71 ------------------------ 4 files changed, 88 insertions(+), 79 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e507fdc..c204d3a 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -633,7 +633,7 @@ class S3Summary(AWSSectionGeneric): return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) def _create_results(self, computed_content): - return [AWSSectionResult("", computed_content.content)] + return [AWSSectionResult("", None)] class S3(AWSSectionCloudwatch): @@ -648,14 +648,14 @@ class S3(AWSSectionCloudwatch): def _get_colleague_contents(self): colleague = self._received_results.get('s3_summary') if colleague and colleague.content: - return AWSColleagueContents([bucket['Name'] for bucket in colleague.content], + return AWSColleagueContents({bucket['Name']: bucket for bucket in colleague.content}, colleague.cache_timestamp) return AWSColleagueContents([], 0) def _get_metrics(self, colleague_contents): metrics = [] idx = 0 - for bucket_name in colleague_contents.content: + for bucket_name in colleague_contents.content.iterkeys(): for metric_name, unit, storage_classes in [ ("BucketSizeBytes", "Bytes", [ "StandardStorage", @@ -689,6 +689,10 @@ class S3(AWSSectionCloudwatch): return metrics def _compute_content(self, raw_content, colleague_contents): + for row in raw_content.content: + bucket = colleague_contents.content.get(row['Label']) + if bucket: + row.update(bucket) return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) def _create_results(self, computed_content): diff --git a/checkman/aws_s3_summary b/checkman/aws_s3.summary similarity index 100% rename from checkman/aws_s3_summary rename to checkman/aws_s3.summary diff --git a/checks/aws_s3 b/checks/aws_s3 index 3c66361..5b0adf6 100644 --- a/checks/aws_s3 +++ b/checks/aws_s3 @@ -29,7 +29,16 @@ def parse_aws_s3(info): parsed = {} for row in parse_aws(info): splitted_row = row['Id'].split("_") - inst = parsed.setdefault(row['Label'], {}).setdefault(splitted_row[0], {}) + bucket = parsed.setdefault(row['Label'], {}) + try: + bucket['LocationConstraint'] = row['LocationConstraint'] + except KeyError: + pass + try: + bucket['Tagging'] = row['Tagging'] + except KeyError: + pass + inst = bucket.setdefault(splitted_row[0], {}) try: inst.setdefault(splitted_row[1], row['Values'][0]) except (IndexError, ValueError): @@ -37,20 +46,87 @@ def parse_aws_s3(info): return parsed +# .--S3 objects----------------------------------------------------------. +# | ____ _____ _ _ _ | +# | / ___|___ / ___ | |__ (_) ___ ___| |_ ___ | +# | \___ \ |_ \ / _ \| '_ \| |/ _ \/ __| __/ __| | +# | ___) |__) | | (_) | |_) | | __/ (__| |_\__ \ | +# | |____/____/ \___/|_.__// |\___|\___|\__|___/ | +# | |__/ | +# '----------------------------------------------------------------------' + +aws_s3_storage_mapping = { + "standardstorage": "Standard", + "standardiastorage": "IA", + "reducedredundancystorage": "Redundancy", +} + + @get_parsed_item_data -def check_aws_s3(item, params, metrics): - sum_size = sum(metrics['bucketsizebytes'].values()) - yield 0, 'Bucket size: %s' % get_bytes_human_readable(sum_size), [('bucket_size', sum_size)] +def check_aws_s3_objects(item, params, metrics): + bucket_sizes = metrics['bucketsizebytes'] + storage_infos = [] + for storage_type, value in bucket_sizes.iteritems(): + storage_infos.append( + "%s: %s" % (aws_s3_storage_mapping[storage_type], get_bytes_human_readable(value))) + sum_size = sum(bucket_sizes.values()) + yield (0, + 'Bucket size: %s (%s)' % (get_bytes_human_readable(sum_size), ", ".join(storage_infos)), + [('bucket_size', sum_size)]) num_objects = sum(metrics['numberofobjects'].values()) yield 0, 'Number of objects: %s' % int(num_objects), [('num_objects', num_objects)] + location = metrics.get('LocationConstraint') + if location: + yield 0, 'Location: %s' % location + + tag_infos = [] + for tag in metrics.get('Tagging', {}): + tag_infos.append("%s: %s" % (tag['Key'], tag['Value'])) + if tag_infos: + yield 0, '[Tags] %s' % ", ".join(tag_infos) + check_info['aws_s3'] = { 'parse_function': parse_aws_s3, 'inventory_function': discover(), - 'check_function': check_aws_s3, + 'check_function': check_aws_s3_objects, 'service_description': 'AWS/S3 Objects %s', 'has_perfdata': True, 'includes': ['aws.include'], } + +#. +# .--summary-------------------------------------------------------------. +# | | +# | ___ _ _ _ __ ___ _ __ ___ __ _ _ __ _ _ | +# | / __| | | | '_ ` _ \| '_ ` _ \ / _` | '__| | | | | +# | \__ \ |_| | | | | | | | | | | | (_| | | | |_| | | +# | |___/\__,_|_| |_| |_|_| |_| |_|\__,_|_| \__, | | +# | |___/ | +# '----------------------------------------------------------------------' + + +def check_aws_s3_summary(item, params, parsed): + sum_size = 0 + largest_bucket = None + largest_bucket_size = 0 + for bucket_name, bucket in parsed.iteritems(): + bucket_size = sum(bucket['bucketsizebytes'].values()) + sum_size += bucket_size + if bucket_size >= largest_bucket_size: + largest_bucket = bucket_name + largest_bucket_size = bucket_size + yield 0, 'Total size: %s' % get_bytes_human_readable(sum_size) + + if largest_bucket: + yield 0, 'Largest bucket: %s (%s)' % \ + (largest_bucket, get_bytes_human_readable(largest_bucket_size)) + + +check_info['aws_s3.summary'] = { + 'inventory_function': discover_single, + 'check_function': check_aws_s3_summary, + 'service_description': 'AWS/S3 Summary', +} diff --git a/checks/aws_s3_summary b/checks/aws_s3_summary deleted file mode 100644 index 91c7d48..0000000 --- a/checks/aws_s3_summary +++ /dev/null @@ -1,71 +0,0 @@ -#!/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 parse_aws_s3_summary(info): - parsed = {} - for row in parse_aws(info): - parsed.setdefault(row['Name'], row) - return parsed - - -def _extract_aws_s3_tags(metrics): - # metrics is dict with key 'Tagging' - return ", ".join( - ["%s: %s" % (pair['Key'], pair['Value']) for pair in metrics.get('Tagging', [])]) - - -def check_aws_s3_summary(item, params, parsed): - yield 0, '%s buckets' % len(parsed) - buckets_by_region = {} - long_output = [] - for bucket_name, row in parsed.iteritems(): - region = row['LocationConstraint'] - if not region: - region = "unknown" - - buckets_by_region.setdefault(region, []).append(row) - long_output_info = ["Bucket: %s, Region: %s" % (bucket_name, region)] - tags = _extract_aws_s3_tags(row) - if tags: - long_output_info.append("[Tags] %s" % tags) - long_output.append(", ".join(long_output_info)) - - for region, buckets in buckets_by_region.iteritems(): - region_readable = AWSRegions.get(region, 'unknown[%s]' % region) - yield 0, "%s: %s" % (region_readable, len(buckets)) - - if long_output: - yield 0, '\n%s' % '\n'.join(long_output) - - -check_info['aws_s3_summary'] = { - 'parse_function': parse_aws_s3_summary, - 'inventory_function': discover_single, - 'check_function': check_aws_s3_summary, - 'service_description': 'AWS/S3 Summary', - 'includes': ['aws.include'], -}

5 years, 7 months

agent_aws: WATO configuration of special agent allows tag filtering

by Simon Betz

Module: check_mk Branch: master Commit: 08dd9a0f6843ca26c7e61b8ab63b495ccf1d8929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08dd9a0f6843ca… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 4 14:13:12 2019 +0100 agent_aws: WATO configuration of special agent allows tag filtering Change-Id: I297024615d28af8447a610797ea037a98e5d465f --- agents/special/agent_aws | 251 ++++++++++++++++++++-------- checks/agent_aws | 62 +++++-- cmk/gui/plugins/wato/datasource_programs.py | 102 ++++++++--- tests/unit/checks/test_agent_aws.py | 24 +-- 4 files changed, 314 insertions(+), 125 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08dd9a0f68…

5 years, 7 months

Fix duplicate filters in some views after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 797d7a316375b17d353db9f5fd736ec52abe10ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=797d7a316375b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 15:06:18 2019 +0100 Fix duplicate filters in some views after recent refactoring Peer reviewed by ON. Change-Id: I2f8f0d26897dffa888289406baa94c58f692c555 --- cmk/gui/visuals.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 011e363..a6ebd3e 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -1087,24 +1087,24 @@ def filters_of_visual(visual, info_keys, link_filters=None): if link_filters is None: link_filters = [] - filters = [] + filters = {} for info_key in info_keys: if info_key in visual['single_infos']: for key in info_params(info_key): - filters.append(get_filter(key)) + filters[key] = get_filter(key) continue for key, val in visual['context'].items(): if isinstance(val, dict): # this is a real filter try: - filters.append(get_filter(key)) + filters[key] = get_filter(key) except KeyError: pass # Silently ignore not existing filters # See get_link_filter_names() comment for details for key, dst_key in get_link_filter_names(visual, info_keys, link_filters): - filters.append(get_filter(dst_key)) + filters[dst_key] = get_filter(dst_key) # add ubiquitary_filters that are possible for these infos for fn in get_ubiquitary_filters(): @@ -1114,9 +1114,9 @@ def filters_of_visual(visual, info_keys, link_filters=None): if fn == "wato_folder" and (not filter_.available() or 'host' in visual['single_infos']): continue if not filter_.info or filter_.info in info_keys: - filters.append(filter_) + filters[fn] = filter_ - return list(set(filters)) # remove duplicates + return filters.values() # TODO: Cleanup this special case

5 years, 7 months

Fixed broken link

by Lars Michelsen

Module: check_mk Branch: master Commit: b4a7daeda5ed84f0c776321de95172605ad27332 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4a7daeda5ed84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 13:38:35 2019 +0100 Fixed broken link Change-Id: Ib0a6fd25aece6ba4da5c5c4b3a9c87cc8f4f20af --- cmk/gui/watolib/sites.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/watolib/sites.py b/cmk/gui/watolib/sites.py index 340d5f7..cf7cfc4 100644 --- a/cmk/gui/watolib/sites.py +++ b/cmk/gui/watolib/sites.py @@ -188,7 +188,7 @@ class SiteManagement(object): "transport. Starting with Check_MK 1.6 it is possible to use encrypted Livestatus " "communication. Sites created with 1.6 will automatically use encrypted communication " "by default. Sites created with previous versions need to be configured manually to " - "enable the encryption. Have a look at <a href=\"werks.py?werk=7017\">werk #7017</a> " + "enable the encryption. Have a look at <a href=\"werk.py?werk=7017\">werk #7017</a> " "for further information."), )

5 years, 7 months

Fix braino in last commit

by Konstantin Büttner

Module: check_mk Branch: master Commit: eef7a3fb32f52912d9b4ca3590b3fbe768b18763 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eef7a3fb32f529… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 6 12:21:20 2019 +0100 Fix braino in last commit Change-Id: I8208d8cd085f2368888038903840eb1bf7fe00ef --- agents/windows/frozen_binaries/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/frozen_binaries/Makefile b/agents/windows/frozen_binaries/Makefile index 05a7155..b0fe5b3 100644 --- a/agents/windows/frozen_binaries/Makefile +++ b/agents/windows/frozen_binaries/Makefile @@ -37,7 +37,7 @@ mk_logwatch.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredis cp $(BUILD_DIR)/drive_c/compile/dist/mk_logwatch.exe ../plugins rm -rf $(BUILD_DIR) -mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x87.exe $(PLUGINS_DIR)/mk_jolokia.py +mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x86.exe $(PLUGINS_DIR)/mk_jolokia.py mkdir $(BUILD_DIR) ; \ cd $(BUILD_DIR) ; \ cp -pr $(CURDIR)/src/* . ; \

5 years, 7 months

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019