mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-13 06:47:28 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #6350 from geobeau/fix-exported-relabel

Browse source 
Fix relabaling collision when using exported labels
This commit is contained in:
Björn Rabenstein 2019-11-26 13:19:18 +01:00 committed by GitHub
parent 80ba03c67d 5cb7987314
commit bd1c66861a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scrape/scrape.go
View file

@ -451,9 +451,9 @@ func mutateSampleLabels(lset labels.Labels, target *Target, honor bool, rc []*re
for _, l := range target.Labels() { for _, l := range target.Labels() {
// existingValue will be empty if l.Name doesn't exist. // existingValue will be empty if l.Name doesn't exist.
existingValue := lset.Get(l.Name) existingValue := lset.Get(l.Name)
// Because setting a label with an empty value is a no-op, if existingValue != "" {
// this will only create the prefixed label if necessary. lb.Set(model.ExportedLabelPrefix+l.Name, existingValue)
lb.Set(model.ExportedLabelPrefix+l.Name, existingValue) }
// It is now safe to set the target label. // It is now safe to set the target label.
lb.Set(l.Name, l.Value) lb.Set(l.Name, l.Value)
} }

9
scrape/scrape_test.go
View file

@ -935,6 +935,15 @@ func TestScrapeLoopAppend(t *testing.T) {
discoveryLabels: []string{"n", "2"}, discoveryLabels: []string{"n", "2"},
expLset: labels.FromStrings("__name__", "metric", "exported_n", "1", "n", "2"), expLset: labels.FromStrings("__name__", "metric", "exported_n", "1", "n", "2"),
expValue: 0, expValue: 0,
}, {
// When "honor_labels" is not set
// exported label from discovery don't get overwritten
title: "Label name collision",
honorLabels: false,
scrapeLabels: `metric 0`,
discoveryLabels: []string{"n", "2", "exported_n", "2"},
expLset: labels.FromStrings("__name__", "metric", "n", "2", "exported_n", "2"),
expValue: 0,
}, { }, {
// Labels with no value need to be removed as these should not be ingested. // Labels with no value need to be removed as these should not be ingested.
title: "Delete Empty labels", title: "Delete Empty labels",