Skip to content

chore(app-proxy): add ServiceMonitor configuration for metrics monitoring #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 21, 2025
Merged

chore(app-proxy): add ServiceMonitor configuration for metrics monitoring #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dcaa6d
feat: add http-metrics port to cap-app-proxy service for monitoring
ATGardner May 19, 2025
e6a3ee8
added missing port to deployment
ATGardner May 19, 2025
a2b180c
feat(app-proxy): add ServiceMonitor configuration for metrics monitoring
ATGardner May 21, 2025
2493a0c
feat(app-proxy): update ServiceMonitor configuration to enable flag
ATGardner May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ spec:
ports:
- name: http
containerPort: 8080
- name: http-metrics
containerPort: 9100
readinessProbe:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
Expand Down
6 changes: 5 additions & 1 deletion charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ spec:
targetPort: http
protocol: TCP
name: http
- port: 9100
targetPort: http-metrics
protocol: TCP
name: http-metrics
selector:
{{- include "cap-app-proxy.selectorLabels" . | nindent 4 }}
{{- end }}
{{- end }}
21 changes: 21 additions & 0 deletions charts/gitops-runtime/templates/_components/cap-app-proxy/_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{{- define "cap-app-proxy.resources.serviceMonitor" }}
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ default (include "cap-app-proxy.fullname" .) .Values.serviceMonitor.name }}
labels:
{{- include "cap-app-proxy.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
selector:
matchLabels:
{{- include "cap-app-proxy.selectorLabels" . | nindent 6 }}
endpoints:
- port: http-metrics
interval: 30s
path: /metrics
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/gitops-runtime/templates/app-proxy/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "cap-app-proxy.resources.serviceMonitor" $appProxyContext }}
5 changes: 5 additions & 0 deletions charts/gitops-runtime/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,11 @@ app-proxy:
annotations: {}
name: "cap-app-proxy"

serviceMonitor:
enabled: false
name: ''
labels: {}

podAnnotations: {}

podLabels: {}
Expand Down