Skip to content

Commit 8840fd9

Browse files
committed
cloud metadata: fix overwriting labels with empty values
1 parent 2163f5f commit 8840fd9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

node/collector.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,20 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
236236
if c.instanceMetadata != nil {
237237
im = *c.instanceMetadata
238238
}
239-
if flags.Provider != nil {
240-
im.Provider = metadata.CloudProvider(flags.GetString(flags.Provider))
239+
if f := flags.GetString(flags.Provider); f != "" {
240+
im.Provider = metadata.CloudProvider(f)
241241
}
242-
if flags.Region != nil {
243-
im.Region = flags.GetString(flags.Region)
242+
if f := flags.GetString(flags.Region); f != "" {
243+
im.Region = f
244244
}
245-
if flags.AvailabilityZone != nil {
246-
im.AvailabilityZone = flags.GetString(flags.AvailabilityZone)
245+
if f := flags.GetString(flags.AvailabilityZone); f != "" {
246+
im.AvailabilityZone = f
247247
}
248-
if flags.InstanceType != nil {
249-
im.InstanceType = flags.GetString(flags.InstanceType)
248+
if f := flags.GetString(flags.InstanceType); f != "" {
249+
im.InstanceType = f
250250
}
251-
if flags.InstanceLifeCycle != nil {
252-
im.LifeCycle = flags.GetString(flags.InstanceLifeCycle)
251+
if f := flags.GetString(flags.InstanceLifeCycle); f != "" {
252+
im.LifeCycle = f
253253
}
254254
ch <- gauge(cloudInfoDesc, 1,
255255
string(im.Provider), im.AccountId, im.InstanceId, im.InstanceType, im.LifeCycle,

0 commit comments

Comments
 (0)