13 files changed, 12 insertions, 29 deletions
diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
index dbf6a7cd6a..8284c73ed1 100644
--- a/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}
-\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 6adf0e6609..c8c83cefba 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -140,9 +140,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
index dbf6a7cd6a..8284c73ed1 100644
--- a/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}
-\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 89608cfb6f..bf87aadbd0 100755
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -156,9 +156,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
index dbf6a7cd6a..8284c73ed1 100644
--- a/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}
-\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index db271a9c3f..fabca4d05a 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -162,9 +162,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
index 1c04296e4f..f8c450cb7e 100644
--- a/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
 {{- end }}
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 344a600afe..e15ce66359 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -203,9 +203,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
index dbf6a7cd6a..8284c73ed1 100644
--- a/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}
-\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 311653b860..2de8e39e54 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -181,9 +181,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
index dbf6a7cd6a..8284c73ed1 100644
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,6 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
+{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}
-\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 308b5a78af..4b97dbb01d 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -159,9 +159,6 @@ serviceAccount:
   roles:
     - read
 
-prometheus:
-  enabled: true
-
 metrics:
   serviceMonitor:
     # Override the labels based on the Prometheus config parameter: serviceMonitorSelector.
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 759ba56b02..957ffde268 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -27,6 +27,7 @@ global:
     service: &mariadbService
       name: &policy-mariadb policy-mariadb
       internalPort: 3306
+  prometheusEnabled: false
 
 #################################################################
 # Secrets metaconfig