mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Describe EC2 availability zone IDs at most once per refresh (#9142)

Browse source 
Signed-off-by: George Brighton <george@gebn.co.uk>
This commit is contained in:
George Brighton 2021-08-02 13:55:54 +01:00
parent 24165adadc
commit a715dd84ec
No known key found for this signature in database
GPG key ID: EB1FF129E25E4DA5
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
discovery/aws/ec2.go
View file

@ -194,24 +194,35 @@ func (d *EC2Discovery) ec2Client(ctx context.Context) (*ec2.EC2, error) {
return d.ec2, nil return d.ec2, nil
} }
func (d *EC2Discovery) azID(ctx context.Context, az string) (string, error) { func (d *EC2Discovery) azID(ctx context.Context, az string, azIDsRefreshAttempted *bool) (string, error) {
if azID, ok := d.azToAZID[az]; ok { if azID, ok := d.azToAZID[az]; ok {
return azID, nil return azID, nil
} }
if !*azIDsRefreshAttempted {
*azIDsRefreshAttempted = true
if err := d.refreshAZIDs(ctx); err != nil {
return "", err
}
if azID, ok := d.azToAZID[az]; ok {
return azID, nil
}
}
return "", fmt.Errorf("no availability zone ID mapping found for %s", az)
}
func (d *EC2Discovery) refreshAZIDs(ctx context.Context) error {
azs, err := d.ec2.DescribeAvailabilityZonesWithContext(ctx, &ec2.DescribeAvailabilityZonesInput{}) azs, err := d.ec2.DescribeAvailabilityZonesWithContext(ctx, &ec2.DescribeAvailabilityZonesInput{})
if err != nil { if err != nil {
return "", errors.Wrap(err, "could not describe availability zones") // Likely due to missing ec2:DescribeAvailabilityZones.
return errors.Wrap(err, "could not describe availability zones")
} }
d.azToAZID = make(map[string]string, len(azs.AvailabilityZones)) d.azToAZID = make(map[string]string, len(azs.AvailabilityZones))
for _, az := range azs.AvailabilityZones { for _, az := range azs.AvailabilityZones {
d.azToAZID[*az.ZoneName] = *az.ZoneId d.azToAZID[*az.ZoneName] = *az.ZoneId
} }
return nil
if azID, ok := d.azToAZID[az]; ok {
return azID, nil
}
return "", fmt.Errorf("no availability zone ID mapping found for %s", az)
} }
func (d *EC2Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error) { func (d *EC2Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error) {
@ -233,14 +244,14 @@ func (d *EC2Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error
} }
input := &ec2.DescribeInstancesInput{Filters: filters} input := &ec2.DescribeInstancesInput{Filters: filters}
azIDsRefreshAttempted := false
if err := ec2Client.DescribeInstancesPagesWithContext(ctx, input, func(p *ec2.DescribeInstancesOutput, lastPage bool) bool { if err := ec2Client.DescribeInstancesPagesWithContext(ctx, input, func(p *ec2.DescribeInstancesOutput, lastPage bool) bool {
for _, r := range p.Reservations { for _, r := range p.Reservations {
for _, inst := range r.Instances { for _, inst := range r.Instances {
if inst.PrivateIpAddress == nil { if inst.PrivateIpAddress == nil {
continue continue
} }
azID, err := d.azID(ctx, *inst.Placement.AvailabilityZone) azID, err := d.azID(ctx, *inst.Placement.AvailabilityZone, &azIDsRefreshAttempted)
if err != nil { if err != nil {
level.Warn(d.logger).Log( level.Warn(d.logger).Log(
"msg", "Unable to determine availability zone ID", "msg", "Unable to determine availability zone ID",