J release changes

[ric-plt/ric-dep.git] / helm / infrastructure / subcharts / kong / templates / servicemonitor.yaml

diff --git a/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml b/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 1950641..db3dfbf
--- a/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
+++ b/helm/infrastructure/subcharts/kong/templates/servicemonitor.yaml
@@ -13,16 +13,39 @@ metadata:
   {{- 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:
+      enable-metrics: "true"
       {{- include "kong.metaLabels" . | nindent 6 }}
+  {{- if .Values.serviceMonitor.targetLabels }}
+  targetLabels: {{ toYaml .Values.serviceMonitor.targetLabels | nindent 4 }}
+  {{- end }}
 {{- end }}