[checkmk-commits] aws.include: Fixed load balancer summary check

Module: check_mk Branch: master Commit: 19cd2ee709da48a8ac96a4045c1ceb59b1cd2cf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19cd2ee709da48… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:14:30 2019 +0200 aws.include: Fixed load balancer summary check Change-Id: Ib5e1cc3840ad1fa387894443e244a90436adfe07 --- checks/aws.include | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/checks/aws.include b/checks/aws.include index d3a8d75..9323315 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -94,7 +94,17 @@ def check_aws_elb_summary_generic(item, params, load_balancers): balancer_name = row['LoadBalancerName'] avail_zones_txt = [] for avail_zone in row['AvailabilityZones']: - avail_zone_readable = "%s (%s)" % (AWSRegions[avail_zone[:-1]], avail_zone[-1]) + if isinstance(avail_zone, dict): + # elb vs. elbv2 + # elb provides a list of zones, elbv2 a list of dicts + # including zone name + avail_zone = avail_zone['ZoneName'] + + try: + avail_zone_readable = "%s (%s)" % (AWSRegions[avail_zone[:-1]], avail_zone[-1]) + except KeyError: + avail_zone_readable = 'unknown (%s)' % avail_zone + balancers_by_avail_zone.setdefault(avail_zone_readable, []).append(balancer_name) avail_zones_txt.append(avail_zone_readable) long_output.append("Balancer: %s, Availability zones: %s"\