Module: check_mk
Branch: master
Commit: 72ae64443fd20cd8b6f6652977fc4ac8f1624bec
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72ae64443fd20c…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Thu Apr 25 14:19:49 2019 +0200
agent_aws: Fixed confusion of different labels sections
Change-Id: I002c3b1309525001ae9f7a1db662eb0ee75815ba
---
cmk/special_agents/agent_aws.py | 14 +++++++++-----
.../cmk/special_agents/agent_aws/test_agent_aws_ec2.py | 2 +-
.../cmk/special_agents/agent_aws/test_agent_aws_elb.py | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py
index 4da6a12..cb3ed5f 100644
--- a/cmk/special_agents/agent_aws.py
+++ b/cmk/special_agents/agent_aws.py
@@ -778,10 +778,6 @@ class AWSSectionLimits(AWSSection):
class AWSSectionLabels(AWSSection):
__metaclass__ = abc.ABCMeta
- @property
- def name(self):
- return "labels"
-
def _create_results(self, computed_content):
assert isinstance(
computed_content.content,
@@ -1199,6 +1195,10 @@ class EC2Summary(AWSSectionGeneric):
class EC2Labels(AWSSectionLabels):
@property
+ def name(self):
+ return "ec2_labels"
+
+ @property
def interval(self):
return 300
@@ -1729,6 +1729,10 @@ class ELBLabelsGeneric(AWSSectionLabels):
self._resource = resource
@property
+ def name(self):
+ return "elb_generic_labels"
+
+ @property
def interval(self):
return 300
@@ -2799,7 +2803,7 @@ class AWSSections(object):
self._write_section_result(section_name, cached_suffix, result)
def _write_section_result(self, section_name, cached_suffix, result):
- if section_name == "labels":
+ if section_name.endswith("labels"):
section_header = "<<<%s:sep(0)%s>>>\n" %
(section_name, cached_suffix)
else:
section_header = "<<<aws_%s%s>>>\n" %
(section_name, cached_suffix)
diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py
b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py
index 5c5f3c0..2c95ad0 100644
--- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py
+++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_ec2.py
@@ -894,7 +894,7 @@ def test_agent_aws_ec2_result_distribution():
#--EC2Labels------------------------------------------------------------
assert ec2_labels.interval == 300
- assert ec2_labels.name == "labels"
+ assert ec2_labels.name == "ec2_labels"
#--EC2SecurityGroups----------------------------------------------------
assert ec2_security_groups.interval == 300
diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py
b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py
index 89490dd..c0d34f7 100644
--- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py
+++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py
@@ -416,7 +416,7 @@ def test_agent_aws_elb_result_distribution(tags, found_instances,
found_instance
#--ELBLabels------------------------------------------------------------
assert elb_labels.interval == 300
- assert elb_labels.name == "labels"
+ assert elb_labels.name == "elb_generic_labels"
assert len(elb_labels_results) == len(found_instances_with_labels)
for result in elb_labels_results:
assert result.piggyback_hostname in found_instances_with_labels