feat(inputs.prometheus): always apply kubernetes label and field sele…

…ctors
influxdata · Jul 14, 2023 · 67be135 · 67be135
1 parent 50b6a63
commit 67be135
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
@@ -166,25 +166,23 @@ func (p *Prometheus) Init() error {
 		p.MonitorKubernetesPodsMethod = MonitorMethodAnnotations
 	}
 
-	if p.isNodeScrapeScope || p.MonitorKubernetesPodsMethod != MonitorMethodAnnotations {
-		// Parse label and field selectors - will be used to filter pods after cAdvisor call
-		var err error
-		p.podLabelSelector, err = labels.Parse(p.KubernetesLabelSelector)
-		if err != nil {
-			return fmt.Errorf("error parsing the specified label selector(s): %w", err)
-		}
-		p.podFieldSelector, err = fields.ParseSelector(p.KubernetesFieldSelector)
-		if err != nil {
-			return fmt.Errorf("error parsing the specified field selector(s): %w", err)
-		}
-		isValid, invalidSelector := fieldSelectorIsSupported(p.podFieldSelector)
-		if !isValid {
-			return fmt.Errorf("the field selector %q is not supported for pods", invalidSelector)
-		}
-
-		p.Log.Infof("Using the label selector: %v and field selector: %v", p.podLabelSelector, p.podFieldSelector)
+	// Parse label and field selectors - will be used to filter pods after cAdvisor call
+	var err error
+	p.podLabelSelector, err = labels.Parse(p.KubernetesLabelSelector)
+	if err != nil {
+		return fmt.Errorf("error parsing the specified label selector(s): %w", err)
+	}
+	p.podFieldSelector, err = fields.ParseSelector(p.KubernetesFieldSelector)
+	if err != nil {
+		return fmt.Errorf("error parsing the specified field selector(s): %w", err)
+	}
+	isValid, invalidSelector := fieldSelectorIsSupported(p.podFieldSelector)
+	if !isValid {
+		return fmt.Errorf("the field selector %q is not supported for pods", invalidSelector)
 	}
 
+	p.Log.Infof("Using the label selector: %v and field selector: %v", p.podLabelSelector, p.podFieldSelector)
+
 	for k, vs := range p.NamespaceAnnotationPass {
 		tagFilter := models.TagFilter{}
 		tagFilter.Name = k

diff --git a/plugins/inputs/prometheus/prometheus_test.go b/plugins/inputs/prometheus/prometheus_test.go
@@ -352,6 +352,7 @@ func TestPrometheusGeneratesSummaryMetricsV2(t *testing.T) {
 	defer ts.Close()
 
 	p := &Prometheus{
+		Log:           &testutil.Logger{},
 		URLs:          []string{ts.URL},
 		URLTag:        "url",
 		MetricVersion: 2,
@@ -385,6 +386,7 @@ go_gc_duration_seconds_count 42`
 	defer ts.Close()
 
 	p := &Prometheus{
+		Log:           &testutil.Logger{},
 		URLs:          []string{ts.URL},
 		URLTag:        "",
 		MetricVersion: 2,
@@ -444,6 +446,7 @@ func TestPrometheusGeneratesGaugeMetricsV2(t *testing.T) {
 	defer ts.Close()
 
 	p := &Prometheus{
+		Log:           &testutil.Logger{},
 		URLs:          []string{ts.URL},
 		URLTag:        "url",
 		MetricVersion: 2,