dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove init checks for valid label and field selectors (#7198)

Browse Source 
Importing k8s.io/klog starts a long running goroutine at init time.
This commit is contained in:
Daniel Nelson
2020-03-18 13:48:29 -07:00
committed by GitHub
parent f11a2f80c4
commit 9fbf288518
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/inputs/prometheus/prometheus.go
View File

@@ -15,8 +15,6 @@ import (
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/tls"
"github.com/influxdata/telegraf/plugins/inputs"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
)
const acceptHeader = `application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited;q=0.7,text/plain;version=0.0.4;q=0.3,*/*;q=0.1`
@@ -138,20 +136,6 @@ func (p *Prometheus) Init() error {
p.Log.Warnf("Use of deprecated configuration: 'metric_version = 1'; please update to 'metric_version = 2'")
}
if len(p.KubernetesLabelSelector) > 0 {
_, err := labels.Parse(p.KubernetesLabelSelector)
if err != nil {
return fmt.Errorf("label selector validation failed %q: %v", p.KubernetesLabelSelector, err)
}
}
if len(p.KubernetesFieldSelector) > 0 {
_, err := fields.ParseSelector(p.KubernetesFieldSelector)
if err != nil {
return fmt.Errorf("field selector validation failed %s: %v", p.KubernetesFieldSelector, err)
}
}
return nil
}