mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-05 04:16:15 +02:00
Code Issues Projects Releases Wiki Activity

fix(discovery): apply EC2 SD endpoint and guard refreshAZIDs nils (#18133)

Browse Source 
Signed-off-by: Aurelien Duboc <aurelienduboc96@gmail.com>
This commit is contained in:
Aurélien Duboc 2026-02-24 12:12:57 +01:00 committed by GitHub
parent 8f1f1f3146
commit 1a5da4fbe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
discovery/aws/ec2.go
View File

@ -224,7 +224,12 @@ func (d *EC2Discovery) ec2Client(ctx context.Context) (ec2Client, error) {
cfg.Credentials = aws.NewCredentialsCache(assumeProvider)
}
d.ec2 = ec2.NewFromConfig(cfg)
d.ec2 = ec2.NewFromConfig(cfg, func(options *ec2.Options) {
if d.cfg.Endpoint != "" {
options.BaseEndpoint = &d.cfg.Endpoint
}
options.HTTPClient = httpClient
})
return d.ec2, nil
}
@ -234,8 +239,15 @@ func (d *EC2Discovery) refreshAZIDs(ctx context.Context) error {
if err != nil {
return err
}
if azs.AvailabilityZones == nil {
d.azToAZID = make(map[string]string)
return nil
}
d.azToAZID = make(map[string]string, len(azs.AvailabilityZones))
for _, az := range azs.AvailabilityZones {
if az.ZoneName == nil || az.ZoneId == nil {
continue
}
d.azToAZID[*az.ZoneName] = *az.ZoneId
}
return nil

7
discovery/aws/lightsail.go
View File

@ -188,7 +188,12 @@ func (d *LightsailDiscovery) lightsailClient(ctx context.Context) (*lightsail.Cl
cfg.Credentials = aws.NewCredentialsCache(assumeProvider)
}
d.lightsail = lightsail.NewFromConfig(cfg)
d.lightsail = lightsail.NewFromConfig(cfg, func(options *lightsail.Options) {
if d.cfg.Endpoint != "" {
options.BaseEndpoint = &d.cfg.Endpoint
}
options.HTTPClient = httpClient
})
return d.lightsail, nil
}