From fcdb3d78b5e6f9e6c6ebceced382a340882ad5ea Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Tue, 14 May 2024 21:21:23 -0400
Subject: [PATCH] fix(qbittorrent): use app-template chart for creating
 ServiceMonitor

---
 .../download/qbittorrent/helm-release.yaml    | 20 +++++++++++++++++--
 .../download/qbittorrent/kustomization.yaml   |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/cluster/apps/download/qbittorrent/helm-release.yaml b/cluster/apps/download/qbittorrent/helm-release.yaml
index 81a8027..500215f 100644
--- a/cluster/apps/download/qbittorrent/helm-release.yaml
+++ b/cluster/apps/download/qbittorrent/helm-release.yaml
@@ -1,3 +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
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -24,7 +25,7 @@ spec:
             fsGroupChangePolicy: "OnRootMismatch"
 
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/onedr0p/qbittorrent
               tag: 4.6.4
@@ -93,6 +94,21 @@ spec:
             port: 17871
             protocol: HTTP
 
+    serviceMonitor:
+      app:
+        enabled: true
+        serviceName: qbittorrent
+
+        labels:
+          release: kube-prometheus-stack
+        
+        endpoints:
+        - port: metrics
+          scheme: http
+          path: /metrics
+          interval: 3m
+          scrapeTimeout: 1m
+
     ingress:
       main:
         annotations:
@@ -124,7 +140,7 @@ spec:
         hostPath: /mnt/MainPool/Kubernetes/qbittorrent
         advancedMounts:
           main: # controller name
-            main: # container name
+            app: # container name
             - path: /config
 
       cookies:
diff --git a/cluster/apps/download/qbittorrent/kustomization.yaml b/cluster/apps/download/qbittorrent/kustomization.yaml
index 2a9073d..fef532f 100644
--- a/cluster/apps/download/qbittorrent/kustomization.yaml
+++ b/cluster/apps/download/qbittorrent/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 resources:
 - ./qbittorrent-secrets.sops.yaml
 - ./helm-release.yaml
-- ./qbittorrent-metrics.yaml
+#- ./qbittorrent-metrics.yaml
 - ./dashboard.yaml
 - ./cookie-secret.sops.yaml
 - ./updateip-script.yaml