From f2c2e037962246be8358f088f6b810430a38721c Mon Sep 17 00:00:00 2001
From: Santhosh Kannan <29794224+x418@users.noreply.github.com>
Date: Mon, 27 Apr 2026 16:45:52 +0200
Subject: [PATCH] Decouple OPA Prometheus metrics from decision log plugin

Introduce a separate config flag `skipper_open_policy_agent_prometheus_metrics_enabled` to control the OPA `status.prometheus` block independently of `skipper_open_policy_agent_decision_log_export_enabled`.

### Why
Previously, the `status: prometheus: true` configuration was nested inside the same conditional branch as the `eopa_dl` decision log plugin. Given we still have some open question sregarding dl plugin, this enables us to at least already start receiving prometheus metrics from OPA
---
 cluster/config-defaults.yaml                           |  1 +
 .../skipper/02-configmap-open-policy-agent.yaml        | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
index 4f19f894d5..15dec2a56c 100644
--- a/cluster/config-defaults.yaml
+++ b/cluster/config-defaults.yaml
@@ -462,6 +462,7 @@ skipper_open_policy_agent_data_preprocessing_optimization_enabled: "true"
 skipper_open_policy_agent_preloading_enabled: "true"
 skipper_open_policy_agent_print_tracing_enabled: "true"
 skipper_open_policy_agent_decision_log_export_enabled: "false"
+skipper_open_policy_agent_prometheus_metrics_enabled: "true"
 skipper_open_policy_agent_console_logs_enabled: "false"
 skipper_open_policy_agent_decision_log_s3_endpoint: ""
 skipper_open_policy_agent_decision_log_s3_region: "eu-central-1"
diff --git a/cluster/manifests/skipper/02-configmap-open-policy-agent.yaml b/cluster/manifests/skipper/02-configmap-open-policy-agent.yaml
index 399afe466e..a1f03588d1 100644
--- a/cluster/manifests/skipper/02-configmap-open-policy-agent.yaml
+++ b/cluster/manifests/skipper/02-configmap-open-policy-agent.yaml
@@ -31,16 +31,18 @@ data:
             session_name: open-policy-agent-instance
       name: styra-bundles
       url: "{{ .Cluster.ConfigItems.skipper_open_policy_agent_bundles_url }}"
+    {{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_prometheus_metrics_enabled "true" }}
+    status:
+      prometheus: true
+      # Setting empty status service name to avoid OPA trying to export metrics to Styra
+      service: ""
+    {{ end }}
     {{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_decision_logs_buffer_type_event_enable "true" }}
     decision_logs:
       reporting:
         buffer_type: "event"
         buffer_size_limit_events: {{ .Cluster.ConfigItems.skipper_open_policy_agent_decision_logs_buffer_type_event_limit }}
     {{ else if eq .Cluster.ConfigItems.skipper_open_policy_agent_decision_log_export_enabled "true" }}
-    status:
-      prometheus: true
-      # Setting empty status service name to avoid OPA trying to export metrics to Styra
-      service: ""
     decision_logs:
       plugin: eopa_dl
     plugins: