RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retrieval: handle nil target groups from updates

This commit is contained in:
Fabian Reinartz 2016-05-25 16:59:16 -07:00
parent 8fe8ccce63
commit 4e087165aa
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retrieval/targetmanager.go
View File

@ -288,6 +288,9 @@ func (ts *targetSet) runProviders(ctx context.Context, providers map[string]Targ
} }
// First set of all targets the provider knows. // First set of all targets the provider knows.
for _, tgroup := range initial { for _, tgroup := range initial {
if tgroup == nil {
continue
}
targets, err := targetsFromGroup(tgroup, ts.config) targets, err := targetsFromGroup(tgroup, ts.config)
if err != nil { if err != nil {
log.With("target_group", tgroup).Errorf("Target update failed: %s", err) log.With("target_group", tgroup).Errorf("Target update failed: %s", err)
@ -333,6 +336,9 @@ func (ts *targetSet) runProviders(ctx context.Context, providers map[string]Targ
// update handles a target group update from a target provider identified by the name. // update handles a target group update from a target provider identified by the name.
func (ts *targetSet) update(name string, tgroup *config.TargetGroup) error { func (ts *targetSet) update(name string, tgroup *config.TargetGroup) error {
if tgroup == nil {
return nil
}
targets, err := targetsFromGroup(tgroup, ts.config) targets, err := targetsFromGroup(tgroup, ts.config)
if err != nil { if err != nil {
return err return err