From 67be3879b306d87cf77d861a224fe7b47f83b523 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Sun, 24 Nov 2024 19:50:42 -0500
Subject: [PATCH] feat(ganymede): add ServiceMonitor

---
 .../apps/default/ganymede/helm-release.yaml   | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/kubernetes/main/apps/default/ganymede/helm-release.yaml b/kubernetes/main/apps/default/ganymede/helm-release.yaml
index 49fb2f2..d8d7167 100644
--- a/kubernetes/main/apps/default/ganymede/helm-release.yaml
+++ b/kubernetes/main/apps/default/ganymede/helm-release.yaml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -9,33 +9,19 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.1.0
+      version: 3.5.1
       sourceRef:
         kind: HelmRepository
         name: bjws-charts
         namespace: flux-system
-
   values:
     controllers:
       main:
-#        pod:
-#          securityContext:
-#            runAsNonRoot: true
-#            runAsUser: 10000
-#            runAsGroup: 10000
-#            fsGroup: 10000
-#            fsGroupChangePolicy: OnRootMismatch
-
         containers:
           api:
             image:
               repository: ghcr.io/zibbp/ganymede
               tag: 3.1.0
-
-            securityContext:
-              #allowPrivilegeEscalation: false
-              #capabilities: { drop: ["ALL"] }
-
             env:
             - name: PUID
               value: 10555
@@ -89,7 +75,6 @@ spec:
               value: "https://twvods.${SECRET_NEW_DOMAIN}/api/v1/auth/oauth/callback"
             - name: TEMPORAL_URL
               value: "temporal:7233"
-
             # WORKER
             - name: MAX_CHAT_DOWNLOAD_EXECUTIONS
               value: "5"
@@ -104,7 +89,6 @@ spec:
             image:
               repository: ghcr.io/zibbp/ganymede-frontend
               tag: 3.1.0
-
             env:
             - name: API_URL
               # /api will be added to this
@@ -123,7 +107,6 @@ spec:
             image:
               repository: nginxinc/nginx-unprivileged
               tag: 1.27.2-alpine
-
             securityContext:
               allowPrivilegeEscalation: false
               capabilities: { drop: ["ALL"] }
@@ -131,23 +114,36 @@ spec:
     service:
       app:
         controller: main
-
         ports:
           nginx:
             port: 8080
-
           frontend:
             port: 3000
-
           api:
             port: 4000
 
+    serviceMonitor:
+      app:
+        labels:
+          release: kube-prometheus-stack
+        serviceName: app
+        endpoints:
+          - port: api
+            interval: 1m
+            scrapeTimeout: 5s
+            path: /metrics
+            metricRelabelings:
+              - sourceLabels: [__name__]
+                targetLabel: __name__
+                regex: (.*)
+                replacement: ganymede_${1}
+                action: replace
+          
     ingress:
       main:
         annotations:
           cert-manager.io/cluster-issuer: letsencrypt-production
           traefik.ingress.kubernetes.io/router.entrypoints: websecure
-
         hosts:
         - host: twvods.${SECRET_NEW_DOMAIN}
           paths:
@@ -173,7 +169,6 @@ spec:
         accessMode: ReadWriteOnce
         globalMounts:
         - path: /data/videos
-
       ganymede-data:
         type: persistentVolumeClaim
         size: 5Gi
@@ -184,7 +179,6 @@ spec:
           main: # controller name
             api: # container name
             - path: /data/temp
-
       ganymede-logs:
         type: persistentVolumeClaim
         size: 5Gi
@@ -195,7 +189,6 @@ spec:
           main: # controller name
             api: # container name
             - path: /data/logs
-
       nginx-conf:
         name: ganymede-nginx-conf
         type: configMap
@@ -205,7 +198,6 @@ spec:
             nginx: # container name
             - path: /etc/nginx/nginx.conf
               subPath: nginx.conf
-
       ganymede-conf:
         name: ganymede-conf
         type: configMap