Module: check_mk
Branch: master
Commit: e70c81d6cbf593d174490c81062a56047568deba
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70c81d6cbf593…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Feb 1 15:33:58 2019 +0100
aws_ec2: Fixed KeyError: 'Instances'
Change-Id: I6ff834ed0ff4e98fabb0eaa21112fb45b459dd11
---
checks/aws_ec2_summary | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/checks/aws_ec2_summary b/checks/aws_ec2_summary
index 62c0b0c..b54c5a4 100644
--- a/checks/aws_ec2_summary
+++ b/checks/aws_ec2_summary
@@ -30,14 +30,6 @@ 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', [])])
@@ -46,16 +38,16 @@ def _extract_aws_ec2_tags(metrics):
def check_aws_ec2_summary(item, params, parsed):
instances_by_state = {}
long_output = []
- for reservation in parsed:
- for instance in reservation['Instances']:
+ for instances in parsed:
+ for instance_name, instance in instances.iteritems():
instance_id = instance['InstanceId']
instance_state = instance['State']['Name']
instances_by_state.setdefault(instance_state, []).append(instance_id)
- 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)
+ prefix = ""
+ if instance_name != instance_id:
+ prefix = "[%s] " % instance_name
+ long_output_info = ["%s%s: %s" % (prefix, instance_id,
instance_state)]
tags = _extract_aws_ec2_tags(instance)
if tags:
long_output_info.append("[Tags] %s" % tags)