FEAT - Rename scrape_classic_histograms (#7104)

---------

Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

pkg/prometheus/promcfg.go

@@ -410,7 +410,12 @@ func (cg *ConfigGenerator) addNativeHistogramConfig(cfg yaml.MapSlice, nhc monit
 	}
 
 	if nhc.ScrapeClassicHistograms != nil {
-		cfg = cg.WithMinimumVersion("2.45.0").AppendMapItem(cfg, "scrape_classic_histograms", nhc.ScrapeClassicHistograms)
+		switch cg.version.Major {
+		case 3:
+			cfg = cg.AppendMapItem(cfg, "always_scrape_classic_histograms", nhc.ScrapeClassicHistograms)
+		default:
+			cfg = cg.WithMinimumVersion("2.45.0").AppendMapItem(cfg, "scrape_classic_histograms", nhc.ScrapeClassicHistograms)
+		}
 	}
 
 	return cfg

pkg/prometheus/promcfg_test.go

@@ -4679,6 +4679,15 @@ func TestNativeHistogramConfig(t *testing.T) {
 			},
 			golden: "NativeHistogramConfigWithMissALL.golden",
 		},
+		{
+			version: "3.0.0-rc.0",
+			nativeHistogramConfig: monitoringv1.NativeHistogramConfig{
+				NativeHistogramBucketLimit:     ptr.To(uint64(10)),
+				ScrapeClassicHistograms:        ptr.To(true),
+				NativeHistogramMinBucketFactor: ptr.To(resource.MustParse("12.124")),
+			},
+			golden: "NativeHistogramConfigAlwaysScrapeClassicHistograms.golden",
+		},
 	} {
 		t.Run(fmt.Sprintf("version=%s", tc.version), func(t *testing.T) {
 			p := defaultPrometheus()

pkg/prometheus/testdata/ConsulScrapeConfigNamespace.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigNamespace_unsupported_version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigPathPrefix.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigPathPrefix_unsupported_version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/NativeHistogramConfigAlwaysScrapeClassicHistograms.golden

@@ -0,0 +1,71 @@
+global:
+  scrape_interval: 30s
+  external_labels:
+    prometheus: default/test
+    prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
+scrape_configs:
+- job_name: serviceMonitor/default/testservicemonitor1/0
+  honor_labels: false
+  kubernetes_sd_configs:
+  - role: endpoints
+    namespaces:
+      names:
+      - default
+  scrape_interval: 30s
+  relabel_configs:
+  - source_labels:
+    - job
+    target_label: __tmp_prometheus_job_name
+  - action: keep
+    source_labels:
+    - __meta_kubernetes_endpoint_port_name
+    regex: web
+  - source_labels:
+    - __meta_kubernetes_endpoint_address_target_kind
+    - __meta_kubernetes_endpoint_address_target_name
+    separator: ;
+    regex: Node;(.*)
+    replacement: ${1}
+    target_label: node
+  - source_labels:
+    - __meta_kubernetes_endpoint_address_target_kind
+    - __meta_kubernetes_endpoint_address_target_name
+    separator: ;
+    regex: Pod;(.*)
+    replacement: ${1}
+    target_label: pod
+  - source_labels:
+    - __meta_kubernetes_namespace
+    target_label: namespace
+  - source_labels:
+    - __meta_kubernetes_service_name
+    target_label: service
+  - source_labels:
+    - __meta_kubernetes_pod_name
+    target_label: pod
+  - source_labels:
+    - __meta_kubernetes_pod_container_name
+    target_label: container
+  - action: drop
+    source_labels:
+    - __meta_kubernetes_pod_phase
+    regex: (Failed|Succeeded)
+  - source_labels:
+    - __meta_kubernetes_service_name
+    target_label: job
+    replacement: ${1}
+  - target_label: endpoint
+    replacement: web
+  - source_labels:
+    - __address__
+    target_label: __tmp_hash
+    modulus: 1
+    action: hashmod
+  - source_labels:
+    - __tmp_hash
+    regex: $(SHARD)
+    action: keep
+  native_histogram_bucket_limit: 10
+  native_histogram_min_bucket_factor: 12.124
+  always_scrape_classic_histograms: true