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

* feat: add http-metrics port to cap-app-proxy service for monitoring

* added missing port to deployment

* feat(app-proxy): add ServiceMonitor configuration for metrics monitoring

Add ServiceMonitor resource definition to enable monitoring of the app-proxy's http-metrics endpoint. This change allows for better observability and performance tracking of the service.

* feat(app-proxy): update ServiceMonitor configuration to enable flag

Change the ServiceMonitor configuration to use an 'enabled' flag
instead of 'create'. This allows for better control over the
monitoring setup in the app-proxy.

Author: ATGardner

charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml

@@ -57,6 +57,8 @@ spec:
         ports:
         - name: http
           containerPort: 8080
+        - name: http-metrics
+          containerPort: 9100
         readinessProbe:
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.readinessProbe.periodSeconds }}

charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml

@@ -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 }}

charts/gitops-runtime/templates/_components/cap-app-proxy/_servicemonitor.yaml

@@ -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 }}

charts/gitops-runtime/templates/app-proxy/servicemonitor.yaml

@@ -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 }}

charts/gitops-runtime/values.yaml

@@ -592,6 +592,11 @@ app-proxy:
     annotations: {}
     name: "cap-app-proxy"
 
+  serviceMonitor:
+    enabled: false
+    name: ''
+    labels: {}
+
   podAnnotations: {}
 
   podLabels: {}