From 2a0b3ae235682a5ed91228c69d21ebf10934dc50 Mon Sep 17 00:00:00 2001 From: Supporterino Date: Sun, 23 Feb 2025 18:49:13 +0100 Subject: [PATCH 1/4] fix: :bug: specify port to conform to ServerSideApply --- charts/jellyfin/templates/serviceMonitor.yaml | 1 + charts/jellyfin/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/charts/jellyfin/templates/serviceMonitor.yaml b/charts/jellyfin/templates/serviceMonitor.yaml index 126e8f7..cc8b03d 100644 --- a/charts/jellyfin/templates/serviceMonitor.yaml +++ b/charts/jellyfin/templates/serviceMonitor.yaml @@ -23,6 +23,7 @@ spec: {{- end }} honorLabels: true path: {{ .Values.metrics.serviceMonitor.path }} + port: {{ .Values.metrics.serviceMonitor.port }} scheme: {{ .Values.metrics.serviceMonitor.scheme }} {{- with .Values.metrics.serviceMonitor.tlsConfig }} tlsConfig: diff --git a/charts/jellyfin/values.yaml b/charts/jellyfin/values.yaml index 69a6540..f936326 100644 --- a/charts/jellyfin/values.yaml +++ b/charts/jellyfin/values.yaml @@ -209,6 +209,8 @@ metrics: scrapeTimeout: 30s # -- Path to scrape for metrics path: /metrics + # -- Port to scrape for metrics + port: 8096 # -- Scheme to use for scraping metrics (http or https) scheme: http # -- TLS configuration for scraping metrics From d6e3d45042ce0678a2b80d95788fb2c1263dcfd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 23 Feb 2025 17:49:34 +0000 Subject: [PATCH 2/4] docs(charts): :memo: write updated reademe --- charts/jellyfin/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/jellyfin/README.md b/charts/jellyfin/README.md index 2c0dcc3..3c20fa4 100644 --- a/charts/jellyfin/README.md +++ b/charts/jellyfin/README.md @@ -67,15 +67,16 @@ helm install my-jellyfin jellyfin/jellyfin -f values.yaml | jellyfin.enableDLNA | bool | `false` | Enable DLNA. Requires host network. See: https://jellyfin.org/docs/general/networking/dlna.html | | jellyfin.env | list | `[]` | Additional environment variables for the container. | | livenessProbe | object | `{"initialDelaySeconds":10,"tcpSocket":{"port":"http"}}` | Configure liveness probe for Jellyfin. | -| metrics | object | `{"command":["bash","-c","sed 's,false,true,' -i /config/config/system.xml && /jellyfin/jellyfin"],"enabled":false,"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","relabelings":[],"scheme":"http","scrapeTimeout":"30s","targetLabels":[],"tlsConfig":{}}}` | Configuration for metrics collection and monitoring | +| metrics | object | `{"command":["bash","-c","sed 's,false,true,' -i /config/config/system.xml && /jellyfin/jellyfin"],"enabled":false,"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","port":8096,"relabelings":[],"scheme":"http","scrapeTimeout":"30s","targetLabels":[],"tlsConfig":{}}}` | Configuration for metrics collection and monitoring | | metrics.enabled | bool | `false` | Enable or disable metrics collection - Ensure you have started and configured your Jellyfin instance first as this will fail if system.xml does not exist yet. | -| metrics.serviceMonitor | object | `{"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","relabelings":[],"scheme":"http","scrapeTimeout":"30s","targetLabels":[],"tlsConfig":{}}` | Configuration for the Prometheus ServiceMonitor | +| metrics.serviceMonitor | object | `{"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","port":8096,"relabelings":[],"scheme":"http","scrapeTimeout":"30s","targetLabels":[],"tlsConfig":{}}` | Configuration for the Prometheus ServiceMonitor | | metrics.serviceMonitor.enabled | bool | `false` | Enable or disable the creation of a ServiceMonitor resource | | metrics.serviceMonitor.interval | string | `"30s"` | Interval at which metrics should be scraped | | metrics.serviceMonitor.labels | object | `{}` | Labels to add to the ServiceMonitor resource | | metrics.serviceMonitor.metricRelabelings | list | `[]` | Relabeling rules for the metrics before ingestion | | metrics.serviceMonitor.namespace | string | `""` | Namespace where the ServiceMonitor resource should be created. Defaults to Release.Namespace | | metrics.serviceMonitor.path | string | `"/metrics"` | Path to scrape for metrics | +| metrics.serviceMonitor.port | int | `8096` | Port to scrape for metrics | | metrics.serviceMonitor.relabelings | list | `[]` | Relabeling rules for the scraped metrics | | metrics.serviceMonitor.scheme | string | `"http"` | Scheme to use for scraping metrics (http or https) | | metrics.serviceMonitor.scrapeTimeout | string | `"30s"` | Timeout for scraping metrics | From d2ccc874ffb4dcac87904bdbf96c443c12ccb1ac Mon Sep 17 00:00:00 2001 From: Supporterino Date: Sun, 23 Feb 2025 18:50:49 +0100 Subject: [PATCH 3/4] chore(chart): :arrow_up: bump version --- charts/jellyfin/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jellyfin/Chart.yaml b/charts/jellyfin/Chart.yaml index 5220612..1fd3cf5 100644 --- a/charts/jellyfin/Chart.yaml +++ b/charts/jellyfin/Chart.yaml @@ -8,5 +8,5 @@ keywords: - jellyfin - media - self-hosted -version: 2.1.0 +version: 2.1.1 appVersion: 10.10.6 From 9a50e908b07ad22411553432055f97ee5b669284 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 23 Feb 2025 17:51:42 +0000 Subject: [PATCH 4/4] docs(charts): :memo: write updated reademe --- charts/jellyfin/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jellyfin/README.md b/charts/jellyfin/README.md index 3c20fa4..db89fe1 100644 --- a/charts/jellyfin/README.md +++ b/charts/jellyfin/README.md @@ -1,6 +1,6 @@ # jellyfin -![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.10.6](https://img.shields.io/badge/AppVersion-10.10.6-informational?style=flat-square) +![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.10.6](https://img.shields.io/badge/AppVersion-10.10.6-informational?style=flat-square) A Helm chart for Jellyfin Media Server