Merge pull request #124 from MediaMarktSaturn/application/add-pod-mon…

…itor-and-refine-additionalports [Application] Add PodMonitor support and refine additional ports accordingly
MediaMarktSaturn · Jul 5, 2024 · 293f179 · 293f179
2 parents 79fa11e + 848d529
commit 293f179
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 4 deletions.
diff --git a/chart-tests/application/ci/test-additional-port-values.yaml b/chart-tests/application/ci/test-additional-port-values.yaml
@@ -22,4 +22,3 @@ spec:
       - name: grpc
         protocol: TCP
         containerPort: 8082
-        servicePort: 82
diff --git a/chart-tests/application/ci/test-istio-with-canary-values.yaml b/chart-tests/application/ci/test-istio-with-canary-values.yaml
@@ -65,7 +65,7 @@ linkerd:
   enabled: false
 
 monitoring:
-  serviceMonitor: true
+  podMonitor: true
   namespace: monitoring
 
 canary:

diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.15.0
+version: 1.16.0
diff --git a/charts/application/templates/k8s-service.yaml b/charts/application/templates/k8s-service.yaml
@@ -24,11 +24,13 @@ spec:
       protocol: TCP
       name: http
     {{- range $ap := .Values.additionalPorts }}
+    {{- if $ap.servicePort }}
     - port: {{ $ap.servicePort }}
       targetPort: {{ $ap.containerPort }}
       protocol: {{ $ap.protocol }}
       name: {{ $ap.name }}
     {{- end }}
+    {{- end }}
 
   selector:
     {{- include "selectorLabels" . | nindent 4 }}

diff --git a/charts/application/templates/prometheus-pod-monitor.yaml b/charts/application/templates/prometheus-pod-monitor.yaml
@@ -0,0 +1,31 @@
+{{- if .Values.monitoring.podMonitor }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ .Release.Name }}
+  namespace: {{ .Values.monitoring.namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
+spec:
+  jobLabel: {{ .Release.Name }}
+  selector:
+    matchExpressions:
+      - key: app.kubernetes.io/name
+        operator: In
+        values:
+          {{- if .Values.canary.enabled }}
+          - "{{- printf "%s-primary" .Release.Name -}}"
+          - "{{- printf "%s-canary" .Release.Name -}}"
+          {{ else }}
+          - "{{ .Release.Name }}"
+          {{ end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  podMetricsEndpoints:
+    - port: {{ .Values.monitoring.metricsPortName | quote }}
+      path: {{ .Values.monitoring.metricsPath | quote }}
+      interval: {{ .Values.monitoring.scrapeInterval | quote }}
+      scrapeTimeout: {{ .Values.monitoring.scrapeTimeout | quote }}
+      followRedirects: {{ .Values.monitoring.followRedirects }}
+{{ end }}
diff --git a/charts/application/templates/prometheus-service-monitor.yaml b/charts/application/templates/prometheus-service-monitor.yaml
@@ -23,7 +23,7 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
   endpoints:
-    - port: http
+    - port: {{ .Values.monitoring.metricsPortName | quote }}
       path: {{ .Values.monitoring.metricsPath | quote }}
       interval: {{ .Values.monitoring.scrapeInterval | quote }}
       scrapeTimeout: {{ .Values.monitoring.scrapeTimeout | quote }}

diff --git a/charts/application/values.yaml b/charts/application/values.yaml
@@ -179,8 +179,11 @@ gatewayApi:
 
 monitoring:
   serviceMonitor: false
+  # choose podMonitor, if serviceMonitor is not possible because of e.g. a not exposed pod port exposing metrics
+  podMonitor: false
   namespace: monitoring
   metricsPath: /metrics
+  metricsPortName: http
   scrapeInterval: 30s
   scrapeTimeout: 10s
   followRedirects: true
@@ -272,6 +275,7 @@ additionalPorts: []
 # - name: grpc
 #   protocol: TCP
 #   containerPort: 8081
+#   # omit servicePort to only add it to the pod
 #   servicePort: 81
 
 # additional /etc/hosts entries, either a list, or a single hostname