[checkmk-commits] aws_s3*: Renamed for uniformity

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', }