Merge pull request #175 from appuio/feat/config-workaround

DebakelOrakel · web-flow · commit db5fe9ce75db · 2025-04-11T15:44:34.000+02:00
Support selectivly enable/disable workarounds
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -91,7 +91,12 @@ parameters:
         tag: v4.17
 
     workaround:
+      missing_metrics_token:
+        enabled: true
+      app_logs_reader:
+        enabled: true
       ingester_fix:
+        enabled: true
         schedule: '*/10 * * * *'
         sleep_time: 2m
 
diff --git a/component/log_workaround.libsonnet b/component/log_workaround.libsonnet
@@ -150,9 +150,9 @@ local ingester_stuck = [
 // Define outputs below
 if lokiEnabled then
   {
-    '50_fix_missing_metrics_token': missing_metrics_token,
-    '50_fix_ingester_stuck': ingester_stuck,
-    '50_fix_app_logs_reader': app_logs_reader,
+    [if params.workaround.missing_metrics_token.enabled then '50_fix_missing_metrics_token']: missing_metrics_token,
+    [if params.workaround.ingester_fix.enabled then '50_fix_ingester_stuck']: ingester_stuck,
+    [if params.workaround.app_logs_reader.enabled then '50_fix_app_logs_reader']: app_logs_reader,
   }
 else
   std.trace(
diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/50_fix_missing_metrics_token.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/50_fix_missing_metrics_token.yaml
diff --git a/tests/master.yml b/tests/master.yml
@@ -71,3 +71,7 @@ parameters:
             -----BEGIN CERTIFICATE-----
             ...
             -----END CERTIFICATE-----
+
+    workaround:
+      missing_metrics_token:
+        enabled: false

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,9 @@ local ingester_stuck = [`
`150`	`150`	`// Define outputs below`
`151`	`151`	`if lokiEnabled then`
`152`	`152`	`{`
`153`		`- '50_fix_missing_metrics_token': missing_metrics_token,`
`154`		`- '50_fix_ingester_stuck': ingester_stuck,`
`155`		`- '50_fix_app_logs_reader': app_logs_reader,`
	`153`	`+ [if params.workaround.missing_metrics_token.enabled then '50_fix_missing_metrics_token']: missing_metrics_token,`
	`154`	`+ [if params.workaround.ingester_fix.enabled then '50_fix_ingester_stuck']: ingester_stuck,`
	`155`	`+ [if params.workaround.app_logs_reader.enabled then '50_fix_app_logs_reader']: app_logs_reader,`
`156`	`156`	`}`
`157`	`157`	`else`
`158`	`158`	`std.trace(`