mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-30 07:59:40 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #1412 from prometheus/fingerprintfix

Browse source 
Remove fullLabels method and fix target updating
This commit is contained in:
Brian Brazil 2016-02-22 12:11:08 +00:00
parent 209c4ad64f 6df1f49c13
commit 04946afd0a
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
retrieval/target.go
View file

@ -405,18 +405,6 @@ func (t *Target) InstanceIdentifier() string {
return t.host() return t.host()
} }
func (t *Target) fullLabels() model.LabelSet {
t.RLock()
defer t.RUnlock()
lset := t.labels.Clone()
if _, ok := lset[model.InstanceLabel]; !ok {
lset[model.InstanceLabel] = t.labels[model.AddressLabel]
}
return lset
}
// RunScraper implements Target. // RunScraper implements Target.
func (t *Target) RunScraper(sampleAppender storage.SampleAppender) { func (t *Target) RunScraper(sampleAppender storage.SampleAppender) {
defer close(t.scraperStopped) defer close(t.scraperStopped)

2
retrieval/targetmanager.go
View file

@ -278,7 +278,7 @@ func (tm *TargetManager) updateTargetGroup(tgroup *config.TargetGroup, cfg *conf
// to build up. // to build up.
wg.Add(1) wg.Add(1)
go func(t *Target) { go func(t *Target) {
if err := match.Update(cfg, t.fullLabels(), t.metaLabels); err != nil { if err := match.Update(cfg, t.labels, t.metaLabels); err != nil {
log.Errorf("Error updating target %v: %v", t, err) log.Errorf("Error updating target %v: %v", t, err)
} }
wg.Done() wg.Done()