mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #8737 from roidelapluie/scwpointer

Browse source 
scaleway_sd_config: be more cautious with pointers
This commit is contained in:
Julien Pivotto 2021-04-20 12:07:33 +02:00 committed by GitHub
parent a9a5f04ff9 73237c04bf
commit 5f4a5e79ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
discovery/scaleway/instance.go
View file

@ -134,23 +134,32 @@ func (d *instanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group,
var targets []model.LabelSet var targets []model.LabelSet
for _, server := range servers.Servers { for _, server := range servers.Servers {
labels := model.LabelSet{ labels := model.LabelSet{
instanceBootTypeLabel: model.LabelValue(server.BootType), instanceBootTypeLabel: model.LabelValue(server.BootType),
instanceHostnameLabel: model.LabelValue(server.Hostname), instanceHostnameLabel: model.LabelValue(server.Hostname),
instanceIDLabel: model.LabelValue(server.ID), instanceIDLabel: model.LabelValue(server.ID),
instanceImageArchLabel: model.LabelValue(server.Image.Arch), instanceNameLabel: model.LabelValue(server.Name),
instanceImageIDLabel: model.LabelValue(server.Image.ID), instanceOrganizationLabel: model.LabelValue(server.Organization),
instanceImageNameLabel: model.LabelValue(server.Image.Name), instanceProjectLabel: model.LabelValue(server.Project),
instanceLocationClusterID: model.LabelValue(server.Location.ClusterID), instanceStateLabel: model.LabelValue(server.State),
instanceLocationHypervisorID: model.LabelValue(server.Location.HypervisorID), instanceTypeLabel: model.LabelValue(server.CommercialType),
instanceLocationNodeID: model.LabelValue(server.Location.NodeID), instanceZoneLabel: model.LabelValue(server.Zone.String()),
instanceNameLabel: model.LabelValue(server.Name), }
instanceOrganizationLabel: model.LabelValue(server.Organization),
instanceProjectLabel: model.LabelValue(server.Project), if server.Image != nil {
instanceSecurityGroupIDLabel: model.LabelValue(server.SecurityGroup.ID), labels[instanceImageArchLabel] = model.LabelValue(server.Image.Arch)
instanceSecurityGroupNameLabel: model.LabelValue(server.SecurityGroup.Name), labels[instanceImageIDLabel] = model.LabelValue(server.Image.ID)
instanceStateLabel: model.LabelValue(server.State), labels[instanceImageNameLabel] = model.LabelValue(server.Image.Name)
instanceTypeLabel: model.LabelValue(server.CommercialType), }
instanceZoneLabel: model.LabelValue(server.Zone.String()),
if server.Location != nil {
labels[instanceLocationClusterID] = model.LabelValue(server.Location.ClusterID)
labels[instanceLocationHypervisorID] = model.LabelValue(server.Location.HypervisorID)
labels[instanceLocationNodeID] = model.LabelValue(server.Location.NodeID)
}
if server.SecurityGroup != nil {
labels[instanceSecurityGroupIDLabel] = model.LabelValue(server.SecurityGroup.ID)
labels[instanceSecurityGroupNameLabel] = model.LabelValue(server.SecurityGroup.Name)
} }
if region, err := server.Zone.Region(); err == nil { if region, err := server.Zone.Region(); err == nil {