From 4cf26679c6c67d03655402207c92ddfe81cb80e7 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sun, 24 Dec 2023 13:44:22 +0100
Subject: [PATCH] add prometheus monitoring

---
 apps/media/ingress.yaml                 |  2 +-
 apps/media/jellyfin.servicemonitor.yaml | 14 ++++++++++++++
 apps/media/kustomization.yaml           |  1 +
 infrastructure/gitea/gitea.ingress.yaml |  2 ++
 infrastructure/gitea/gitea.values.yaml  |  6 ++----
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 apps/media/jellyfin.servicemonitor.yaml

diff --git a/apps/media/ingress.yaml b/apps/media/ingress.yaml
index 3eaf1eb..8243c43 100644
--- a/apps/media/ingress.yaml
+++ b/apps/media/ingress.yaml
@@ -26,7 +26,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: Host(`media-backend.kluster.moll.re`)
+    - match: Host(`media-backend.kluster.moll.re`) && !Path(`/metrics`)
       middlewares:
         - name: jellyfin-websocket
         - name: jellyfin-server-headers
diff --git a/apps/media/jellyfin.servicemonitor.yaml b/apps/media/jellyfin.servicemonitor.yaml
new file mode 100644
index 0000000..2e1a359
--- /dev/null
+++ b/apps/media/jellyfin.servicemonitor.yaml
@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: jellyfin
+spec:
+  selector:
+    matchLabels:
+      app: jellyfin-server
+  endpoints:
+  - port: 8096
+
+# this exposes metrics on port 8096 as enabled in the jellyfin config
+# https://jellyfin.org/docs/general/networking/monitoring/
+# the metrics are available at /metrics but blocked by the ingress
diff --git a/apps/media/kustomization.yaml b/apps/media/kustomization.yaml
index fb7621b..b8fe589 100644
--- a/apps/media/kustomization.yaml
+++ b/apps/media/kustomization.yaml
@@ -10,6 +10,7 @@ resources:
   - web.deployment.yaml
   - web.service.yaml
   - ingress.yaml
+  - jellyfin.servicemonitor.yaml
 
 images:
   - name: jellyfin/jellyfin
diff --git a/infrastructure/gitea/gitea.ingress.yaml b/infrastructure/gitea/gitea.ingress.yaml
index 6d4954f..6cf6cdc 100644
--- a/infrastructure/gitea/gitea.ingress.yaml
+++ b/infrastructure/gitea/gitea.ingress.yaml
@@ -6,6 +6,8 @@ spec:
   entryPoints:
     - websecure
   routes:
+  # block the metrics endpoint
+    - match: Host(`git.kluster.moll.re`) && !Path(`/metrics`)
     - match: Host(`git.kluster.moll.re`)
       kind: Rule
       services:
diff --git a/infrastructure/gitea/gitea.values.yaml b/infrastructure/gitea/gitea.values.yaml
index 9f745de..f7613bb 100644
--- a/infrastructure/gitea/gitea.values.yaml
+++ b/infrastructure/gitea/gitea.values.yaml
@@ -102,11 +102,9 @@ gitea:
   ## @param gitea.metrics.enabled Enable Gitea metrics
   ## @param gitea.metrics.serviceMonitor.enabled Enable Gitea metrics service monitor
   metrics:
-    enabled: false
+    enabled: true
     serviceMonitor:
-      enabled: false
-      #  additionalLabels:
-      #    prometheus-release: prom1
+      enabled: true
 
   ## @param gitea.config  Configuration for the Gitea server,ref: [config-cheat-sheet](https://docs.gitea.io/en-us/config-cheat-sheet/)
   config: