feat(application-template): promethus metric 지원 추가 (#14)

* feat(application-template): prometheus metric, operator를 지원하도록 service, serviceMonitor 수정 * feat: pod에서 prometheus metrics port 노출 * feat: default value 수정 * refactor: indent를 nindent로 변경 * fix: 기본 포트 변경 * fix: prometheus container targetPort 수정할 수 있게 하기 * feat: servicemonitor 기본으로 켜기 * feat: chart 버전 올리기 * fix: deployment에서 target port 지원하기
modusign · Feb 1, 2024 · c7ceddf · c7ceddf
1 parent 296c584
commit c7ceddf
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 4 deletions.
diff --git a/charts/application-template/Chart.yaml b/charts/application-template/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 - name: modusign
   url: https://github.com/modusign
 name: application-template
-version: 1.3.2
+version: 1.4.0
diff --git a/charts/application-template/templates/scheduler/deployment.yaml b/charts/application-template/templates/scheduler/deployment.yaml
@@ -103,6 +103,11 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
+        {{- if .Values.global.observability.prometheus.enabled }}
+          - name: metrics
+            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
+            protocol: TCP
+        {{- end }}
         {{- with .Values.scheduler.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/scheduler/service.yaml b/charts/application-template/templates/scheduler/service.yaml
@@ -12,6 +12,16 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
+{{- end }}
+{{- if .Values.global.observability.prometheus.enabled }}
+{{- with .Values.global.observability.prometheus }}
+    - name: metrics
+      port: {{ .port }}
+      {{- if .targetPort }}
+      targetPort: {{ .targetPort }}
+      {{- end }}
+      protocol: TCP
+{{- end }}
 {{- end }}
   selector:
     {{- include "application.scheduler.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/templates/server/deployment.yaml b/charts/application-template/templates/server/deployment.yaml
@@ -103,6 +103,11 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
+        {{- if .Values.global.observability.prometheus.enabled }}
+          - name: metrics
+            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
+            protocol: TCP
+        {{- end }}
         {{- with .Values.server.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/server/service.yaml b/charts/application-template/templates/server/service.yaml
@@ -12,6 +12,16 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
+{{- end }}
+{{- if .Values.global.observability.prometheus.enabled }}
+{{- with .Values.global.observability.prometheus }}
+    - name: metrics
+      port: {{ .port }}
+      {{- if .targetPort }}
+      targetPort: {{ .targetPort }}
+      {{- end }}
+      protocol: TCP
+{{- end }}
 {{- end }}
   selector:
     {{- include "application.server.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/templates/service_monitor.yaml b/charts/application-template/templates/service_monitor.yaml
@@ -0,0 +1,18 @@
+{{- if and .Values.global.observability.prometheus.enabled .Values.global.observability.prometheus.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "application.name" . }}
+  labels:
+    {{- include "application.commonLabels" . | nindent 4 }}
+spec:
+  endpoints:
+    - path: {{ .Values.global.observability.prometheus.path }}
+      port: metrics
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "application.commonLabels" . | nindent 6}}
+{{- end }}
diff --git a/charts/application-template/templates/worker/deployment.yaml b/charts/application-template/templates/worker/deployment.yaml
@@ -103,6 +103,11 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
+        {{- if .Values.global.observability.prometheus.enabled }}
+          - name: metrics
+            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
+            protocol: TCP
+        {{- end }}
         {{- with .Values.worker.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/worker/service.yaml b/charts/application-template/templates/worker/service.yaml
@@ -12,6 +12,16 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
+{{- end }}
+{{- if .Values.global.observability.prometheus.enabled }}
+{{- with .Values.global.observability.prometheus }}
+    - name: metrics
+      port: {{ .port }}
+      {{- if .targetPort }}
+      targetPort: {{ .targetPort }}
+      {{- end }}
+      protocol: TCP
+{{- end }}
 {{- end }}
   selector:
     {{- include "application.worker.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/values.yaml b/charts/application-template/values.yaml
@@ -105,9 +105,15 @@ global:
     datadog:
       admissionController:
         enabled: false
-    # -- inject grafana
-    # grafana:
-    #   enabled: false
+    # -- set up additional service port and setup
+    prometheus:
+      enabled: false
+      port: 9100
+      # targetPort: 9100
+      path: /metrics
+      # -- create Prometheus Operator ServiceMonitorCR
+      serviceMonitor:
+        enabled: true
 
 ## Server
 server: