Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: dc701dfb3aac5acdfce97e06b8803d8833d0b45b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc701dfb3aac5a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 16:53:37 2019 +0100 mem: remove unused variable Change-Id: I074b512cba50114b7a1df626b2eee05bf5ff00d1 --- checks/mem | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/mem b/checks/mem index b512dd5..fad8250 100644 --- a/checks/mem +++ b/checks/mem @@ -582,7 +582,6 @@ def check_mem_windows(_no_item, params, info): used_kb = get_average( "mem.win.%s" % paramname, now, used_kb, average_min, initialize_zero=False) used_mb = used_kb / 1024.0 - free_mb = total_mb - used_mb perc = 100.0 * used_kb / total_kb infotext += ", %d min average: %s (%s)" % (average_min, get_percent_human_readable(perc),

5 years, 8 months

7133 FIX mem.win: Change label from "Commit Charge" to "Page file"

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8aadece285e705cab90fb78319d26d48f693b68a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aadece285e705… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 11:23:09 2019 +0100 7133 FIX mem.win: Change label from "Commit Charge" to "Page file" The agent actually reports total/available page file, so adjust the check output accordingly and replace the confusing "Commit Charge" label. This change only affects the displayed text. Change-Id: I312ef9e964d83421d26da415c9a2a3fe24a33709 --- .werks/7133 | 12 +++++++++ checkman/mem.win | 29 +++++----------------- checks/mem | 2 +- .../generictests/datasets/mem_win_regression.py | 4 +-- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.werks/7133 b/.werks/7133 new file mode 100644 index 0000000..7497b8b --- /dev/null +++ b/.werks/7133 @@ -0,0 +1,12 @@ +Title: mem.win: Change label from "Commit Charge" to "Page file" +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548670807 +Class: fix + +The agent actually reports total/available page file, so adjust the check output +accordingly and replace the confusing "Commit Charge" label. +This change only affects the displayed text. diff --git a/checkman/mem.win b/checkman/mem.win index 79c86cf..ae5c0b2 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -5,30 +5,13 @@ license: GPL distribution: check_mk description: This check measures the current usage of physical RAM and - of the commit charge. - The "commit charge" was previously confusingly named "pagefile". - Please note that Microsoft themselves use this naming in - some applications. - - Due to how Windows optimizes memory management, physical memory - is in practice almost always fully utilized. The Memory usage this - check displays says how much memory is actually required by processes, - in contrast to caches that could be freed if the need arises. - - In the same vein Windows may hold data in RAM and pagefile at the same - time or it may hold data in the pagefile even when there is RAM available, - when it determines this may improve performance. - As a result, the real pagefile usage is not only hard to - determine, it's also utterly useless when we want to determine - resource usage on the system. - - The commit charge instead tells us how much of the memory used in - total (RAM + swap) is really required, ignoring overlap and caches. - Commit Charge minus Memory Usage is approximately the amount - of the pagefile used for "relevant" data, but further optimizations - may lead to offsets (to the point where Commit Charge - Memory Usage - can be negative). + of the page file. + The page file metric is determined using the fields 'ullTotalPageFile' + (current committed memory limit for the system or the current + process, whichever is smaller) and 'ullAvailPageFile' (maximum + amount of memory the current process can commit) of the MEMORYSTATUSEX + structure as returned by the windows API function 'GlobalMemoryStatusEx'. item: {None} diff --git a/checks/mem b/checks/mem index d5ebd98..b512dd5 100644 --- a/checks/mem +++ b/checks/mem @@ -551,7 +551,7 @@ def check_mem_windows(_no_item, params, info): return warn, crit for title, prefix, paramname in [("Memory usage", "Mem", "memory"), - ("Commit Charge", "Page", "pagefile")]: + ("Page file", "Page", "pagefile")]: total_kb = meminfo.get("%sTotal" % prefix) free_kb = meminfo.get("%sFree" % prefix) diff --git a/tests/unit/checks/generictests/datasets/mem_win_regression.py b/tests/unit/checks/generictests/datasets/mem_win_regression.py index 86d1460..dae0614 100644 --- a/tests/unit/checks/generictests/datasets/mem_win_regression.py +++ b/tests/unit/checks/generictests/datasets/mem_win_regression.py @@ -25,7 +25,7 @@ checks = { ('memory', 16369.96875, 26213.990625, 29490.739453125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (0, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ + (0, 'Page file: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 77413.990625, 87090.739453125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]), @@ -35,7 +35,7 @@ checks = { ('memory', 16369.96875, 26214.48828125, 29490.48828125, 0, 32767.48828125), ('mem_total', 32767.48828125, None, None, None, None), ]), - (2, 'Commit Charge: 20.1% (19.04 GB/94.50 GB)', [ + (2, 'Page file: 20.1% (19.04 GB/94.50 GB)', [ ('pagefile', 19491.90625, 77275.48828125, 19353.48828125, 0, 96767.48828125), ('pagefile_total', 96767.48828125, None, None, None, None), ]),

5 years, 8 months

mk_jolokia: refactor towards instance class (7)

by Moritz Kiemer

Module: check_mk Branch: master Commit: b87c06f0ed12516640e1543146d524f48dff9bbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b87c06f0ed1251… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 10:07:13 2019 +0100 mk_jolokia: refactor towards instance class (7) Change-Id: I63622fab723c5ba96aac05873b33a65308ef3c88 --- agents/plugins/mk_jolokia.py | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 399694b..d36b4ad 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -268,7 +268,8 @@ class JolokiaInstance(object): return data -def fetch_url(request_url, post_data=None): +def fetch_url(request_url, data): + post_data = json.dumps(data) if data is not None else None if VERBOSE: sys.stderr.write("DEBUG: Fetching: %s\n" % request_url) try: @@ -277,34 +278,32 @@ def fetch_url(request_url, post_data=None): sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) except () if DEBUG else Exception, exc: sys.stderr.write("ERROR: %s\n\n" % exc) - return [] - return json_data - - -def fetch_var(inst, function, path, use_target=False): - - if use_target and inst.target: - post_data = inst.get_post_data(path, function) - json_data = fetch_url(inst.base_url, json.dumps(post_data)) - else: - request_url = "%s/%s/%s" % (inst.base_url, function, path) if path else inst.base_url + "/" - json_data = fetch_url(request_url) + return {} try: - obj = json.loads(json_data) + response = json.loads(json_data) except (ValueError, TypeError), exc: sys.stderr.write('ERROR: Invalid json code (%s)\n' % exc) sys.stderr.write(' Response %s\n' % json_data) - return [] + return {} - if obj.get('status', 200) != 200: - sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % inst.base_url) - sys.stderr.write(' Response: %s\n' % json_data) - return [] + if response.get('status', 200) != 200: + sys.stderr.write('ERROR: Invalid response when fetching url %r\n' % request_url) + return {} + + return response + + +def fetch_var(inst, function, path, use_target=False): + post_data = inst.get_post_data(path, function) + if use_target and inst.target: + use_url = inst.base_url + else: + use_url = "%s/%s/%s" % (inst.base_url, function, path) if path else inst.base_url + "/" + post_data = None + + obj = fetch_url(use_url, post_data) - # Only take the value of the object. If the value is an object - # take the first items first value. - # {'Catalina:host=localhost,path=\\/test,type=Manager': {'activeSessions': 0}} try: return obj['value'] except KeyError:

5 years, 8 months

mk_jolokia: stop making up responses

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0414324fe035e5804781781ac4388d999667fdce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0414324fe035e5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 12:55:03 2019 +0100 mk_jolokia: stop making up responses Change-Id: I330dc3765631c8d897d6eebde0ae503c5ce1aa66 --- agents/plugins/mk_jolokia.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index d36b4ad..bae81ba 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -172,6 +172,10 @@ class SkipInstance(RuntimeError): pass +class SkipMBean(RuntimeError): + pass + + def write_section(name, iterable): sys.stdout.write('<<<%s:sep(0)>>>\n' % name) for line in iterable: @@ -278,18 +282,18 @@ def fetch_url(request_url, data): sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) except () if DEBUG else Exception, exc: sys.stderr.write("ERROR: %s\n\n" % exc) - return {} + raise SkipMBean(exc) try: response = json.loads(json_data) except (ValueError, TypeError), exc: sys.stderr.write('ERROR: Invalid json code (%s)\n' % exc) sys.stderr.write(' Response %s\n' % json_data) - return {} + raise SkipMBean(exc) if response.get('status', 200) != 200: sys.stderr.write('ERROR: Invalid response when fetching url %r\n' % request_url) - return {} + raise SkipMBean("HTTP Error (%s)" % response.get('status')) return response @@ -307,9 +311,10 @@ def fetch_var(inst, function, path, use_target=False): try: return obj['value'] except KeyError: + msg = "not found: %s" % path if VERBOSE: - sys.stderr.write("ERROR: not found: %s\n" % path) - return [] + sys.stderr.write("ERROR: %s\n" % msg) + raise SkipMBean(msg) # convert single values into lists of items in @@ -412,6 +417,8 @@ def _process_queries(inst, queries): yield item, out_title, value except (IOError, socket.timeout): raise SkipInstance() + except SkipMBean: + continue except () if DEBUG else Exception: continue

5 years, 8 months

mk_jolokia: refactor towards instance class (6)

by Moritz Kiemer

Module: check_mk Branch: master Commit: cf5dfd0368979778d61f485c910264c99ceacd81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5dfd03689797… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 21:38:48 2019 +0100 mk_jolokia: refactor towards instance class (6) Change-Id: I6dbffb0ea6adf699bb63158f7372b01d77464e7e --- agents/plugins/mk_jolokia.py | 55 +++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index d086965..399694b 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -235,6 +235,7 @@ class JolokiaInstance(object): self.custom_vars = self.config.get("custom_vars", []) self.base_url = self._get_base_url() + self.target = self._get_target() def _get_base_url(self): return "%s://%s:%d/%s" % ( @@ -244,6 +245,28 @@ class JolokiaInstance(object): self.config["suburi"], ) + def _get_target(self): + url = self.config.get("service_url") + if url is None: + return {} + user = self.config.get("service_user") + if user is None: + return {"url": url} + return { + "url": url, + "user": user, + "password": self.config["service_password"], + } + + def get_post_data(self, path, function): + segments = path.strip("/").split("/") + data = {"mbean": segments[0], "attribute": segments[1]} + if len(segments) > 2: + data["path"] = segments[2] + data["type"] = function + data["target"] = self.target + return data + def fetch_url(request_url, post_data=None): if VERBOSE: @@ -258,26 +281,11 @@ def fetch_url(request_url, post_data=None): return json_data -def _get_post_data(path, service_url, service_user, service_password, function): - segments = path.strip("/").split("/") - data = {"mbean": segments[0], "attribute": segments[1]} - if len(segments) > 2: - data["path"] = segments[2] - data["type"] = function - - data["target"] = {"url": service_url} - if service_user: - data["target"]["user"] = service_user - data["target"]["password"] = service_password - - return json.dumps(data) - - -def fetch_var(inst, function, path, service_url, service_user, service_password): +def fetch_var(inst, function, path, use_target=False): - if service_url is not None: - post_data = _get_post_data(path, service_url, service_user, service_password, function) - json_data = fetch_url(inst.base_url, post_data) + if use_target and inst.target: + post_data = inst.get_post_data(path, function) + json_data = fetch_url(inst.base_url, json.dumps(post_data)) else: request_url = "%s/%s/%s" % (inst.base_url, function, path) if path else inst.base_url + "/" json_data = fetch_url(request_url) @@ -356,8 +364,7 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - values = fetch_var(inst, "read", path, inst.config["service_url"], inst.config["service_user"], - inst.config["service_password"]) + values = fetch_var(inst, "read", path, use_target=True) item_list = make_item_list((), values, itemspec) for subinstance, value in item_list: @@ -390,7 +397,7 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - value = fetch_var(inst, "search", mbean, None, None, None) + value = fetch_var(inst, "search", mbean) try: paths = make_item_list((), value, "")[0][1] except IndexError: @@ -514,11 +521,11 @@ def prepare_http_opener(inst): def generate_jolokia_info(inst): # Determine type of server - value = fetch_var(inst, "read", "", None, None, None) + value = fetch_var(inst, "read", "") server_info = make_item_list((), value, "") if not server_info: - sys.stderr.write("%s ERROR: Empty server info\n" % (inst.name,)) + sys.stderr.write("%s ERROR: Empty server info\n" % inst.name) raise SkipInstance() info_dict = dict(server_info)

5 years, 8 months

aws_s3_summary: Add tagging information to long output

by Simon Betz

Module: check_mk Branch: master Commit: 4e8666bed3f810c1e04b4950b2491e488a4a1481 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e8666bed3f810… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 28 13:08:21 2019 +0100 aws_s3_summary: Add tagging information to long output Change-Id: I95d6c6bec9c80ddd7fedfb4f42c0f69a8427b20f --- checks/aws.include | 22 ++++++++++++++++++++++ checks/aws_ec2_summary | 23 ++++++++++++++++++++++- checks/aws_s3_summary | 16 ++++++++++++++-- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/checks/aws.include b/checks/aws.include index 1e495ff..117375d 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -24,6 +24,28 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +AWSRegions = { + "ap-south-1": "Asia Pacific Mumbai", + "ap-northeast-3": "Asia Pacific Osaka-Local", + "ap-northeast-2": "Asia Pacific Seoul", + "ap-southeast-1": "Asia Pacific Singapore", + "ap-southeast-2": "Asia Pacific Sydney", + "ap-northeast-1": "Asia Pacific Tokyo", + "ca-central-1": "Canada Central", + "cn-north-1": "China Beijing", + "cn-northwest-1": "China Ningxia", + "eu-central-1": "EU Frankfurt", + "eu-west-1": "EU Ireland", + "eu-west-2": "EU London", + "eu-west-3": "EU Paris", + "eu-north-1": "EU Stockholm", + "sa-east-1": "South America Sao Paulo", + "us-east-2": "US East Ohio", + "us-east-1": "US East N. Virginia", + "us-west-1": "US West N. California", + "us-west-2": "US West Oregon", +} + def parse_aws(info): import json diff --git a/checks/aws_ec2_summary b/checks/aws_ec2_summary index b97ea7b..62c0b0c 100644 --- a/checks/aws_ec2_summary +++ b/checks/aws_ec2_summary @@ -30,6 +30,19 @@ def inventory_aws_ec2_summary(parsed): return [(None, {})] +def _extract_aws_ec2_security_groups(metrics): + # metrics is dict with key 'SecurityGroups' + return ", ".join([ + "%s: %s" % (pair['GroupId'], pair['GroupName']) + for pair in metrics.get('SecurityGroups', []) + ]) + + +def _extract_aws_ec2_tags(metrics): + # metrics is dict with key 'Tags' + return ", ".join(["%s: %s" % (pair['Key'], pair['Value']) for pair in metrics.get('Tags', [])]) + + def check_aws_ec2_summary(item, params, parsed): instances_by_state = {} long_output = [] @@ -38,7 +51,15 @@ def check_aws_ec2_summary(item, params, parsed): instance_id = instance['InstanceId'] instance_state = instance['State']['Name'] instances_by_state.setdefault(instance_state, []).append(instance_id) - long_output.append("Instance: %s, Status: %s" % (instance_id, instance_state)) + + long_output_info = ["Instance: %s, Status: %s" % (instance_id, instance_state)] + security_groups = _extract_aws_ec2_security_groups(instance) + if security_groups: + long_output_info.append("[Security groups] %s" % security_groups) + tags = _extract_aws_ec2_tags(instance) + if tags: + long_output_info.append("[Tags] %s" % tags) + long_output.append(", ".join(long_output_info)) yield 0, "Instances: %s" % sum([len(v) for v in instances_by_state.itervalues()]) for instance_state, instances in instances_by_state.iteritems(): diff --git a/checks/aws_s3_summary b/checks/aws_s3_summary index 48ddc66..93c5d8a 100644 --- a/checks/aws_s3_summary +++ b/checks/aws_s3_summary @@ -32,6 +32,12 @@ def parse_aws_s3(info): 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', [])]) + + # .--summary-------------------------------------------------------------. # | | # | ___ _ _ _ __ ___ _ __ ___ __ _ _ __ _ _ | @@ -50,11 +56,17 @@ def check_aws_s3_summary(item, params, parsed): region = row['LocationConstraint'] if not region: region = "unknown" + buckets_by_region.setdefault(region, []).append(row) - long_output.append("Bucket: %s, Region: %s" % (bucket_name, region)) + 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(): - yield 0, "%s: %s" % (region, len(buckets)) + 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)

5 years, 8 months

aws_s3*: Renamed for uniformity

by Simon Betz

Module: check_mk Branch: master Commit: 55dcc7a189a243b6ae76cc3cefcdaf7a99363d6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55dcc7a189a243… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 28 12:28:47 2019 +0100 aws_s3*: Renamed for uniformity Change-Id: Ia2ac3a8bad2e9a09c07d34febdef983004da4a72 --- agents/special/agent_aws | 10 +++++----- checkman/{aws_s3 => aws_s3_summary} | 0 checkman/{aws_s3.objects => aws_s3_summary.objects} | 0 checks/{aws_s3 => aws_s3_summary} | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index b1d4bff..a776ede 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -440,9 +440,9 @@ class EC2(AWSSectionCloudwatch): # '----------------------------------------------------------------------' -class S3(AWSSectionGeneric): +class S3Summary(AWSSectionGeneric): def __init__(self, client, distributor=None, buckets=None): - super(S3, self).__init__(client, distributor=distributor) + super(S3Summary, self).__init__(client, distributor=distributor) self._buckets = self._determine_buckets(buckets) def _determine_buckets(self, buckets): @@ -457,7 +457,7 @@ class S3(AWSSectionGeneric): @property def name(self): - return "s3" + return "s3_summary" @property def interval(self): @@ -981,14 +981,14 @@ class AWSSectionsUSEast(AWSSections): #---sections-------------------------------------------------------- ce = CostsAndUsage(ce_client) - s3 = S3(s3_client, buckets=kwargs.get('buckets')) + s3_summary = S3Summary(s3_client, buckets=kwargs.get('buckets')) #---register sections for execution--------------------------------- if 'ce' in self._services: self._sections.append(ce) if 's3' in self._services: - self._sections.append(s3) + self._sections.append(s3_summary) class AWSSectionsGeneric(AWSSections): diff --git a/checkman/aws_s3 b/checkman/aws_s3_summary similarity index 100% rename from checkman/aws_s3 rename to checkman/aws_s3_summary diff --git a/checkman/aws_s3.objects b/checkman/aws_s3_summary.objects similarity index 100% rename from checkman/aws_s3.objects rename to checkman/aws_s3_summary.objects diff --git a/checks/aws_s3 b/checks/aws_s3_summary similarity index 95% rename from checks/aws_s3 rename to checks/aws_s3_summary index 8a8e287..48ddc66 100644 --- a/checks/aws_s3 +++ b/checks/aws_s3_summary @@ -60,7 +60,7 @@ def check_aws_s3_summary(item, params, parsed): yield 0, '\n%s' % '\n'.join(long_output) -check_info['aws_s3'] = { +check_info['aws_s3_summary'] = { 'parse_function': parse_aws_s3, 'inventory_function': discover_single, 'check_function': check_aws_s3_summary, @@ -80,7 +80,7 @@ check_info['aws_s3'] = { @get_parsed_item_data -def check_aws_s3_objects(item, params, metrics): +def check_aws_s3_summary_objects(item, params, metrics): sum_size = 0 num_objects = 0 largest = None @@ -98,8 +98,8 @@ def check_aws_s3_objects(item, params, metrics): yield 0, 'Largest object: %s, %s' % (largest, get_bytes_human_readable(largest_size)) -check_info['aws_s3.objects'] = { +check_info['aws_s3_summary.objects'] = { 'inventory_function': discover(), - 'check_function': check_aws_s3_objects, + 'check_function': check_aws_s3_summary_objects, 'service_description': 'AWS/S3 Objects %s', }

5 years, 8 months

7132 mk_jolokia bakery rule: Define custom Mbeans per instance

by Moritz Kiemer

Module: check_mk Branch: master Commit: ac04e49c4cbf3615bf806691e35b486853d577e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac04e49c4cbf36… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 08:07:43 2019 +0100 7132 mk_jolokia bakery rule: Define custom Mbeans per instance The custom MBeans to fetch can now be configured on a per instance level as well. Change-Id: Ia46e7866c0b5f8890c528fe1b88e68795547e3a7 --- .werks/7132 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/7132 b/.werks/7132 new file mode 100644 index 0000000..6cb75b3 --- /dev/null +++ b/.werks/7132 @@ -0,0 +1,10 @@ +Title: mk_jolokia bakery rule: Define custom Mbeans per instance +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1548658943 +Class: feature + +The custom MBeans to fetch can now be configured on a per instance level as well.

5 years, 8 months

agent_aws: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 88bc03df8fcf6ec22fe7aabdb850fb00f8de6587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88bc03df8fcf6e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 28 12:13:25 2019 +0100 agent_aws: Minor cleanup Change-Id: Ie528c4d6898142e0b0fe4ae6c6f54ff402d0f2b8 --- agents/special/agent_aws | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 08eb0e3..b1d4bff 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -208,7 +208,7 @@ class AWSSectionCloudwatch(AWSSection): ) try: metrics = response['MetricDataResults'] - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) continue content.extend(metrics) @@ -277,7 +277,7 @@ class CostsAndUsage(AWSSectionGeneric): ) try: return response['ResultsByTime'] - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return [] @@ -315,7 +315,7 @@ class SecurityGroups(AWSSectionGeneric): response = self._client.describe_security_groups() try: return response['SecurityGroups'] - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return [] @@ -348,7 +348,7 @@ class EC2Summary(AWSSectionGeneric): response = self._client.describe_instances() try: reservations = response['Reservations'] - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return {} @@ -656,14 +656,14 @@ class EBSSummary(AWSSectionGeneric): response = self._client.describe_volumes() try: volumes = {r['VolumeId']: r for r in response['Volumes']} - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) volumes = {} response = self._client.describe_volume_status() try: volume_states = {r['VolumeId']: r for r in response['VolumeStatuses']} - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) volume_states = {} @@ -781,7 +781,7 @@ class Glacier(AWSSectionGeneric): response = self._client.list_vaults() try: vaults = {r['VaultName']: r for r in response['VaultList']} - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) vaults = {} @@ -789,7 +789,7 @@ class Glacier(AWSSectionGeneric): response = self._client.list_jobs(vaultName=vault_name) try: jobs = response['JobList'] - except KeyError, e: + except KeyError as e: logging.info("%s/%s: KeyError %s; Available are %s", self.name, vault_name, e, response.keys()) jobs = [] @@ -826,7 +826,7 @@ class CloudTrail(AWSSectionGeneric): response = self._client.describe_trails() try: trails = {trail['Name']: trail for trail in response['trailList']} - except KeyError, e: + except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) trails = {}

5 years, 8 months

aws_ec2: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 235e6e98800967d14bc7567e6d6ec1487ab4df6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=235e6e98800967… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 28 10:46:14 2019 +0100 aws_ec2: Minor cleanup Change-Id: I836007e82af4a0fc0303c75eac41ff08782b260b --- checks/aws_ec2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/aws_ec2 b/checks/aws_ec2 index 85a54ab..acafedc 100644 --- a/checks/aws_ec2 +++ b/checks/aws_ec2 @@ -46,7 +46,7 @@ def parse_aws_ec2(info): return -def inventory_aws_ec2_cpu_credits(parsed, required_metrics): +def inventory_aws_ec2_generic(parsed, required_metrics): metrics = parsed.get(EC2DefaultItemName, {}) for required_metric in required_metrics: if required_metric not in metrics: @@ -89,7 +89,7 @@ def check_aws_ec2_status_check(item, params, parsed): check_info['aws_ec2'] = { 'parse_function': parse_aws_ec2, 'inventory_function': - lambda p: inventory_aws_ec2_cpu_credits(p, ['StatusCheckFailed_System', 'StatusCheckFailed_Instance']), + lambda p: inventory_aws_ec2_generic(p, ['StatusCheckFailed_System', 'StatusCheckFailed_Instance']), 'check_function': check_aws_ec2_status_check, 'service_description': 'AWS/EC2 Status Check', 'includes': ['aws.include'], @@ -122,7 +122,7 @@ def check_aws_ec2_cpu_credits(item, params, parsed): check_info['aws_ec2.cpu_credits'] = { 'inventory_function': - lambda p: inventory_aws_ec2_cpu_credits(p, ['CPUCreditUsage', 'CPUCreditBalance']), + lambda p: inventory_aws_ec2_generic(p, ['CPUCreditUsage', 'CPUCreditBalance']), 'check_function': check_aws_ec2_cpu_credits, 'service_description': 'AWS/EC2 CPU Credits', 'group': 'aws_ec2_cpu_credits', @@ -152,7 +152,7 @@ def check_aws_ec2_cpu_util(item, params, parsed): check_info['aws_ec2.cpu_util'] = { - 'inventory_function': lambda p: inventory_aws_ec2_cpu_credits(p, ['CPUUtilization']), + 'inventory_function': lambda p: inventory_aws_ec2_generic(p, ['CPUUtilization']), 'check_function': check_aws_ec2_cpu_util, 'service_description': 'AWS/EC2 CPU utilization', 'group': 'cpu_utilization',

5 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
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