X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=helm%2Finfrastructure%2Fsubcharts%2Fkong%2Ftemplates%2Fservicemonitor.yaml;h=db3dfbf35dd5e4450f649525daca11ae642f3a74;hb=refs%2Fchanges%2F69%2F12969%2F1;hp=d138d05e73b90d0856d67103f2288dfe47910b57;hpb=38dc857062b14145f5b9db89d10eba0ae5b90d11;p=ric-plt%2Fric-dep.git

diff --git a/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml b/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
old mode 100755
new mode 100644
index d138d05..db3dfbf
--- a/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
+++ b/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
@@ -7,23 +7,45 @@ metadata:
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "kong.metaLabels" . | nindent 4 }}
+  {{- if .Values.serviceMonitor.labels }}
+    {{ toYaml .Values.serviceMonitor.labels | nindent 4 }}
+  {{- end }}
 spec:
   endpoints:
-  - targetPort: metrics
+  - targetPort: status
     scheme: http
     {{- if .Values.serviceMonitor.interval }}
     interval: {{ .Values.serviceMonitor.interval }}
     {{- end }}
+    {{- if .Values.serviceMonitor.honorLabels }}
+    honorLabels: true
+    {{- end }}
+    {{- if .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings: {{ toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
+    {{- end }}
+  {{- if and .Values.ingressController.enabled (semverCompare ">= 2.0.0" (include "kong.effectiveVersion" .Values.ingressController.image)) }}
+  - targetPort: cmetrics
+    scheme: http
+    {{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.honorLabels }}
+    honorLabels: true
+    {{- end }}
+    {{- if .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings: {{ toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
+    {{- end }}
+  {{- end }}
   jobLabel: {{ .Release.Name }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace }}
+    - {{ template "kong.namespace" . }}
   selector:
     matchLabels:
-      app: {{ template "kong.name" . }}
-      release: {{ .Release.Name }}
+      enable-metrics: "true"
+      {{- include "kong.metaLabels" . | nindent 6 }}
+  {{- if .Values.serviceMonitor.targetLabels }}
+  targetLabels: {{ toYaml .Values.serviceMonitor.targetLabels | nindent 4 }}
+  {{- end }}
 {{- end }}