X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_serviceMonitor.tpl;h=907d9c6a9c42b872a8de4fbb3c3748217599cbe2;hb=ba1200c2bc0c51411ca49efb17f179441285c215;hp=eb6c047c2f4f6c1ab4fa4ee215f886ad42f52f85;hpb=c52cc3078f5efacc06a240c07cd7caf55da1afd1;p=oom.git

diff --git a/kubernetes/common/common/templates/_serviceMonitor.tpl b/kubernetes/common/common/templates/_serviceMonitor.tpl
index eb6c047c2f..907d9c6a9c 100644
--- a/kubernetes/common/common/templates/_serviceMonitor.tpl
+++ b/kubernetes/common/common/templates/_serviceMonitor.tpl
@@ -110,8 +110,12 @@ namespace: {{ $dot.Values.metrics.serviceMonitor.namespace }}
 {{- else }}
 namespace: {{ include "common.namespace" $dot }}
 {{- end }}
+{{- if $dot.Values.metrics.serviceMonitor.labels }}
+labels: {{- include "common.tplValue" ( dict "value" $dot.Values.metrics.serviceMonitor.labels "context" $dot) | nindent 2 }}
+{{- else }}
 labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent 2 }}
 {{- end -}}
+{{- end -}}
 
 {{/*
     Create service monitor template
@@ -131,16 +135,33 @@ spec:
     {{- else if $dot.Values.metrics.serviceMonitor.targetPort }}
     targetPort: {{ $dot.Values.metrics.serviceMonitor.targetPort }}
     {{- else }}
-    port: metrics
+    port: tcp-metrics
+    {{- end }}
+    {{- if $dot.Values.metrics.serviceMonitor.isHttps }}
+    scheme: https
+    {{- if $dot.Values.metrics.serviceMonitor.tlsConfig }}
+    tlsConfig: {{- include "common.tplValue" ( dict "value" $dot.Values.metrics.serviceMonitor.tlsConfig "context" $dot) | nindent 6 }}
+    {{- else }}
+    tlsConfig:
+      insecureSkipVerify: true
+    {{- end }}
     {{- end }}
     {{- if $dot.Values.metrics.serviceMonitor.basicAuth.enabled }}
     basicAuth:
       username:
         key: {{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretUserKey }}
+        {{- if $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretNameSuffix }}
+        name: {{ include "common.release" . }}-{{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretNameSuffix }}
+        {{- else }}
         name: {{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretName }}
+        {{- end }}
       password:
         key: {{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretPasswordKey }}
+        {{- if $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretNameSuffix }}
+        name: {{ include "common.release" . }}-{{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretNameSuffix }}
+        {{- else }}
         name: {{ $dot.Values.metrics.serviceMonitor.basicAuth.externalSecretName }}
+        {{- end }}
     {{- end }}
     {{- if $dot.Values.metrics.serviceMonitor.interval }}
     interval: {{ $dot.Values.metrics.serviceMonitor.interval }}