[COMMON] Disable metrics by default

Similar to how we do not enable tracing by default, metrics should not
be enabled by default either [0]
This requires some adjustments, since it practically was not possible to deploy
ONAP without it:

- add if condition to "common.serviceMonitor" for .Values.global.metrics.enabled
- remove chart-specific if wrappers that do the same
- this allows to toggle metrics monitoring via Prometheus for the whole platform
- without this change, it would not be possible to deploy ONAP without the Prometheus
  Operator

[0] The prometheus backend that is required for this is not part of the ONAP deployment
    and it should thus be a conscious decision to both enable metrics and deploy it

Issue-ID: OOM-3372
Change-Id: I7c585f6f4b77e9e33ea334cc5ee64dcd7f2d164f
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml
index dc70602..8c0537d 100644 (file)
--- a/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml
@@ -1,3 +1 @@
-{{- if .Values.metrics.serviceMonitor.enabled }}
 {{  include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 3dd7369..482c2d9 100644 (file)
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -130,11 +130,8 @@ profiling:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 9516
     path: /services/babel-service/actuator/prometheus
-    basicAuth:
-      enabled: false
 
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml
index dc70602..8c0537d 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/servicemonitor.yaml
@@ -1,3 +1 @@
-{{- if .Values.metrics.serviceMonitor.enabled }}
 {{  include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index c36a576..48ba8a4 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -321,11 +321,8 @@ resources:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 8448
     path: /actuator/prometheus
-    basicAuth:
-      enabled: false
 
     selector:
       app: '{{ include "common.name" . }}'

diff --git a/kubernetes/aai/components/aai-modelloader/templates/podmonitor.yaml b/kubernetes/aai/components/aai-modelloader/templates/podmonitor.yaml
index 961a850..272aabc 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/templates/podmonitor.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/podmonitor.yaml
@@ -14,7 +14,8 @@
 # limitations under the License.
 */}}
 
-{{- if .Values.metrics.podMonitor.enabled }}
+{{- $metrics := .Values.global.metrics | default dict -}}
+{{- if $metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 57c3d83..48a3430 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -134,7 +134,6 @@ tracing:
 
 metrics:
   podMonitor:
-    enabled: true
     port: http
     path: /actuator/prometheus
 

diff --git a/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
index dc70602..8c0537d 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
@@ -1,3 +1 @@
-{{- if .Values.metrics.serviceMonitor.enabled }}
 {{  include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 50bb0ee..74a0e69 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -346,7 +346,6 @@ autoscaling:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 8448
     path: /actuator/prometheus
     basicAuth:

diff --git a/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml
index dc70602..47b84fb 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/servicemonitor.yaml
@@ -1,3 +1 @@
-{{- if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{- end }}
+{{  include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index 98442a9..3f2154f 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -363,14 +363,8 @@ podAnnotations:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 8448
     path: /actuator/prometheus
-    basicAuth:
-      enabled: false
-      externalSecretName: mysecretname
-      externalSecretUserKey: login
-      externalSecretPasswordKey: password
 
     ## Namespace in which Prometheus is running
     ##

diff --git a/kubernetes/cds/components/cds-command-executor/templates/servicemonitor.yaml b/kubernetes/cds/components/cds-command-executor/templates/servicemonitor.yaml
index 101b24a..aee16cb 100644 (file)
--- a/kubernetes/cds/components/cds-command-executor/templates/servicemonitor.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/servicemonitor.yaml
@@ -14,6 +14,4 @@
 # limitations under the License.
 */}}
 
-{{- if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{  include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index 36718cf..3c52557 100755 (executable)
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -103,7 +103,6 @@ serviceAccount:
 
 metrics:
   serviceMonitor:
-    enabled: false
     port: *metricsPortname
     internalPort: *metricsPort
     path: /actuator/prometheus

diff --git a/kubernetes/common/cassandra/templates/servicemonitor.yaml b/kubernetes/common/cassandra/templates/servicemonitor.yaml
index 57f4d3f..5cb7e0a 100644 (file)
--- a/kubernetes/common/cassandra/templates/servicemonitor.yaml
+++ b/kubernetes/common/cassandra/templates/servicemonitor.yaml
@@ -15,7 +15,5 @@
 */}}
 
 {{- if not .Values.global.cassandra.useOperator }}
-{{- if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{- end }}
+{{ include "common.serviceMonitor" . }}
 {{- end }}

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 0cd8545..e88ee1e 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -278,7 +278,6 @@ metrics:
     successThreshold: 1
     failureThreshold: 3
   serviceMonitor:
-    enabled: false
     targetPort: 8080
     path: /metrics
     basicAuth:

diff --git a/kubernetes/common/common/templates/_serviceMonitor.tpl b/kubernetes/common/common/templates/_serviceMonitor.tpl
index ccb1fbb..752e9fb 100644 (file)
--- a/kubernetes/common/common/templates/_serviceMonitor.tpl
+++ b/kubernetes/common/common/templates/_serviceMonitor.tpl
@@ -118,7 +118,10 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent
 */}}
 {{- define "common.serviceMonitor" -}}
 {{-   $dot := default . .dot -}}
+{{-   $global := $dot.Values.global | default dict -}}
 {{-   $labels := default (dict) .labels -}}
+{{-   $metrics := $global.metrics | default dict -}}
+{{- if $metrics.enabled | default false }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -180,4 +183,5 @@ spec:
     {{- else }}
     matchLabels: {{- include "common.matchLabels" (dict "labels" $labels "dot" $dot) | nindent 6 }}
     {{- end }}
+{{- end }}
 {{- end -}}

diff --git a/kubernetes/common/mariadb-galera/templates/servicemonitor.yaml b/kubernetes/common/mariadb-galera/templates/servicemonitor.yaml
index 1bffb24..62f3a1c 100644 (file)
--- a/kubernetes/common/mariadb-galera/templates/servicemonitor.yaml
+++ b/kubernetes/common/mariadb-galera/templates/servicemonitor.yaml
@@ -15,7 +15,5 @@
 */}}
 
 {{- if not .Values.global.mariadbGalera.useOperator }}
-{{-   if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{-   end }}
+{{ include "common.serviceMonitor" . }}
 {{- end }}

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 36f47e7..54ff4f1 100644 (file)
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -740,7 +740,6 @@ metrics:
   ## Prometheus Operator ServiceMonitor configuration
   ##
   serviceMonitor:
-    enabled: false
     ## Namespace in which Prometheus is running
     ##
     # namespace: monitoring

diff --git a/kubernetes/common/mongodb/templates/servicemonitor.yaml b/kubernetes/common/mongodb/templates/servicemonitor.yaml
index 7849d46..d2fe9b6 100644 (file)
--- a/kubernetes/common/mongodb/templates/servicemonitor.yaml
+++ b/kubernetes/common/mongodb/templates/servicemonitor.yaml
@@ -3,7 +3,8 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+{{-   $metrics := .Values.global.metrics | default dict -}}
+{{- if $metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/kubernetes/common/nginx/templates/servicemonitor.yaml b/kubernetes/common/nginx/templates/servicemonitor.yaml
index d597e06..2c239bc 100644 (file)
--- a/kubernetes/common/nginx/templates/servicemonitor.yaml
+++ b/kubernetes/common/nginx/templates/servicemonitor.yaml
@@ -3,7 +3,8 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+{{- $metrics := .Values.global.metrics | default dict -}}
+{{- if $metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/kubernetes/common/postgres/templates/servicemonitor.yaml b/kubernetes/common/postgres/templates/servicemonitor.yaml
index 3fb716b..729a371 100644 (file)
--- a/kubernetes/common/postgres/templates/servicemonitor.yaml
+++ b/kubernetes/common/postgres/templates/servicemonitor.yaml
@@ -14,7 +14,5 @@
 # limitations under the License.
 */}}
 {{- if not .Values.global.postgres.useOperator }}
-{{- if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{- end }}
+{{ include "common.serviceMonitor" . }}
 {{- end }}

diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index c0cdfef..47ea86a 100644 (file)
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -234,9 +234,6 @@ metrics:
       prometheus.io/scrape: "true"
       prometheus.io/port: "9187"
   serviceMonitor:
-    enabled: false
-    basicAuth:
-      enabled: false
     ## Namespace in which Prometheus is running
     ##
     ## namespace: monitoring

diff --git a/kubernetes/cps/components/cps-core/templates/serviceMonitor.yaml b/kubernetes/cps/components/cps-core/templates/serviceMonitor.yaml
index a49a662..c45e726 100644 (file)
--- a/kubernetes/cps/components/cps-core/templates/serviceMonitor.yaml
+++ b/kubernetes/cps/components/cps-core/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
-{{ include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{ include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 79fd3eb..94e9569 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -92,9 +92,6 @@ service:
     - name: tcp-hazelcast
       port: 5701
 
-prometheus:
-  enabled: false
-
 metrics:
   serviceMonitor:
     port: http
@@ -103,8 +100,6 @@ metrics:
     # targetPort: 8080
     path: /actuator/prometheus
     interval: 60s
-    basicAuth:
-      enabled: false
 
 pullPolicy: Always
 # flag to enable debugging - application support required

diff --git a/kubernetes/cps/components/cps-temporal/templates/serviceMonitor.yaml b/kubernetes/cps/components/cps-temporal/templates/serviceMonitor.yaml
index a49a662..c45e726 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/templates/serviceMonitor.yaml
+++ b/kubernetes/cps/components/cps-temporal/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
-{{ include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{ include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index 696d9bf..d08b0b6 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -45,9 +45,6 @@ image: onap/cps-temporal:1.2.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
-prometheus:
-  enabled: false
-
 service:
   type: ClusterIP
   name: cps-temporal
@@ -66,9 +63,7 @@ metrics:
       ##
       # targetPort: 8080
     path: /manage/prometheus
-    interval: 60s
-    basicAuth:
-      enabled: false
+    interval: 30s
 
 pullPolicy: IfNotPresent
 # flag to enable debugging - application support required

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/templates/serviceMonitor.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/templates/serviceMonitor.yaml
index a49a662..c45e726 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/templates/serviceMonitor.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.prometheus.enabled }}
-{{ include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{ include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index dd08b07..d711c45 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -67,9 +67,7 @@ metrics:
       ##
     # targetPort: 8080
     path: /actuator/prometheus
-    interval: 60s
-    basicAuth:
-      enabled: false
+    interval: 30s
 
 pullPolicy: IfNotPresent
 # flag to enable debugging - application support required

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 92f4e73..d3ebfdd 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -229,12 +229,12 @@ global:
 
   # metrics part
   # If enabled, exporters (for prometheus) will be deployed
-  # if custom resources set to yes, CRD from prometheus operartor will be
+  # if custom resources set to yes, CRD from prometheus operator will be
   # created
   # Not all components have it enabled.
   #
   metrics:
-    enabled: true
+    enabled: false
     custom_resources: false
 
   # Disabling AAF

diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
index 8284c73..d261392 100644 (file)
--- a/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 5a9d211..42f2a54 100644 (file)
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -139,7 +139,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: policy-apex-pdp
     interval: 60s
     isHttps: false

diff --git a/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
index 8284c73..d261392 100644 (file)
--- a/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-api/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 562a087..18517fd 100644 (file)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -173,7 +173,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: http
     path: /policy/api/v1/metrics
     interval: 60s

diff --git a/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
index 8284c73..d261392 100644 (file)
--- a/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-distribution/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index d2848bb..acf3115 100644 (file)
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -169,7 +169,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: policy-distribution
     interval: 60s
     isHttps: false

diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
index f8c450c..c7177f0 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- 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 1dc1127..4e42525 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -202,7 +202,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: policy-drools-pdp-9696
     interval: 60s
     isHttps: false

diff --git a/kubernetes/policy/components/policy-opa-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-opa-pdp/templates/serviceMonitor.yaml
index 9677420..e58e71a 100755 (executable)
--- a/kubernetes/policy/components/policy-opa-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-opa-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-opa-pdp/values.yaml b/kubernetes/policy/components/policy-opa-pdp/values.yaml
index d4d77fe..f4a7784 100644 (file)
--- a/kubernetes/policy/components/policy-opa-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-opa-pdp/values.yaml
@@ -212,7 +212,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: http
     interval: 60s
     path: /metrics

diff --git a/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
index 8284c73..d261392 100644 (file)
--- a/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 8370f63..da7a482 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -186,7 +186,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: http-api
     path: /policy/pap/v1/metrics
     interval: 60s

diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
index 8284c73..d261392 100644 (file)
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/serviceMonitor.yaml
@@ -18,6 +18,4 @@
 # ============LICENSE_END=========================================================
 */}}
 
-{{- if .Values.global.prometheusEnabled }}
 {{ include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 061ceed..ae6aacb 100644 (file)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -195,7 +195,6 @@ metrics:
       app.kubernetes.io/managed-by: '{{ .Release.Service }}'
       version: '{{ .Chart.Version | replace "+" "_" }}'
       release: prometheus
-    enabled: true
     port: http
     path: /metrics
     interval: 60s

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 2f7f141..284c2c3 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -19,7 +19,6 @@
 # Global configuration defaults.
 #################################################################
 global:
-  prometheusEnabled: true
   postgres:
     localCluster: true
     # flag to enable the DB creation via pgo-operator

diff --git a/kubernetes/sdc/components/sdc-be/templates/servicemonitor.yaml b/kubernetes/sdc/components/sdc-be/templates/servicemonitor.yaml
index c0d9f21..47b84fb 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/templates/servicemonitor.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/servicemonitor.yaml
@@ -1,3 +1 @@
-{{- if .Values.metrics.serviceMonitor.enabled }}
-{{  include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{  include "common.serviceMonitor" . }}
\ No newline at end of file

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 8e14cc2..09a73fe 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -158,11 +158,8 @@ resources:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 8080
     path: /sdc2/rest/actuator/prometheus
-    basicAuth:
-      enabled: false
 
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/servicemonitor.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/servicemonitor.yaml
index 937f5ef..9f1916a 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/servicemonitor.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/servicemonitor.yaml
@@ -14,6 +14,4 @@
 # limitations under the License.
 */}}
 
-{{- if .Values.metrics.serviceMonitor.enabled }}
 {{  include "common.serviceMonitor" . }}
-{{- end }}

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 32342c5..bec446f 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -262,11 +262,8 @@ updateStrategy:
 
 metrics:
   serviceMonitor:
-    enabled: true
     targetPort: 8081
     path: /onboarding-api/v1.0/actuator/prometheus
-    basicAuth:
-      enabled: false
 
 logback:
   rootLogLevel: INFO