icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove port definitions from service monitor configurations

Browse Source 
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
zhenyus 2025-03-17 23:36:46 +08:00
parent 7d55cdbcf9
commit 32198e2f9a
15 changed files with 140 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
View File

@ -1,32 +1,43 @@
{{- if .Values.authentication.serviceMonitor.enabled }} {{ $namespace := .Release.Namespace }}
{{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }}
{{ $serviceMonitorEnabled := .Values.authentication.serviceMonitor.enabled }}
{{- if $serviceMonitorEnabled }}
{{- range $service := .Values.authentication.services }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ .Release.Name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.authentication.serviceMonitor.namespace }} namespace: {{ .Values.authentication.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.authentication.serviceMonitor.labels }} {{- if .Values.authentication.serviceMonitor.labels }}
{{- toYaml .Values.authentication.serviceMonitor.labels | nindent 4 }} {{- toYaml .Values.authentication.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ .Values.authentication.serviceMonitor.port }} targetPort: {{ $service.targetPort }}
{{- if .Values.authentication.serviceMonitor.interval }} {{- if .Values.authentication.serviceMonitor.interval }}
interval: {{ .Values.authentication.serviceMonitor.interval }} interval: {{ .Values.authentication.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.authentication.serviceMonitor.scrapeTimeout }} {{- if .Values.authentication.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.authentication.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.authentication.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ $namespace | quote }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/name: {{ $service.name }}
app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }}
{{- end }}
{{- end }} {{- end }}

1
freeleaps/helm-pkg/authentication/values.prod.yaml
View File

@ -45,7 +45,6 @@ authentication:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
serviceMonitor: serviceMonitor:
enabled: true enabled: true
port: 8004
labels: labels:
release: kube-prometheus-stack release: kube-prometheus-stack
namespace: freeleaps-monitoring-system namespace: freeleaps-monitoring-system

1
freeleaps/helm-pkg/authentication/values.yaml
View File

@ -25,7 +25,6 @@ authentication:
probes: {} probes: {}
serviceMonitor: serviceMonitor:
enabled: false enabled: false
port: 8004
labels: {} labels: {}
namespace: "" namespace: ""
internal: 30s internal: 30s

45
freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
View File

@ -1,32 +1,43 @@
{{- if .Values.centralStorage.serviceMonitor.enabled }} {{ $namespace := .Release.Namespace }}
{{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }}
{{ $serviceMonitorEnabled := .Values.centralStorage.serviceMonitor.enabled }}
{{- if $serviceMonitorEnabled }}
{{- range $service := .Values.centralStorage.services }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ .Release.Name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.centralStorage.serviceMonitor.namespace }} namespace: {{ .Values.centralStorage.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.centralStorage.serviceMonitor.labels }} {{- if .Values.centralStorage.serviceMonitor.labels }}
{{- toYaml .Values.centralStorage.serviceMonitor.labels | nindent 4 }} {{- toYaml .Values.centralStorage.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ .Values.centralStorage.serviceMonitor.port }} targetPort: {{ $service.targetPort }}
{{- if .Values.centralStorage.serviceMonitor.interval }} {{- if .Values.centralStorage.serviceMonitor.interval }}
interval: {{ .Values.centralStorage.serviceMonitor.interval }} interval: {{ .Values.centralStorage.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.centralStorage.serviceMonitor.scrapeTimeout }} {{- if .Values.centralStorage.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.centralStorage.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.centralStorage.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ $namespace | quote }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/name: {{ $service.name }}
app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }}
{{- end }}
{{- end }} {{- end }}

1
freeleaps/helm-pkg/centralStorage/values.prod.yaml
View File

@ -45,7 +45,6 @@ centralStorage:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
serviceMonitor: serviceMonitor:
enabled: true enabled: true
port: 8005
labels: labels:
release: kube-prometheus-stack release: kube-prometheus-stack
namespace: freeleaps-monitoring-system namespace: freeleaps-monitoring-system

1
freeleaps/helm-pkg/centralStorage/values.yaml
View File

@ -25,7 +25,6 @@ central-storage:
probes: {} probes: {}
serviceMonitor: serviceMonitor:
enabled: false enabled: false
port: 8005
labels: {} labels: {}
namespace: "" namespace: ""
internal: 30s internal: 30s

45
freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
View File

@ -1,32 +1,43 @@
{{- if .Values.content.serviceMonitor.enabled }} {{ $namespace := .Release.Namespace }}
{{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }}
{{ $serviceMonitorEnabled := .Values.content.serviceMonitor.enabled }}
{{- if $serviceMonitorEnabled }}
{{- range $service := .Values.content.services }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ .Release.Name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.content.serviceMonitor.namespace }} namespace: {{ .Values.content.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.content.serviceMonitor.labels }} {{- if .Values.content.serviceMonitor.labels }}
{{- toYaml .Values.content.serviceMonitor.labels | nindent 4 }} {{- toYaml .Values.content.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ .Values.content.serviceMonitor.port }} targetPort: {{ $service.targetPort }}
{{- if .Values.content.serviceMonitor.interval }} {{- if .Values.content.serviceMonitor.interval }}
interval: {{ .Values.content.serviceMonitor.interval }} interval: {{ .Values.content.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.content.serviceMonitor.scrapeTimeout }} {{- if .Values.content.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.content.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.content.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ $namespace | quote }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/name: {{ $service.name }}
app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }}
{{- end }}
{{- end }} {{- end }}

1
freeleaps/helm-pkg/content/values.prod.yaml
View File

@ -45,7 +45,6 @@ content:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
serviceMonitor: serviceMonitor:
enabled: true enabled: true
port: 8013
labels: labels:
release: kube-prometheus-stack release: kube-prometheus-stack
namespace: freeleaps-monitoring-system namespace: freeleaps-monitoring-system

1
freeleaps/helm-pkg/content/values.yaml
View File

@ -25,7 +25,6 @@ content:
probes: {} probes: {}
serviceMonitor: serviceMonitor:
enabled: false enabled: false
port: 8013
labels: {} labels: {}
namespace: "" namespace: ""
internal: 30s internal: 30s

45
freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
View File

@ -1,32 +1,43 @@
{{- if .Values.notification.serviceMonitor.enabled }} {{ $namespace := .Release.Namespace }}
{{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }}
{{ $serviceMonitorEnabled := .Values.notification.serviceMonitor.enabled }}
{{- if $serviceMonitorEnabled }}
{{- range $service := .Values.notification.services }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ .Release.Name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.notification.serviceMonitor.namespace }} namespace: {{ .Values.notification.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.notification.serviceMonitor.labels }} {{- if .Values.notification.serviceMonitor.labels }}
{{- toYaml .Values.notification.serviceMonitor.labels | nindent 4 }} {{- toYaml .Values.notification.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ .Values.notification.serviceMonitor.port }} targetPort: {{ $service.targetPort }}
{{- if .Values.notification.serviceMonitor.interval }} {{- if .Values.notification.serviceMonitor.interval }}
interval: {{ .Values.notification.serviceMonitor.interval }} interval: {{ .Values.notification.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.notification.serviceMonitor.scrapeTimeout }} {{- if .Values.notification.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.notification.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.notification.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ $namespace | quote }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/name: {{ $service.name }}
app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }}
{{- end }}
{{- end }} {{- end }}

1
freeleaps/helm-pkg/notification/values.prod.yaml
View File

@ -45,7 +45,6 @@ notification:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
serviceMonitor: serviceMonitor:
enabled: true enabled: true
port: 8003
labels: labels:
release: kube-prometheus-stack release: kube-prometheus-stack
namespace: freeleaps-monitoring-system namespace: freeleaps-monitoring-system

1
freeleaps/helm-pkg/notification/values.yaml
View File

@ -25,7 +25,6 @@ notification:
probes: {} probes: {}
serviceMonitor: serviceMonitor:
enabled: false enabled: false
port: 8003
labels: {} labels: {}
namespace: "" namespace: ""
internal: 30s internal: 30s

45
freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
View File

@ -1,32 +1,43 @@
{{- if .Values.payment.serviceMonitor.enabled }} {{ $namespace := .Release.Namespace }}
{{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }}
{{ $serviceMonitorEnabled := .Values.payment.serviceMonitor.enabled }}
{{- if $serviceMonitorEnabled }}
{{- range $service := .Values.payment.services }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ .Release.Name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.payment.serviceMonitor.namespace }} namespace: {{ .Values.payment.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.payment.serviceMonitor.labels }} {{- if .Values.payment.serviceMonitor.labels }}
{{- toYaml .Values.payment.serviceMonitor.labels | nindent 4 }} {{- toYaml .Values.payment.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ .Values.payment.serviceMonitor.port }} targetPort: {{ $service.targetPort }}
{{- if .Values.payment.serviceMonitor.interval }} {{- if .Values.payment.serviceMonitor.interval }}
interval: {{ .Values.payment.serviceMonitor.interval }} interval: {{ .Values.payment.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.payment.serviceMonitor.scrapeTimeout }} {{- if .Values.payment.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.payment.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.payment.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ $namespace | quote }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/name: {{ $service.name }}
app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }}
{{- end }}
{{- end }} {{- end }}

1
freeleaps/helm-pkg/payment/values.prod.yaml
View File

@ -45,7 +45,6 @@ payment:
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
serviceMonitor: serviceMonitor:
enabled: true enabled: true
port: 8006
labels: labels:
release: kube-prometheus-stack release: kube-prometheus-stack
namespace: freeleaps-monitoring-system namespace: freeleaps-monitoring-system

1
freeleaps/helm-pkg/payment/values.yaml
View File

@ -25,7 +25,6 @@ payment:
probes: {} probes: {}
serviceMonitor: serviceMonitor:
enabled: false enabled: false
port: 8006
labels: {} labels: {}
namespace: "" namespace: ""
internal: 30s internal: 30s