fix: update service monitor configurations to use targetPort and remove unnecessary labels

Signed-off-by: zhenyus <zhenyus@mathmast.com>
2025-03-17 23:24:26 +08:00 · 2025-03-17 23:24:26 +08:00 · 07d4cb7236
commit 07d4cb7236
parent aafbee56f0
17 changed files with 15 additions and 30 deletions
--- a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
@ -27,9 +27,6 @@ spec:
    - {{ .Release.Namespace | quote }}
  selector:
    matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
      app.kubernetes.io/name: {{ .Release.Name }}
-      argocd.argoproj.io/instance: freeleaps-prod-authentication
 {{- end }}
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
@ -19,11 +19,6 @@ spec:
  ports:
    - port: {{ $service.port }}
      targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
  selector:
    app.kubernetes.io/version: {{ $appVersion }}
    app.kubernetes.io/name: "central-storage"
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
@ -15,7 +15,7 @@ metadata:
 spec:
  endpoints:
  - path: /api/_/metrics
-    port: http
+    targetPort: {{ .Values.centralStorage.serviceMonitor.port }}
    {{- if .Values.centralStorage.serviceMonitor.interval }}
    interval: {{ .Values.centralStorage.serviceMonitor.interval }}
    {{- end }}
--- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
@ -45,6 +45,7 @@ centralStorage:
        terminationGracePeriodSeconds: 30
  serviceMonitor:
    enabled: true
+    targetPort: 8005
    labels:
      release: kube-prometheus-stack
    namespace: freeleaps-monitoring-system
--- a/freeleaps/helm-pkg/centralStorage/values.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.yaml
@ -25,6 +25,7 @@ central-storage:
  probes: {}
  serviceMonitor:
    enabled: false
+    targetPort: 8005
    labels: {}
    namespace: ""
    internal: 30s
--- a/freeleaps/helm-pkg/content/templates/content/service.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/service.yaml
@ -19,11 +19,6 @@ spec:
  ports:
    - port: {{ $service.port }}
      targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
  selector:
    app.kubernetes.io/version: {{ $appVersion }}
    app.kubernetes.io/name: "content"
--- a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
@ -15,7 +15,7 @@ metadata:
 spec:
  endpoints:
  - path: /api/_/metrics
-    port: http
+    port: {{ .Values.content.serviceMonitor.port }}
    {{- if .Values.content.serviceMonitor.interval }}
    interval: {{ .Values.content.serviceMonitor.interval }}
    {{- end }}
@ -27,6 +27,6 @@ spec:
    - {{ .Release.Namespace | quote }}
  selector:
    matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
--- a/freeleaps/helm-pkg/content/values.prod.yaml
+++ b/freeleaps/helm-pkg/content/values.prod.yaml
@ -45,6 +45,7 @@ content:
        terminationGracePeriodSeconds: 30
  serviceMonitor:
    enabled: true
+    port: 8013
    labels:
      release: kube-prometheus-stack
    namespace: freeleaps-monitoring-system
--- a/freeleaps/helm-pkg/content/values.yaml
+++ b/freeleaps/helm-pkg/content/values.yaml
@ -25,6 +25,7 @@ content:
  probes: {}
  serviceMonitor:
    enabled: false
+    port: 8013
    labels: {}
    namespace: ""
    internal: 30s
--- a/freeleaps/helm-pkg/notification/templates/notification/service.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/service.yaml
@ -19,11 +19,6 @@ spec:
  ports:
    - port: {{ $service.port }}
      targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
  selector:
    app.kubernetes.io/version: {{ $appVersion }}
    app.kubernetes.io/name: "notification"
--- a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
@ -15,7 +15,7 @@ metadata:
 spec:
  endpoints:
  - path: /api/_/metrics
-    port: http
+    port: {{ .Values.notification.serviceMonitor.port }}
    {{- if .Values.notification.serviceMonitor.interval }}
    interval: {{ .Values.notification.serviceMonitor.interval }}
    {{- end }}
@ -27,6 +27,6 @@ spec:
    - {{ .Release.Namespace | quote }}
  selector:
    matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
--- a/freeleaps/helm-pkg/notification/values.prod.yaml
+++ b/freeleaps/helm-pkg/notification/values.prod.yaml
@ -45,6 +45,7 @@ notification:
        terminationGracePeriodSeconds: 30
  serviceMonitor:
    enabled: true
+    port: 8003
    labels:
      release: kube-prometheus-stack
    namespace: freeleaps-monitoring-system
--- a/freeleaps/helm-pkg/notification/values.yaml
+++ b/freeleaps/helm-pkg/notification/values.yaml
@ -25,6 +25,7 @@ notification:
  probes: {}
  serviceMonitor:
    enabled: false
+    port: 8003
    labels: {}
    namespace: ""
    internal: 30s
--- a/freeleaps/helm-pkg/payment/templates/payment/service.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/service.yaml
@ -19,11 +19,6 @@ spec:
  ports:
    - port: {{ $service.port }}
      targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
  selector:
    app.kubernetes.io/version: {{ $appVersion }}
    app.kubernetes.io/name: "payment"
--- a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
@ -15,7 +15,7 @@ metadata:
 spec:
  endpoints:
  - path: /api/_/metrics
-    port: http
+    port: {{ .Values.payment.serviceMonitor.port }}
    {{- if .Values.payment.serviceMonitor.interval }}
    interval: {{ .Values.payment.serviceMonitor.interval }}
    {{- end }}
@ -27,6 +27,6 @@ spec:
    - {{ .Release.Namespace | quote }}
  selector:
    matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
--- a/freeleaps/helm-pkg/payment/values.prod.yaml
+++ b/freeleaps/helm-pkg/payment/values.prod.yaml
@ -45,6 +45,7 @@ payment:
        terminationGracePeriodSeconds: 30
  serviceMonitor:
    enabled: true
+    port: 8006
    labels:
      release: kube-prometheus-stack
    namespace: freeleaps-monitoring-system
--- a/freeleaps/helm-pkg/payment/values.yaml
+++ b/freeleaps/helm-pkg/payment/values.yaml
@ -25,6 +25,7 @@ payment:
  probes: {}
  serviceMonitor:
    enabled: false
+    port: 8006
    labels: {}
    namespace: ""
    internal: 30s