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

fix: update service monitor templates to use service-specific values for namespace, labels, interval, and scrapeTimeout

Browse Source 
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
zhenyus 2025-03-17 23:45:16 +08:00
parent c9cfa0827e
commit bb2bebc164
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,24 +10,24 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ $service.name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.authentication.serviceMonitor.namespace }} namespace: {{ $service.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ $service.name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.authentication.serviceMonitor.labels }} {{- if $service.serviceMonitor.labels }}
{{- toYaml .Values.authentication.serviceMonitor.labels | nindent 4 }} {{- toYaml $service.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
{{- if .Values.authentication.serviceMonitor.interval }} {{- if $service.serviceMonitor.interval }}
interval: {{ .Values.authentication.serviceMonitor.interval }} interval: {{ $service.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.authentication.serviceMonitor.scrapeTimeout }} {{- if $service.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.authentication.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ $service.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:

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

@ -10,24 +10,24 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ $service.name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.centralStorage.serviceMonitor.namespace }} namespace: {{ $service.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ $service.name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.centralStorage.serviceMonitor.labels }} {{- if $service.serviceMonitor.labels }}
{{- toYaml .Values.centralStorage.serviceMonitor.labels | nindent 4 }} {{- toYaml $service.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
{{- if .Values.centralStorage.serviceMonitor.interval }} {{- if $service.serviceMonitor.interval }}
interval: {{ .Values.centralStorage.serviceMonitor.interval }} interval: {{ $service.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.centralStorage.serviceMonitor.scrapeTimeout }} {{- if $service.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.centralStorage.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ $service.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:

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

@ -10,24 +10,24 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ $service.name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.content.serviceMonitor.namespace }} namespace: {{ $service.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ $service.name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.content.serviceMonitor.labels }} {{- if $service.serviceMonitor.labels }}
{{- toYaml .Values.content.serviceMonitor.labels | nindent 4 }} {{- toYaml $service.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
{{- if .Values.content.serviceMonitor.interval }} {{- if $service.serviceMonitor.interval }}
interval: {{ .Values.content.serviceMonitor.interval }} interval: {{ $service.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.content.serviceMonitor.scrapeTimeout }} {{- if $service.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.content.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ $service.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:

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

@ -10,24 +10,24 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ $service.name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.notification.serviceMonitor.namespace }} namespace: {{ $service.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ $service.name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.notification.serviceMonitor.labels }} {{- if $service.serviceMonitor.labels }}
{{- toYaml .Values.notification.serviceMonitor.labels | nindent 4 }} {{- toYaml $service.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
{{- if .Values.notification.serviceMonitor.interval }} {{- if $service.serviceMonitor.interval }}
interval: {{ .Values.notification.serviceMonitor.interval }} interval: {{ $service.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.notification.serviceMonitor.scrapeTimeout }} {{- if $service.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.notification.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ $service.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:

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

@ -10,24 +10,24 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ $service.name }}-service-monitor name: {{ $service.name }}-service-monitor
namespace: {{ .Values.payment.serviceMonitor.namespace }} namespace: {{ $service.serviceMonitor.namespace }}
labels: labels:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: {{ $service.name }}-service-monitor app.kubernetes.io/name: {{ $service.name }}-service-monitor
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- if .Values.payment.serviceMonitor.labels }} {{- if $service.serviceMonitor.labels }}
{{- toYaml .Values.payment.serviceMonitor.labels | nindent 4 }} {{- toYaml $service.serviceMonitor.labels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- path: /api/_/metrics - path: /api/_/metrics
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
{{- if .Values.payment.serviceMonitor.interval }} {{- if $service.serviceMonitor.interval }}
interval: {{ .Values.payment.serviceMonitor.interval }} interval: {{ $service.serviceMonitor.interval }}
{{- end }} {{- end }}
{{- if .Values.payment.serviceMonitor.scrapeTimeout }} {{- if $service.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.payment.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ $service.serviceMonitor.scrapeTimeout }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames: