Merge pull request #2590 from machine424/storg

MON-4126: set fallbackScrapeProtocol: 'PrometheusText1.0.0' as default for all UWM Prometheus targets for backward compatibility with Prometheus v2 until a better migration process is available

Author: openshift-merge-bot[bot]

assets/prometheus-user-workload/prometheus.yaml

@@ -260,6 +260,10 @@ spec:
       operator: In
       values:
       - leaf-prometheus
+  scrapeClasses:
+  - default: true
+    fallbackScrapeProtocol: PrometheusText1.0.0
+    name: global-config
   scrapeConfigNamespaceSelector: null
   scrapeConfigSelector: null
   secrets:

jsonnet/components/prometheus-user-workload.libsonnet

@@ -581,6 +581,15 @@ function(params)
             ],
           },
         ],
+        // As we do not have control over the targets, this is meant to maintain the v2 behavior.
+        // We will discuss later whether and how we want to enable the v3 behavior.
+        scrapeClasses: [
+          {
+            name: 'global-config',
+            default: true,
+            fallbackScrapeProtocol: 'PrometheusText1.0.0',
+          },
+        ],
         volumes+: [
           {
             name: $.trustedCaBundle.metadata.name,

pkg/manifests/manifests_test.go

@@ -1719,6 +1719,11 @@ func TestPrometheusUserWorkloadConfiguration(t *testing.T) {
 	if !volumeMountsConfigured(container.VolumeMounts, volumeName) {
 		t.Fatalf("trusted CA bundle volume mount for %s is not configured correctly", container.Name)
 	}
+
+	// The FallbackScrapeProtocol default scrape class is set as expected.
+	require.Len(t, p.Spec.ScrapeClasses, 1)
+	require.Equal(t, p.Spec.ScrapeClasses[0].Default, ptr.To(true))
+	require.Equal(t, p.Spec.ScrapeClasses[0].FallbackScrapeProtocol, ptr.To(monv1.PrometheusText1_0_0))
 }
 
 func TestPrometheusQueryLogFileConfig(t *testing.T) {