Auto-generate chart README [no ci]

* [uptimerobot-prometheus] metrics refactor

* add template to rules

* Update charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

charts/README.md

@@ -16,6 +16,7 @@
 | [calibre-web](stable/calibre-web) | Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. |
 | [calibre](stable/calibre) | Calibre is a powerful and easy to use e-book manager. |
 | [comcast](stable/comcast) | periodic comcast data usage checks and save the results to InfluxDB |
+| [cryptofolio](stable/cryptofolio) | Track your cryptocurrency holdings/portfolio |
 | [deconz](stable/deconz) | deCONZ is an easy to use control software, with which you can set up and control Zigbee networks of any size without further programming effort. |
 | [deluge](stable/deluge) | Deluge is a torrent download client |
 | [dizquetv](stable/dizquetv) | Create live TV channel streams from media on your Plex servers. |
@@ -76,6 +77,7 @@
 | [octoprint](stable/octoprint) | OctoPrint is the snappy web interface for your 3D printer |
 | [omada-controller](stable/omada-controller) | Omada enables the network administrators to monitor and manage all the Omada products in the network with a centralized management platform. |
 | [ombi](stable/ombi) | Want a Movie or TV Show on Plex or Emby? Use Ombi! |
+| [onedrive](stable/onedrive) | A free Microsoft OneDrive Client which supports OneDrive Personal, OneDrive for Business, OneDrive for Office365, and SharePoint |
 | [openemr](stable/openemr) | OpenEMR is the most popular open source electronic health records and medical practice management solution. |
 | [openkm](stable/openkm) | OpenKM integrates all essential documents management, collaboration and an advanced search functionality into one easy to use solution. |
 | [organizr](stable/organizr) | HTPC/Homelab Services Organizer |
@@ -137,6 +139,7 @@
 | [whoogle](stable/whoogle) | A self-hosted, ad-free, privacy-respecting metasearch engine |
 | [wikijs](stable/wikijs) | Make documentation a joy to write using Wiki.js's beautiful and intuitive interface! |
 | [wireguard](stable/wireguard) | Fast, modern, secure VPN tunnel |
+| [wmbusmeters](stable/wmbusmeters) | Wmbusmeters receives and decodes C1,T1 or S1 telegrams (using the wireless mbus protocol) to acquire utility meter readings. |
 | [xbackbone](stable/xbackbone) | XBackBone is a simple, self-hosted, lightweight PHP file manager that support the instant sharing tool ShareX and *NIX systems. It supports uploading and displaying images, GIF, video, code, formatted text, and file downloading and uploading. Also have a web UI with multi user management, past uploads history and search support. |
 | [xteve](stable/xteve) | M3U Proxy for Plex DVR and Emby Live TV. |
 | [youtubedl-material](stable/youtubedl-material) | Self-hosted YouTube downloader built on Material Design |

charts/stable/adguard-home/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.106.3
 description: DNS proxy as ad-blocker for local network
 name: adguard-home
-version: 5.0.1
+version: 5.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - adguard-home

charts/stable/adguard-home/README.md

@@ -1,6 +1,6 @@
 # adguard-home
 
-![Version: 5.0.1](https://img.shields.io/badge/Version-5.0.1-informational?style=flat-square) ![AppVersion: v0.106.3](https://img.shields.io/badge/AppVersion-v0.106.3-informational?style=flat-square)
+![Version: 5.0.2](https://img.shields.io/badge/Version-5.0.2-informational?style=flat-square) ![AppVersion: v0.106.3](https://img.shields.io/badge/AppVersion-v0.106.3-informational?style=flat-square)
 
 DNS proxy as ad-blocker for local network
 
@@ -85,7 +85,6 @@ N/A
 | image.tag | string | `"v0.106.3"` | image tag |
 | initContainers.copy-configmap | object | See values.yaml | Configures an initContainer that copies the configmap to the AdGuardHome conf directory It does NOT overwrite when the file already exists. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
-| prometheus.serviceMonitor | object | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -94,6 +93,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.1.0]
+
+#### Removed
+
+- Removed serviceMonitor since AdguardHome doesn't have prometheus metrics. An exporter would be needed instead.
+
 ### [5.0.1]
 
 #### Changed
@@ -140,6 +145,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
+[5.1.0]: #510
 [5.0.1]: #501
 [5.0.0]: #500
 [4.0.1]: #401

charts/stable/adguard-home/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.1.0]
+
+#### Removed
+
+- Removed serviceMonitor since AdguardHome doesn't have prometheus metrics. An exporter would be needed instead.
+
 ### [5.0.1]
 
 #### Changed
@@ -55,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
+[5.1.0]: #510
 [5.0.1]: #501
 [5.0.0]: #500
 [4.0.1]: #401

charts/stable/adguard-home/templates/servicemonitor.yaml

@@ -1,21 +0,0 @@
-{{- if .Values.prometheus.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  endpoints:
-  - port: http
-    {{- with .Values.prometheus.serviceMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    path: /
-{{- end }}

charts/stable/adguard-home/values.yaml

@@ -94,18 +94,6 @@ persistence:
     enabled: false
     mountPath: /opt/adguardhome/work
 
-prometheus:
-  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-  # @default -- See values.yaml
-  serviceMonitor:
-    enabled: false
-    interval: 30s
-    additionalLabels: {}
-
-# podAnnotations:
-#   prometheus.io/scrape: "true"
-#   prometheus.io/port: "api"
-
 # config -- AdGuard Home configuration. For a full list of options see https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration.
 # @default -- See values.yaml
 config: |

charts/stable/blocky/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.14
+appVersion: v0.15
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 8.0.0
+version: 9.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - blocky

charts/stable/blocky/README.md

@@ -1,6 +1,6 @@
 # blocky
 
-![Version: 8.0.0](https://img.shields.io/badge/Version-8.0.0-informational?style=flat-square) ![AppVersion: v0.14](https://img.shields.io/badge/AppVersion-v0.14-informational?style=flat-square)
+![Version: 9.0.2](https://img.shields.io/badge/Version-9.0.2-informational?style=flat-square) ![AppVersion: v0.15](https://img.shields.io/badge/AppVersion-v0.15-informational?style=flat-square)
 
 DNS proxy as ad-blocker for local network
 
@@ -82,9 +82,14 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"spx01/blocky"` | image repository |
-| image.tag | string | `"v0.14"` | image tag |
+| image.tag | string | `"v0.15"` | image tag |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"30s"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"10s"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
-| prometheus.serviceMonitor | object | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. See also the notes under `additionalContainers`. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -93,6 +98,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [9.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [8.0.0]
 
 #### Changed
@@ -121,6 +132,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
+[9.0.0]: #900
 [8.0.0]: #800
 [7.0.0]: #700
 [6.0.0]: #600

charts/stable/blocky/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [9.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [8.0.0]
 
 #### Changed
@@ -37,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
+[9.0.0]: #900
 [8.0.0]: #800
 [7.0.0]: #700
 [6.0.0]: #600

charts/stable/blocky/templates/prometheusrules.yaml

@@ -0,0 +1,37 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: BlockyAbsent
+          annotations:
+            description: Blocky has disappeared from Prometheus service discovery.
+            summary: Blocky is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: BlockyDisabled
+          annotations:
+            description: Blocky's ad blocking has been disabled for 15min.
+              Please re-enable protection.
+            summary: Blocky is disabled.
+          expr: |
+            blocky_blocking_enabled{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 15m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/blocky/templates/servicemonitor.yaml

@@ -1,11 +1,11 @@
-{{- if .Values.prometheus.serviceMonitor.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
@@ -13,9 +13,12 @@ spec:
     matchLabels:
       {{- include "common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
-  - port: http
-    {{- with .Values.prometheus.serviceMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    path: /metrics
+    - port: http
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
 {{- end }}

charts/stable/blocky/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: spx01/blocky
   # -- image tag
-  tag: v0.14
+  tag: v0.15
   # -- image pull policy
   pullPolicy: IfNotPresent
 
@@ -60,14 +60,32 @@ persistence:
     enabled: false
     mountPath: /logs
 
-prometheus:
+metrics:
   # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-  # See also the notes under `additionalContainers`.
   # @default -- See values.yaml
+  enabled: false
   serviceMonitor:
-    enabled: false
     interval: 30s
-    additionalLabels: {}
+    scrapeTimeout: 10s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: BlockyDisabled
+      #   annotations:
+      #     description: Blocky's ad blocking has been disabled for 15min.
+      #       Please re-enable protection.
+      #     summary: Blocky is disabled.
+      #   expr: |
+      #     blocky_blocking_enabled == 0
+      #   for: 15m
+      #   labels:
+      #     severity: critical
 
 # -- Full list of options https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
 # @default -- see URL to default config

charts/stable/cryptofolio/.helmignore

@@ -0,0 +1,26 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl

charts/stable/cryptofolio/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v2
+appVersion: V.2.2.0
+description: Track your cryptocurrency holdings/portfolio
+name: cryptofolio
+version: 1.0.0
+kubeVersion: ">=1.16.0-0"
+keywords:
+- cryptofolio
+home: https://github.com/k8s-at-home/charts/tree/master/charts/stable/cryptofolio
+icon: https://raw.githubusercontent.com/Xtrendence/Cryptofolio/main/website/assets/img/Logo.png
+sources:
+- https://github.com/Xtrendence/cryptofolio
+maintainers:
+- name: dvmrry
+  email: github@mrry.io
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 4.0.0

charts/stable/cryptofolio/README.md

@@ -0,0 +1,117 @@
+# cryptofolio
+
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: V.2.2.0](https://img.shields.io/badge/AppVersion-V.2.2.0-informational?style=flat-square)
+
+Track your cryptocurrency holdings/portfolio
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/Xtrendence/cryptofolio>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.0.0 |
+
+## TL;DR
+
+```console
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm repo update
+helm install cryptofolio k8s-at-home/cryptofolio
+```
+
+## Installing the Chart
+
+To install the chart with the release name `cryptofolio`
+
+```console
+helm install cryptofolio k8s-at-home/cryptofolio
+```
+
+## Uninstalling the Chart
+
+To uninstall the `cryptofolio` deployment
+
+```console
+helm uninstall cryptofolio
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install cryptofolio \
+  --set env.TZ="America/New York" \
+    k8s-at-home/cryptofolio
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install cryptofolio k8s-at-home/cryptofolio -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. See more environment variables in the [cryptofolio documentation](https://cryptofolio.org/docs). |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"xtrendence/cryptofolio"` | image repository |
+| image.tag | string | `"V.2.2.0"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/stable/cryptofolio/README.md.gotmpl

@@ -0,0 +1,146 @@
+{{- define "custom.repository.organization" -}}
+k8s-at-home
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}

charts/stable/cryptofolio/README_CHANGELOG.md.gotmpl

@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+{{- end -}}

charts/stable/cryptofolio/README_CONFIG.md.gotmpl

@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}

charts/stable/cryptofolio/templates/NOTES.txt

@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}

charts/stable/cryptofolio/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/stable/cryptofolio/values.yaml

@@ -0,0 +1,41 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: xtrendence/cryptofolio
+  # -- image tag
+  tag: V.2.2.0
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See more environment variables in the [cryptofolio documentation](https://cryptofolio.org/docs).
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
+
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
+service:
+  main:
+    ports:
+      http:
+        port: 80
+
+ingress:
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
+
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence: {}
+  # data:
+  #   enabled: false
+  #   mountPath: /data

charts/stable/frigate/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.8.0
 description: NVR With Realtime Object Detection for IP Cameras
 name: frigate
-version: 6.0.0
+version: 6.1.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - frigate

charts/stable/frigate/README.md

@@ -1,6 +1,6 @@
 # frigate
 
-![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![AppVersion: v0.8.0](https://img.shields.io/badge/AppVersion-v0.8.0-informational?style=flat-square)
+![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.0-informational?style=flat-square) ![AppVersion: v0.8.0](https://img.shields.io/badge/AppVersion-v0.8.0-informational?style=flat-square)
 
 NVR With Realtime Object Detection for IP Cameras
 
@@ -67,7 +67,24 @@ helm install frigate k8s-at-home/frigate -f values.yaml
 
 ## Custom configuration
 
-N/A
+### Frigate database directory
+
+It is recommended to set a separate database directory for Frigate.
+
+For example:
+
+```yaml
+persistence:
+  data:
+    enabled: true
+    mountPath: /data
+    # ...
+config: |
+  # ...
+  database:
+    path: /data/frigate.db
+  # ...
+```
 
 ## Values
 

charts/stable/frigate/README_CONFIG.md.gotmpl

@@ -5,5 +5,23 @@
 {{- define "custom.custom.configuration" -}}
 {{ template "custom.custom.configuration.header" . }}
 
-N/A
+### Frigate database directory
+
+It is recommended to set a separate database directory for Frigate.
+
+For example:
+
+```yaml
+persistence:
+  data:
+    enabled: true
+    mountPath: /data
+    # ...
+config: |
+  # ...
+  database:
+    path: /data/frigate.db
+  # ...
+```
+
 {{- end -}}

charts/stable/frigate/ci/ct-values.yaml

@@ -0,0 +1,5 @@
+persistence:
+  data:
+    enabled: true
+    type: emptyDir
+    mountPath: /data

charts/stable/frigate/values.yaml

@@ -101,6 +101,8 @@ config: |
   mqtt:
     host: test.mosquitto.org
     topic_prefix: frigate
+  database:
+    path: /data/frigate.db
   detectors:
     cpu1:
       type: cpu

charts/stable/games-on-whales/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.0.0
 description: Streams graphic applications/games (retroarch, firefox, steam) runing on Kubernetes
 name: games-on-whales
-version: 1.3.0
+version: 1.4.0
 kubeVersion: ">=1.19.0-0"
 keywords:
 - games-on-whales

charts/stable/games-on-whales/README.md

@@ -1,6 +1,6 @@
 # games-on-whales
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 Streams graphic applications/games (retroarch, firefox, steam) runing on Kubernetes
 
@@ -85,14 +85,7 @@ graphic_resources:
 #### Nvidia
 
 If you use the Nvidia propietary device driver then you will need the
-[Nvidia device plugin](https://github.com/NVIDIA/k8s-device-plugin)
-and set `graphic_resources` value to specify the resource limits.
-Example:
-
-```
-graphic_resources:
-  nvidia.com/gpu: 1 # requesting 1 nvidia GPU
-```
+[Nvidia device plugin](https://github.com/NVIDIA/k8s-device-plugin).
 
 #### Proxmox
 
@@ -156,6 +149,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [1.4.0]
+
+#### Added
+
+- add required env variables for nvidia runtime
+
 ### [1.3.0]
 
 #### Added

charts/stable/games-on-whales/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [1.4.0]
+
+#### Added
+
+- add required env variables for nvidia runtime
+
 ### [1.3.0]
 
 #### Added

charts/stable/games-on-whales/README_CONFIG.md.gotmpl

@@ -24,14 +24,7 @@ graphic_resources:
 #### Nvidia
 
 If you use the Nvidia propietary device driver then you will need the
-[Nvidia device plugin](https://github.com/NVIDIA/k8s-device-plugin)
-and set `graphic_resources` value to specify the resource limits.
-Example:
-
-```
-graphic_resources:
-  nvidia.com/gpu: 1 # requesting 1 nvidia GPU
-```
+[Nvidia device plugin](https://github.com/NVIDIA/k8s-device-plugin).
 
 #### Proxmox
 

charts/stable/games-on-whales/templates/common.yaml

@@ -26,6 +26,8 @@ env:
   SUNSHINE_USER: {{ .Values.sunshine.user }}
   GOW_REQUIRED_DEVICES: /dev/uinput /dev/input/event* /dev/dri/*
   XDG_RUNTIME_DIR: /tmp/.X11-unix
+  NVIDIA_DRIVER_CAPABILITIES: utility,video,graphics,display
+  NVIDIA_VISIBLE_DEVICES: all
   {{- if .Values.sunshine.env }}
   {{ .Values.sunshine.env | toYaml | nindent 2 }}
   {{- end }}
@@ -64,6 +66,10 @@ additionalContainers:
       value: {{ .Values.xorg.refreshrate | quote}}
     - name: RESOLUTION
       value: {{ .Values.xorg.resolution | quote }}
+    - name: NVIDIA_DRIVER_CAPABILITIES
+      value: all
+    - name: NVIDIA_VISIBLE_DEVICES
+      value: all
     volumeMounts:
     - name: dev-input
       mountPath: /dev/input
@@ -105,6 +111,10 @@ additionalContainers:
       value: "/tmp/pulse/pulse-socket"
     - name: GOW_REQUIRED_DEVICES
       value: /dev/uinput /dev/input/event* /dev/dri/* /dev/snd/*
+    - name: NVIDIA_DRIVER_CAPABILITIES
+      value: all
+    - name: NVIDIA_VISIBLE_DEVICES
+      value: all
     volumeMounts:
     - name: audio-socket
       mountPath: /tmp/pulse
@@ -147,6 +157,10 @@ additionalContainers:
       value: {{ .Values.steam.protonLog | quote }}
     - name: PULSE_SERVER
       value: "/tmp/pulse/pulse-socket"
+    - name: NVIDIA_DRIVER_CAPABILITIES
+      value: all
+    - name: NVIDIA_VISIBLE_DEVICES
+      value: all
     volumeMounts:
     - name: audio-socket
       mountPath: /tmp/pulse
@@ -180,6 +194,10 @@ additionalContainers:
       value: {{ .Values.firefox.logLevel | quote }}
     - name: PULSE_SERVER
       value: "/tmp/pulse/pulse-socket"
+    - name: NVIDIA_DRIVER_CAPABILITIES
+      value: all
+    - name: NVIDIA_VISIBLE_DEVICES
+      value: all
     volumeMounts:
     - name: audio-socket
       mountPath: /tmp/pulse

charts/stable/home-assistant/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2021.6.3
 description: Home Assistant
 name: home-assistant
-version: 10.1.0
+version: 11.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - home-assistant

charts/stable/home-assistant/README.md

@@ -1,6 +1,6 @@
 # home-assistant
 
-![Version: 10.1.0](https://img.shields.io/badge/Version-10.1.0-informational?style=flat-square) ![AppVersion: 2021.6.3](https://img.shields.io/badge/AppVersion-2021.6.3-informational?style=flat-square)
+![Version: 11.0.2](https://img.shields.io/badge/Version-11.0.2-informational?style=flat-square) ![AppVersion: 2021.6.3](https://img.shields.io/badge/AppVersion-2021.6.3-informational?style=flat-square)
 
 Home Assistant
 
@@ -72,6 +72,25 @@ helm install home-assistant k8s-at-home/home-assistant -f values.yaml
 
 ## Custom configuration
 
+### HTTP 400 bad request while accessing from your browser
+
+When configuring Home Assistant behind a reverse proxy make sure you configure the [http](https://www.home-assistant.io/integrations/http) component and set `trusted_proxies` correctly and `use_x_forwarded_for` to `true`.
+
+For example:
+
+```yaml
+http:
+  server_host: 0.0.0.0
+  ip_ban_enabled: true
+  login_attempts_threshold: 5
+  use_x_forwarded_for: true
+  trusted_proxies:
+  # Pod CIDR
+  - 10.69.0.0/16
+  # Node CIDR
+  - 192.168.42.0/24
+```
+
 ### Z-Wave / Zigbee
 
 A Z-Wave and/or Zigbee controller device could be used with Home Assistant if passed through from the host to the pod. Skip this section if you are using zwave2mqtt and/or zigbee2mqtt or plan to.
@@ -131,10 +150,15 @@ The value derived is the name of the kubernetes service object for home-assistan
 | influxdb | object | See values.yaml | Enable and configure influxdb database subchart under this key.    For more options see [influxdb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/influxdb) |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | mariadb | object | See values.yaml | Enable and configure mariadb database subchart under this key.    For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"1m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"30s"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | persistence.usb | object | See values.yaml | Configure a hostPathMount to mount a USB device in the container. |
 | postgresql | object | See values.yaml | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) |
-| prometheus.serviceMonitor | object | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
 | securityContext | object | `{"privileged":null}` | Enable devices to be discoverable hostNetwork: true -- When hostNetwork is true set dnsPolicy to ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet |
 | securityContext.privileged | bool | `nil` | Privileged securityContext may be required if USB devics are accessed directly through the host machine |
 | service | object | See values.yaml | Configures service settings for the chart. Normally this does not need to be modified. |
@@ -146,6 +170,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [11.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [10.0.0]
 
 #### Changed
@@ -237,6 +267,7 @@ Any pre-existing StatefulSet will have to be removed before upgrading due to a n
 
 This is the last version before starting this changelog. All sorts of cool stuff was changed, but only `git log` remembers what that was :slightly_frowning_face:
 
+[11.0.0]: #1100
 [10.0.0]: #1000
 [9.0.1]: #901
 [9.0.0]: #900

charts/stable/home-assistant/README_CHANGELOG.md.gotmpl

@@ -10,6 +10,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [11.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [10.0.0]
 
 #### Changed
@@ -101,6 +107,7 @@ Any pre-existing StatefulSet will have to be removed before upgrading due to a n
 
 This is the last version before starting this changelog. All sorts of cool stuff was changed, but only `git log` remembers what that was :slightly_frowning_face:
 
+[11.0.0]: #1100
 [10.0.0]: #1000
 [9.0.1]: #901
 [9.0.0]: #900

charts/stable/home-assistant/README_CONFIG.md.gotmpl

@@ -5,6 +5,25 @@
 {{- define "custom.custom.configuration" -}}
 {{ template "custom.custom.configuration.header" . }}
 
+### HTTP 400 bad request while accessing from your browser
+
+When configuring Home Assistant behind a reverse proxy make sure you configure the [http](https://www.home-assistant.io/integrations/http) component and set `trusted_proxies` correctly and `use_x_forwarded_for` to `true`.
+
+For example:
+
+```yaml
+http:
+  server_host: 0.0.0.0
+  ip_ban_enabled: true
+  login_attempts_threshold: 5
+  use_x_forwarded_for: true
+  trusted_proxies:
+  # Pod CIDR
+  - 10.69.0.0/16
+  # Node CIDR
+  - 192.168.42.0/24
+```
+
 ### Z-Wave / Zigbee
 
 A Z-Wave and/or Zigbee controller device could be used with Home Assistant if passed through from the host to the pod. Skip this section if you are using zwave2mqtt and/or zigbee2mqtt or plan to.

charts/stable/home-assistant/templates/prometheusrules.yaml

@@ -0,0 +1,27 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: HomeAssistantAbsent
+          annotations:
+            description: Home Assistant has disappeared from Prometheus service discovery.
+            summary: Home Assistant is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/home-assistant/templates/servicemonitor.yaml

@@ -1,11 +1,11 @@
-{{- if .Values.prometheus.serviceMonitor.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
@@ -13,20 +13,23 @@ spec:
     matchLabels:
       {{- include "common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
-  - port: {{ .Values.prometheus.serviceMonitor.portName }}
-    {{- with .Values.prometheus.serviceMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    {{- with .Values.prometheus.serviceMonitor.bearerTokenFile }}
-    bearerTokenFile: {{ . }}
-    {{- end }}
-    {{- with .Values.prometheus.serviceMonitor.bearerTokenSecret }}
-    bearerTokenSecret:
-      name: {{ .name }}
-      key: {{ .key }}
-      {{- with .optional }}
-      optional: {{ . }}
+    - port: http
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /api/prometheus
+      {{- with .Values.metrics.serviceMonitor.bearerTokenFile }}
+      bearerTokenFile: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.bearerTokenSecret }}
+      bearerTokenSecret:
+        name: {{ .name }}
+        key: {{ .key }}
+        {{- with .optional }}
+        optional: {{ . }}
+        {{- end }}
       {{- end }}
-    {{- end }}
-    path: /api/prometheus
 {{- end }}

charts/stable/home-assistant/values.yaml

@@ -43,21 +43,6 @@ securityContext:
   # -- (bool) Privileged securityContext may be required if USB devics are accessed directly through the host machine
   privileged:  # true
 
-prometheus:
-  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-  # @default -- See values.yaml
-  serviceMonitor:
-    enabled: false
-    portName: http
-    ## See https://www.home-assistant.io/docs/authentication/ for where to find
-    ## long lived access token creation under your account profile, which is
-    ## needed to monitor Home Assistant
-    # bearerTokenSecret:
-    #   name: ""
-    #   key: ""
-    # interval: 1m
-    # additionalLabels: {}
-
 # -- Configure persistence settings for the chart under this key.
 # @default -- See values.yaml
 persistence:
@@ -110,3 +95,36 @@ influxdb:
     enabled: false
     # storageClass: ""
     # size: 8Gi
+
+metrics:
+  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 1m
+    scrapeTimeout: 30s
+    labels: {}
+    ## See https://www.home-assistant.io/docs/authentication/ for where to find
+    ## long lived access token creation under your account profile, which is
+    ## needed to monitor Home Assistant
+    # bearerTokenSecret:
+    #   name: ""
+    #   key: ""
+
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: HomeAssistantAbsent
+      #   annotations:
+      #     description: Home Assistant has disappeared from Prometheus service discovery.
+      #     summary: Home Assistant is down.
+      #   expr: |
+      #     absent(up{job=~".*home-assistant.*"} == 1)
+      #   for: 5m
+      #   labels:
+      #     severity: critical

charts/stable/lidarr/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v1.0.0.2226
+appVersion: v1.0.0.2255
 description: Looks and smells like Sonarr but made for music
 name: lidarr
-version: 11.0.0
+version: 13.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - lidarr

charts/stable/lidarr/README.md

@@ -1,6 +1,6 @@
 # lidarr
 
-![Version: 11.0.0](https://img.shields.io/badge/Version-11.0.0-informational?style=flat-square) ![AppVersion: v1.0.0.2226](https://img.shields.io/badge/AppVersion-v1.0.0.2226-informational?style=flat-square)
+![Version: 13.0.2](https://img.shields.io/badge/Version-13.0.2-informational?style=flat-square) ![AppVersion: v1.0.0.2255](https://img.shields.io/badge/AppVersion-v1.0.0.2255-informational?style=flat-square)
 
 Looks and smells like Sonarr but made for music
 
@@ -80,11 +80,22 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/k8s-at-home/lidarr"` | image repository |
-| image.tag | string | `"v1.0.0.2226"` | image tag |
+| image.tag | string | `"v1.0.0.2255"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure Exportarr sidecar and Prometheus serviceMonitor. |
+| metrics.exporter.env.additionalMetrics | bool | `false` | Set to true to enable gathering of additional metrics (slow) |
+| metrics.exporter.env.port | int | `9792` | metrics port |
+| metrics.exporter.env.unknownQueueItems | bool | `false` | Set to true to enable gathering unknown queue items |
+| metrics.exporter.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| metrics.exporter.image.repository | string | `"ghcr.io/onedr0p/exportarr"` | image repository |
+| metrics.exporter.image.tag | string | `"v0.6.1"` | image tag |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"3m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"1m"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | probes | object | See values.yaml | Configures the probes for the main Pod. |
-| prometheus.podMonitor | object | See values.yaml | Enable and configure a Prometheus podMonitor for the chart under this key. See also the notes under `additionalContainers`. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -93,6 +104,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [13.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [12.0.0]
+
+#### Changed
+
+- Refactoring of the Exportarr sidecar and Prometheus podMonitor. This is a breaking change if it was enabled previously.
+
 ### [11.0.0]
 
 #### Changed
@@ -119,6 +142,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[13.0.0]: #1300
+[12.0.0]: #1200
 [11.0.0]: #1100
 [10.0.0]: #1000
 [9.0.0]: #900

charts/stable/lidarr/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [13.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [12.0.0]
+
+#### Changed
+
+- Refactoring of the Exportarr sidecar and Prometheus podMonitor. This is a breaking change if it was enabled previously.
+
 ### [11.0.0]
 
 #### Changed
@@ -35,6 +47,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[13.0.0]: #1300
+[12.0.0]: #1200
 [11.0.0]: #1100
 [10.0.0]: #1000
 [9.0.0]: #900

charts/stable/lidarr/ci/ct-exportarr-values.yaml

@@ -7,7 +7,7 @@ persistence:
 additionalContainers:
   exportarr:
     name: exportarr
-    image: ghcr.io/onedr0p/exportarr:v0.6.0
+    image: ghcr.io/onedr0p/exportarr:v0.6.1
     imagePullPolicy: IfNotPresent
     args: ["exportarr", "lidarr"]
     env:

charts/stable/lidarr/templates/common.yaml

@@ -1 +1,47 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "lidarr.harcodedValues" -}}
+{{ if .Values.metrics.enabled }}
+additionalContainers:
+  exporter:
+    name: exporter
+    image: "{{ .Values.metrics.exporter.image.repository }}:{{ .Values.metrics.exporter.image.tag }}"
+    imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy }}
+    args: ["exportarr", "lidarr"]
+    env:
+      - name: URL
+        value: "http://localhost"
+      - name: CONFIG
+        value: "/config/config.xml"
+      - name: PORT
+        value: "{{ .Values.metrics.exporter.env.port }}"
+      - name: ENABLE_ADDITIONAL_METRICS
+        value: "{{ .Values.metrics.exporter.env.additionalMetrics }}"
+      - name: ENABLE_UNKNOWN_QUEUE_ITEMS
+        value: "{{ .Values.metrics.exporter.env.unknownQueueItems }}"
+    ports:
+      - name: metrics
+        containerPort: {{ .Values.metrics.exporter.env.port }}
+    volumeMounts:
+      {{ if .Values.persistence.config.enabled }}
+      - name: config
+        mountPath: /config
+        readOnly: true
+      {{ end }}
+
+service:
+  metrics:
+    enabled: true
+    ports:
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: {{ .Values.metrics.exporter.env.port }}
+{{ end }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "lidarr.harcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
 {{ include "common.all" . }}

charts/stable/lidarr/templates/podmonitor.yaml

@@ -1,24 +0,0 @@
-{{- if .Values.prometheus.podMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.podMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  podMetricsEndpoints:
-  - port: exportarr
-    {{- with .Values.prometheus.podMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ . }}
-    {{- end }}
-    path: /metrics
-{{- end }}

charts/stable/lidarr/templates/prometheusrules.yaml

@@ -0,0 +1,37 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: ExportarrAbsent
+          annotations:
+            description: Lidarr Exportarr has disappeared from Prometheus
+              service discovery.
+            summary: Exportarr is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: LidarrDown
+          annotations:
+            description: Lidarr service is down.
+            summary: Lidarr is down.
+          expr: |
+            lidarr_system_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/lidarr/templates/servicemonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}

charts/stable/lidarr/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: ghcr.io/k8s-at-home/lidarr
   # -- image tag
-  tag: v1.0.0.2226
+  tag: v1.0.0.2255
   # -- image pull policy
   pullPolicy: IfNotPresent
 
@@ -57,6 +57,7 @@ probes:
       timeoutSeconds: 10
 
 # -- Configure persistence settings for the chart under this key.
+## Config persistence is required for the Prometheus exporter sidecar.
 # @default -- See values.yaml
 persistence:
   config:
@@ -66,35 +67,43 @@ persistence:
     enabled: false
     mountPath: /media
 
-prometheus:
-  # -- Enable and configure a Prometheus podMonitor for the chart under this key.
-  # See also the notes under `additionalContainers`.
+metrics:
+  # -- Enable and configure Exportarr sidecar and Prometheus serviceMonitor.
   # @default -- See values.yaml
-  podMonitor:
-    enabled: false
+  enabled: false
+  serviceMonitor:
     interval: 3m
     scrapeTimeout: 1m
-    additionalLabels: {}
-
-# # When using the prometheus.podMonitor the following
-# # container is required
-# additionalContainers:
-#   exportarr:
-#     name: exportarr
-#     image: ghcr.io/onedr0p/exportarr:v0.6.0
-#     imagePullPolicy: IfNotPresent
-#     args: ["exportarr", "lidarr"]
-#     env:
-#     - name: PORT
-#       value: "32123"
-#     - name: URL
-#       value: "http://localhost"
-#     - name: CONFIG
-#       value: "/config/config.xml"
-#     ports:
-#     - name: exportarr
-#       containerPort: 32123
-#     volumeMounts:
-#     - name: config
-#       mountPath: /config
-#       readOnly: true
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: LidarrDown
+      #   annotations:
+      #     description: Lidarr service is down.
+      #     summary: Lidarr is down.
+      #   expr: |
+      #     lidarr_system_status == 0
+      #   for: 5m
+      #   labels:
+      #     severity: critical
+  exporter:
+    image:
+      # -- image repository
+      repository: ghcr.io/onedr0p/exportarr
+      # -- image tag
+      tag: v0.6.1
+      # -- image pull policy
+      pullPolicy: IfNotPresent
+    env:
+      # -- metrics port
+      port: 9792
+      # -- Set to true to enable gathering of additional metrics (slow)
+      additionalMetrics: false
+      # -- Set to true to enable gathering unknown queue items
+      unknownQueueItems: false

charts/stable/multus/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v3.7.1
 description: multus CNI allows multiple NICs per pod
 name: multus
-version: 3.0.0
+version: 3.1.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - multus

charts/stable/multus/README.md

@@ -1,6 +1,6 @@
 # multus
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: v3.7.1](https://img.shields.io/badge/AppVersion-v3.7.1-informational?style=flat-square)
+![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![AppVersion: v3.7.1](https://img.shields.io/badge/AppVersion-v3.7.1-informational?style=flat-square)
 
 multus CNI allows multiple NICs per pod
 
@@ -107,6 +107,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [3.1.0]
+
+#### Changed
+
+- Added pre-upgrade and pre-rollback to avoid hangs during chart upgrades
+
 ### [3.0.0]
 
 #### Changed

charts/stable/multus/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [3.1.0]
+
+#### Changed
+
+- Added pre-upgrade and pre-rollback to avoid hangs during chart upgrades
+
 ### [3.0.0]
 
 #### Changed

charts/stable/multus/templates/uninstallJob.yaml

@@ -7,7 +7,7 @@ metadata:
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
-    "helm.sh/hook": pre-delete
+    "helm.sh/hook": pre-delete,pre-upgrade,pre-rollback
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:

charts/stable/network-ups-tools/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v2.7.4-2474-gb4a58380
+appVersion: v2.7.4-2479-g86a32237
 description: Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS, PDU and SCD hardware.
 name: network-ups-tools
-version: 5.0.0
+version: 6.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - nut

charts/stable/network-ups-tools/README.md

@@ -1,6 +1,6 @@
 # network-ups-tools
 
-![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: v2.7.4-2474-gb4a58380](https://img.shields.io/badge/AppVersion-v2.7.4--2474--gb4a58380-informational?style=flat-square)
+![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![AppVersion: v2.7.4-2479-g86a32237](https://img.shields.io/badge/AppVersion-v2.7.4--2479--g86a32237-informational?style=flat-square)
 
 Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS, PDU and SCD hardware.
 
@@ -81,8 +81,23 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/k8s-at-home/network-ups-tools"` | image repository |
-| image.tag | string | `"v2.7.4-2474-gb4a58380"` | image tag |
+| image.tag | string | `"v2.7.4-2479-g86a32237"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure prometheus-nut-exporter sidecar and Prometheus serviceMonitor. |
+| metrics.exporter.env.logLevel | string | `"info"` | log level [info|debug|trace] |
+| metrics.exporter.env.port | int | `9995` | metrics port |
+| metrics.exporter.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| metrics.exporter.image.repository | string | `"hon95/prometheus-nut-exporter"` | image repository |
+| metrics.exporter.image.tag | string | `"1.1.1"` | image tag |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"30s"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"10s"` |  |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| persistence.ups.hostPath | string | `"/dev/bus/usb/001/001"` | The path of the usb ups on the host. |
+| persistence.ups.mountPath | string | `"/dev/bus/usb/001/001"` | Optional path for ups to mount in the container. |
+| securityContext | object | See values.yaml | Set to true if using ups connected by usb to the host |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -91,6 +106,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [6.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [5.1.0]
+
+### Added
+
+- Added podMonitor and the ability to use [prometheus-nut-exporter](https://github.com/HON95/prometheus-nut-exporter) as a sidecar container.
+
 ### [5.0.0]
 
 #### Changed
@@ -112,6 +139,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[6.0.0]: #600
+[5.1.0]: #510
 [5.0.0]: #500
 [4.0.0]: #400
 [1.0.0]: #100

charts/stable/network-ups-tools/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [6.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [5.1.0]
+
+### Added
+
+- Added podMonitor and the ability to use [prometheus-nut-exporter](https://github.com/HON95/prometheus-nut-exporter) as a sidecar container.
+
 ### [5.0.0]
 
 #### Changed
@@ -30,6 +42,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[6.0.0]: #600
+[5.1.0]: #510
 [5.0.0]: #500
 [4.0.0]: #400
 [1.0.0]: #100

charts/stable/network-ups-tools/templates/common.yaml

@@ -14,10 +14,35 @@ persistence:
         name: {{ printf "%v-config" (include "common.names.fullname" .) }}
         defaultMode: 256
         optional: true
+
+{{ if .Values.metrics.enabled }}
+additionalContainers:
+  exporter:
+    name: exporter
+    image: "{{ .Values.metrics.exporter.image.repository }}:{{ .Values.metrics.exporter.image.tag }}"
+    imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy }}
+    env:
+      - name: HTTP_PORT
+        value: "{{ .Values.metrics.exporter.env.port }}"
+      - name: HTTP_PATH
+        value: "/metrics"
+      - name: RUST_LOG
+        value: "{{ .Values.metrics.exporter.env.logLevel }}"
+    ports:
+      - name: metrics
+        containerPort: {{ .Values.metrics.exporter.env.port }}
+
+service:
+  metrics:
+    enabled: true
+    ports:
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: {{ .Values.metrics.exporter.env.port }}
+{{ end }}
 {{- end -}}
-{{- if eq .Values.config.mode "values" -}}
-  {{- $_ := mergeOverwrite .Values (include "network-ups-tools.harcodedValues" . | fromYaml) -}}
-{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "network-ups-tools.harcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}

charts/stable/network-ups-tools/templates/prometheusrules.yaml

@@ -0,0 +1,55 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: NutExporterAbsent
+          annotations:
+            description: NUT Exporter has disappeared from Prometheus target discovery.
+            summary: NUT Exporter is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: UpsStatusUnknown
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} is reporting a status of unknown.
+            summary: UPS status unknown.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 10s
+          labels:
+            severity: critical
+        - alert: UpsOnBattery
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} has lost power and is running on battery.
+            summary: UPS is running on battery.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 2
+          for: 10s
+          labels:
+            severity: critical
+        - alert: UpsLowBattery
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} battery is low and the system is getting
+              ready to shutdown.
+            summary: UPS battery is low.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 3
+          for: 5s
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/network-ups-tools/templates/servicemonitor.yaml

@@ -0,0 +1,30 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+      params:
+        target:
+          - "localhost:{{ .Values.service.main.ports.server.port }}"
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: target
+{{- end }}

charts/stable/network-ups-tools/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: ghcr.io/k8s-at-home/network-ups-tools
   # -- image tag
-  tag: v2.7.4-2474-gb4a58380
+  tag: v2.7.4-2479-g86a32237
   # -- image pull policy
   pullPolicy: IfNotPresent
 
@@ -37,6 +37,23 @@ ingress:
   main:
     enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence:
+  ups:
+    enabled: false
+    type: hostPath
+    # -- The path of the usb ups on the host.
+    hostPath: /dev/bus/usb/001/001
+    # -- Optional path for ups to mount in the container.
+    mountPath: /dev/bus/usb/001/001
+    readOnly: false
+
+# -- Set to true if using ups connected by usb to the host
+# @default -- See values.yaml
+securityContext:
+  privileged: false
+
 config:
   # -- If set to 'values', the configuration will be read from these values.
   # Otherwise you have to mount a volume to /etc/nut containing the configuration files.
@@ -56,3 +73,42 @@ config:
         driver = dummy-ups
         port = dummy-ups.dev
         desc = "dummy-ups in dummy mode"
+
+metrics:
+  # -- Enable and configure prometheus-nut-exporter sidecar and Prometheus serviceMonitor.
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 30s
+    scrapeTimeout: 10s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: UpsStatusUnknown
+      #   annotations:
+      #     description: UPS {{ "{{ $labels.ups }}" }} is reporting a status of unknown.
+      #     summary: UPS status unknown.
+      #   expr: |
+      #     nut_status == 0
+      #   for: 10s
+      #   labels:
+      #     severity: critical
+  exporter:
+    image:
+      # -- image repository
+      repository: hon95/prometheus-nut-exporter
+      # -- image tag
+      tag: 1.1.1
+      # -- image pull policy
+      pullPolicy: IfNotPresent
+    env:
+      # -- metrics port
+      port: 9995
+      # -- log level [info|debug|trace]
+      logLevel: info

charts/stable/onedrive/Chart.yaml

@@ -0,0 +1,20 @@
+apiVersion: v2
+appVersion: v2.4.12
+description: A free Microsoft OneDrive Client which supports OneDrive Personal, OneDrive for Business, OneDrive for Office365, and SharePoint
+name: onedrive
+version: 2.0.0
+kubeVersion: ">=1.16.0-0"
+keywords:
+- onedrive
+- filesync
+home: https://github.com/k8s-at-home/charts/tree/master/charts/incubator/onedrive
+icon: https://github.com/abraunegg/abraunegg.github.io/raw/master/images/linux_onedrive_logo.jpg
+sources:
+- https://github.com/abraunegg/onedrive
+maintainers:
+- name: wrmilling
+  email: winston@milli.ng
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 4.0.0

charts/stable/onedrive/README.md

@@ -0,0 +1,139 @@
+# onedrive
+
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: v2.4.12](https://img.shields.io/badge/AppVersion-v2.4.12-informational?style=flat-square)
+
+A free Microsoft OneDrive Client which supports OneDrive Personal, OneDrive for Business, OneDrive for Office365, and SharePoint
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/abraunegg/onedrive>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.0.0 |
+
+## TL;DR
+
+```console
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm repo update
+helm install onedrive k8s-at-home/onedrive
+```
+
+## Installing the Chart
+
+To install the chart with the release name `onedrive`
+
+```console
+helm install onedrive k8s-at-home/onedrive
+```
+
+## Uninstalling the Chart
+
+To uninstall the `onedrive` deployment
+
+```console
+helm uninstall onedrive
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install onedrive \
+  --set env.TZ="America/New York" \
+    k8s-at-home/onedrive
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install onedrive k8s-at-home/onedrive -f values.yaml
+```
+
+## Custom configuration
+
+To use this chart you will need to provide an authentication response from Microsoft for the client to use. This is provided as an environment variable like the claim token is for the plex chart.
+
+In order to generate an authentication response value you must do the following:
+
+1. Visit the following URL: [Authenticate for OneDrive](https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=d50ca740-c83f-4d1b-b616-12c519384f0c&scope=Files.ReadWrite%20Files.ReadWrite.all%20Sites.ReadWrite.All%20offline_access&response_type=code&redirect_uri=https://login.microsoftonline.com/common/oauth2/nativeclient)
+2. Follow the prompts to login and get your token URL.
+3. Copy the URL when you arrive at the blank page (should look like this: `https://login.microsoftonline.com/common/oauth2/nativeclient?code=<redacted>`) and provide it to the chart through the `ONEDRIVE_AUTHRESPONSE` environment variable, preferrably secured through some secret.
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| config | string | `"# Configuration for OneDrive Linux Client\n# This file contains the list of supported configuration fields\n# with their default values.\n# All values need to be enclosed in quotes\n# When changing a config option below, remove the '#' from the start of the line\n# For explanations of all config options below see docs/USAGE.md or the man page.\n#\n# sync_dir = \"/onedrive/data\"\n# skip_file = \"~*|.~*|*.tmp\"\n# monitor_interval = \"300\"\n# skip_dir = \"\"\n# log_dir = \"/var/log/onedrive/\"\n# drive_id = \"\"\n# upload_only = \"false\"\n# check_nomount = \"false\"\n# check_nosync = \"false\"\n# download_only = \"false\"\n# disable_notifications = \"false\"\n# disable_upload_validation = \"false\"\n# enable_logging = \"false\"\n# force_http_2 = \"false\"\n# local_first = \"false\"\n# no_remote_delete = \"false\"\n# skip_symlinks = \"false\"\n# debug_https = \"false\"\n# skip_dotfiles = \"false\"\n# dry_run = \"false\"\n# min_notify_changes = \"5\"\n# monitor_log_frequency = \"5\"\n# monitor_fullscan_frequency = \"10\"\n# sync_root_files = \"false\"\n# classify_as_big_delete = \"1000\"\n# user_agent = \"\"\n# remove_source_files = \"false\"\n# skip_dir_strict_match = \"false\"\napplication_id = \"d50ca740-c83f-4d1b-b616-12c519384f0c\"\n# resync = \"false\"\n# bypass_data_preservation = \"false\"\n# azure_ad_endpoint = \"\"\n# azure_tenant_id = \"common\"\n# sync_business_shared_folders = \"false\"\n# sync_dir_permissions = \"700\"\n# sync_file_permissions = \"600\"\n# rate_limit = \"131072\"\n"` |  |
+| env | object | See below and commented variables in values.yaml | environment variables. |
+| env.ONEDRIVE_AUTHRESPONSE | string | `""` | Set the One Drive Authentication Response |
+| env.ONEDRIVE_GID | int | `1000` | Set the One Drive Group ID |
+| env.ONEDRIVE_UID | int | `1000` | Set the OneDrive User ID |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"ghcr.io/wrmilling/onedrive-docker"` | image repository |
+| image.tag | string | `"v2.0.2"` | image tag |
+| persistence | object | See values.yaml for full listing | Configure persistence settings for the chart under this key. |
+| persistence.config | object | `{"accessMode":"ReadWriteOnce","enabled":true,"mountPath":"/onedrive/conf"}` | OneDrive config storage |
+| persistence.config.enabled | bool | `true` | If config storage should be enabled |
+| persistence.data | object | `{"accessMode":"ReadWriteOnce","enabled":true,"mountPath":"/onedrive/data","readOnly":false,"retain":false,"size":"5Gi","type":"pvc"}` | OneDrive data storage |
+| persistence.data.enabled | bool | `true` | If data storage should be enabled |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [2.0.0]
+
+This release moves away from the auth-files approach and uses a custom docker image that allows the responseUrl to be passed directly as an environment variable, similar to how Plex does claim tokens.
+
+#### Removed
+
+* Removed requirement for `onedrive-auth` secret, you can now provide the `ONEDRIVE_AUTHRESPONSE` however you wish to do so
+* Remove `KAH_HELM_INSTALL` environment variable
+
+### [1.1.0]
+
+#### Added
+
+- Modified the docker path to be against specific versions, no more `latest`
+- Cleaned up the transfer between secrets to application so that login can happen
+- Cleaned up Custom Setup section of README.md
+- Hard coded upstream `application_id` (Doesn't change, can be updated with future releases from upstream)
+
+### [1.0.0]
+
+#### Added
+
+- Ability to run a abraunegg/onedrive instance
+
+[1.0.0]: #1.0.0
+
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/stable/onedrive/README.md.gotmpl

@@ -0,0 +1,146 @@
+{{- define "custom.repository.organization" -}}
+k8s-at-home
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}

charts/stable/onedrive/README_CHANGELOG.md.gotmpl

@@ -0,0 +1,37 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [2.0.0]
+
+This release moves away from the auth-files approach and uses a custom docker image that allows the responseUrl to be passed directly as an environment variable, similar to how Plex does claim tokens.
+
+#### Removed
+
+* Removed requirement for `onedrive-auth` secret, you can now provide the `ONEDRIVE_AUTHRESPONSE` however you wish to do so
+* Remove `KAH_HELM_INSTALL` environment variable
+
+### [1.1.0]
+
+#### Added
+
+- Modified the docker path to be against specific versions, no more `latest`
+- Cleaned up the transfer between secrets to application so that login can happen
+- Cleaned up Custom Setup section of README.md
+- Hard coded upstream `application_id` (Doesn't change, can be updated with future releases from upstream)
+
+### [1.0.0]
+
+#### Added
+
+- Ability to run a abraunegg/onedrive instance
+
+[1.0.0]: #1.0.0
+{{- end -}}

charts/stable/onedrive/README_CONFIG.md.gotmpl

@@ -0,0 +1,16 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+To use this chart you will need to provide an authentication response from Microsoft for the client to use. This is provided as an environment variable like the claim token is for the plex chart.
+
+In order to generate an authentication response value you must do the following:
+
+1. Visit the following URL: [Authenticate for OneDrive](https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=d50ca740-c83f-4d1b-b616-12c519384f0c&scope=Files.ReadWrite%20Files.ReadWrite.all%20Sites.ReadWrite.All%20offline_access&response_type=code&redirect_uri=https://login.microsoftonline.com/common/oauth2/nativeclient)
+2. Follow the prompts to login and get your token URL.
+3. Copy the URL when you arrive at the blank page (should look like this: `https://login.microsoftonline.com/common/oauth2/nativeclient?code=<redacted>`) and provide it to the chart through the `ONEDRIVE_AUTHRESPONSE` environment variable, preferrably secured through some secret.
+
+{{- end -}}

charts/stable/onedrive/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+env:
+  ONEDRIVE_AUTHFILES: "/onedrive/conf/auth-request:/onedrive/conf/auth-response"

charts/stable/onedrive/templates/NOTES.txt

@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}

charts/stable/onedrive/templates/common.yaml

@@ -0,0 +1,30 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "onedrive.hardcodedValues" -}}
+service:
+  main:
+    enabled: false
+
+probes:
+  liveness:
+    enabled: false
+  readiness:
+    enabled: false
+  startup:
+    enabled: false
+
+persistence:
+  onedrive-settings:
+    enabled: "true"
+    mountPath: "/onedrive/conf/config"
+    subPath: "config"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-config" (include "common.names.fullname" .) }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "onedrive.hardcodedValues" . | fromYaml) -}}
+
+{{ include "common.all" . }}

charts/stable/onedrive/templates/configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-config
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+data:
+  config: |
+{{ .Values.config | indent 4 }}

charts/stable/onedrive/values.yaml

@@ -0,0 +1,100 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: ghcr.io/wrmilling/onedrive-docker
+  # -- image tag
+  tag: v2.0.2
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables.
+# @default -- See below and commented variables in values.yaml
+env:
+  # -- Set the container timezone
+  TZ: UTC
+  # -- Set the OneDrive User ID
+  ONEDRIVE_UID: 1000
+  # -- Set the One Drive Group ID
+  ONEDRIVE_GID: 1000
+  # -- Set the One Drive Authentication Response
+  ONEDRIVE_AUTHRESPONSE: ""
+  # ONEDRIVE_VERBOSE: 0
+  # ONEDRIVE_DEBUG: 0
+  # ONEDRIVE_DEBUG_HTTPS: 0
+  # ONEDRIVE_RESYNC: 0
+  # ONEDRIVE_DOWNLOADONLY: 0
+  # ONEDRIVE_LOGOUT: 0
+
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml for full listing
+persistence:
+  # -- OneDrive config storage
+  config:
+    # -- If config storage should be enabled
+    enabled: true
+    mountPath: /onedrive/conf
+    accessMode: ReadWriteOnce
+
+  # -- OneDrive data storage
+  data:
+    # -- If data storage should be enabled
+    enabled: true
+    mountPath: /onedrive/data
+    type: pvc
+    size: 5Gi
+    accessMode: ReadWriteOnce
+    readOnly: false
+    retain: false
+
+# @default -- Default config with application_id set.
+config: |
+  # Configuration for OneDrive Linux Client
+  # This file contains the list of supported configuration fields
+  # with their default values.
+  # All values need to be enclosed in quotes
+  # When changing a config option below, remove the '#' from the start of the line
+  # For explanations of all config options below see docs/USAGE.md or the man page.
+  #
+  # sync_dir = "/onedrive/data"
+  # skip_file = "~*|.~*|*.tmp"
+  # monitor_interval = "300"
+  # skip_dir = ""
+  # log_dir = "/var/log/onedrive/"
+  # drive_id = ""
+  # upload_only = "false"
+  # check_nomount = "false"
+  # check_nosync = "false"
+  # download_only = "false"
+  # disable_notifications = "false"
+  # disable_upload_validation = "false"
+  # enable_logging = "false"
+  # force_http_2 = "false"
+  # local_first = "false"
+  # no_remote_delete = "false"
+  # skip_symlinks = "false"
+  # debug_https = "false"
+  # skip_dotfiles = "false"
+  # dry_run = "false"
+  # min_notify_changes = "5"
+  # monitor_log_frequency = "5"
+  # monitor_fullscan_frequency = "10"
+  # sync_root_files = "false"
+  # classify_as_big_delete = "1000"
+  # user_agent = ""
+  # remove_source_files = "false"
+  # skip_dir_strict_match = "false"
+  application_id = "d50ca740-c83f-4d1b-b616-12c519384f0c"
+  # resync = "false"
+  # bypass_data_preservation = "false"
+  # azure_ad_endpoint = ""
+  # azure_tenant_id = "common"
+  # sync_business_shared_folders = "false"
+  # sync_dir_permissions = "700"
+  # sync_file_permissions = "600"
+  # rate_limit = "131072"

charts/stable/promcord/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: latest
 description: Discord bot that provides metrics from a Discord server
 name: promcord
-version: 3.0.0
+version: 5.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - promcord

charts/stable/promcord/README.md

@@ -1,6 +1,6 @@
 # promcord
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 5.0.2](https://img.shields.io/badge/Version-5.0.2-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 Discord bot that provides metrics from a Discord server
 
@@ -80,7 +80,12 @@ N/A
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"biospheere/promcord"` | image repository |
 | image.tag | string | `"latest"` | image tag |
-| prometheus.podMonitor | object | See values.yaml | Enable and configure a Prometheus podMonitor for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"1m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"30s"` |  |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -89,6 +94,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
+### [4.0.0]
+
+#### Changed
+
+- Switched to serviceMonitor instead of podMonitor. This is a potential breaking change.
+
 ### [2.0.0]
 
 #### Changed
@@ -107,6 +124,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New chart
 
+[5.0.0]: #500
+[4.0.0]: #400
 [2.0.0]: #200
 [1.0.1]: #101
 [1.0.0]: #100

charts/stable/promcord/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
+### [4.0.0]
+
+#### Changed
+
+- Switched to serviceMonitor instead of podMonitor. This is a potential breaking change.
+
 ### [2.0.0]
 
 #### Changed
@@ -27,6 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New chart
 
+[5.0.0]: #500
+[4.0.0]: #400
 [2.0.0]: #200
 [1.0.1]: #101
 [1.0.0]: #100

charts/stable/promcord/templates/podmonitor.yaml

@@ -1,24 +0,0 @@
-{{- if .Values.prometheus.podMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.podMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  podMetricsEndpoints:
-  - port: http
-    {{- with .Values.prometheus.podMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ . }}
-    {{- end }}
-    path: /metrics
-{{- end }}

charts/stable/promcord/templates/prometheusrules.yaml

@@ -0,0 +1,27 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: PromcordAbsent
+          annotations:
+            description: Promcord has disappeared from Prometheus service discovery.
+            summary: Promcord is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/promcord/templates/servicemonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}

charts/stable/promcord/values.yaml

@@ -19,6 +19,10 @@ service:
   main:
     ports:
       http:
+        enabled: false
+      metrics:
+        enabled: true
+        protocol: TCP
         port: 8080
 
 # -- environment variables. See [application docs](https://github.com/nimarion/promcord/blob/master/README.md) for more details.
@@ -29,11 +33,28 @@ env:
   # -- Discord bot token
   # DISCORD_TOKEN:
 
-prometheus:
-  # -- Enable and configure a Prometheus podMonitor for the chart under this key.
+metrics:
+  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
   # @default -- See values.yaml
-  podMonitor:
-    enabled: false
+  enabled: false
+  serviceMonitor:
     interval: 1m
     scrapeTimeout: 30s
-    additionalLabels: {}
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: PromcordAbsent
+      #   annotations:
+      #     description: Promcord has disappeared from Prometheus service discovery.
+      #     summary: Promcord is disabled.
+      #   expr: |
+      #     absent(up{job=~".promcord.*"} == 1)
+      #   for: 15m
+      #   labels:
+      #     severity: critical

charts/stable/prometheus-nut-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.1.1
 description: Prometheus NUT Exporter a service monitor to send NUT server metrics to a Prometheus instance.
 name: prometheus-nut-exporter
-version: 4.0.0
+version: 5.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - nut

charts/stable/prometheus-nut-exporter/README.md

@@ -1,6 +1,6 @@
 # prometheus-nut-exporter
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 Prometheus NUT Exporter a service monitor to send NUT server metrics to a Prometheus instance.
 
@@ -76,11 +76,16 @@ N/A
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | env | object | See below | environment variables. See [application docs](https://github.com/HON95/prometheus-nut-exporter#environment-variables) for more details. |
+| env.RUST_LOG | string | `"info"` | log level [info|debug|trace] |
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"hon95/prometheus-nut-exporter"` | image repository |
 | image.tag | string | `"1.1.1"` | image tag |
-| prometheus.serviceMonitor | object | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.targets | list | `[]` |  |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -89,6 +94,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [4.0.0]
 
 #### Changed
@@ -115,6 +126,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - use helm-docs
 
+[5.0.0]: #500
 [4.0.0]: #400
 [3.0.0]: #300
 [2.0.0]: #200

charts/stable/prometheus-nut-exporter/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
 ### [4.0.0]
 
 #### Changed
@@ -35,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - use helm-docs
 
+[5.0.0]: #500
 [4.0.0]: #400
 [3.0.0]: #300
 [2.0.0]: #200

charts/stable/prometheus-nut-exporter/templates/common.yaml

@@ -1 +1,13 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "prometheus-nut-exporter.harcodedValues" -}}
+env:
+  HTTP_PATH: "/metrics"
+  HTTP_PORT: "{{ .Values.service.main.ports.metrics.port }}"
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "prometheus-nut-exporter.harcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
 {{ include "common.all" . }}

charts/stable/prometheus-nut-exporter/templates/prometheusrules.yaml

@@ -0,0 +1,55 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: NutExporterAbsent
+          annotations:
+            description: NUT Exporter has disappeared from Prometheus target discovery.
+            summary: NUT Exporter is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: UpsStatusUnknown
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} is reporting a status of unknown.
+            summary: UPS status unknown.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 10s
+          labels:
+            severity: critical
+        - alert: UpsOnBattery
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} has lost power and is running on battery.
+            summary: UPS is running on battery.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 2
+          for: 10s
+          labels:
+            severity: critical
+        - alert: UpsLowBattery
+          annotations:
+            description: UPS {{ "{{ $labels.ups }}" }} battery is low and the system is getting
+              ready to shutdown.
+            summary: UPS battery is low.
+          expr: |
+            nut_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 3
+          for: 5s
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/prometheus-nut-exporter/templates/servicemonitor.yaml

@@ -1,11 +1,11 @@
-{{- if .Values.prometheus.serviceMonitor.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
@@ -13,16 +13,16 @@ spec:
     matchLabels:
       {{- include "common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
-  {{- range .Values.prometheus.serviceMonitor.targets }}
-  - port: http
-    interval: {{ .interval }}
-    scrapeTimeout: {{ .scrapeTimeout }}
-    path: /nut
-    params:
-      target:
-      - "{{ .hostname }}:{{ .port }}"
-    relabelings:
-    - sourceLabels: [__param_target]
-      targetLabel: target
-  {{- end }}
+    - port: metrics
+    {{- range .Values.metrics.serviceMonitor.targets }}
+      interval: {{ .interval }}
+      scrapeTimeout: {{ .scrapeTimeout }}
+      path: /metrics
+      params:
+        target:
+          - "{{ .hostname }}:{{ .port }}"
+      relabelings:
+        - sourceLabels: [__param_target]
+          targetLabel: target
+    {{- end }}
 {{- end }}

charts/stable/prometheus-nut-exporter/values.yaml

@@ -18,6 +18,8 @@ image:
 env:
   # -- Set the container timezone
   TZ: UTC
+  # -- log level [info|debug|trace]
+  RUST_LOG: info
 
 # -- Configures service settings for the chart.
 # @default -- See values.yaml
@@ -25,16 +27,38 @@ service:
   main:
     ports:
       http:
+        enabled: false
+      metrics:
+        enabled: true
+        protocol: TCP
         port: 9995
 
-prometheus:
+metrics:
   # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
   # @default -- See values.yaml
+  enabled: false
   serviceMonitor:
-    enabled: false
     # Specify the list of NUT servers that should be monitored
     targets: []
-    # - hostname: nut-server
-    #   port: 3493
-    #   interval: 30s
-    #   scrapeTimeout: 10s
+      # - hostname: nut-server
+      #   port: 3493
+      #   interval: 30s
+      #   scrapeTimeout: 10s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: UpsStatusUnknown
+      #   annotations:
+      #     description: UPS {{ "{{ $labels.ups }}" }} is reporting a status of unknown.
+      #     summary: UPS status unknown.
+      #   expr: |
+      #     nut_status == 0
+      #   for: 10s
+      #   labels:
+      #     severity: critical

charts/stable/qbittorrent/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v4.3.5
+appVersion: v4.3.7
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
 name: qbittorrent
-version: 12.0.0
+version: 13.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - qbittorrent

charts/stable/qbittorrent/README.md

@@ -1,6 +1,6 @@
 # qbittorrent
 
-![Version: 12.0.0](https://img.shields.io/badge/Version-12.0.0-informational?style=flat-square) ![AppVersion: v4.3.5](https://img.shields.io/badge/AppVersion-v4.3.5-informational?style=flat-square)
+![Version: 13.0.0](https://img.shields.io/badge/Version-13.0.0-informational?style=flat-square) ![AppVersion: v4.3.7](https://img.shields.io/badge/AppVersion-v4.3.7-informational?style=flat-square)
 
 qBittorrent is a cross-platform free and open-source BitTorrent client
 
@@ -80,8 +80,21 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/k8s-at-home/qbittorrent"` | image repository |
-| image.tag | string | `"v4.3.5"` | image tag |
+| image.tag | string | `"v4.3.7"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure prometheus-qbittorrent-exporter sidecar and Prometheus podMonitor. |
+| metrics.exporter.env.logLevel | string | `"INFO"` | log level [DEBUG|INFO|WARNING|ERROR|CRITICAL] |
+| metrics.exporter.env.password | string | `"adminadmin"` | qbittorrent password update value after configuring qbittorrent |
+| metrics.exporter.env.port | int | `9022` | metrics port |
+| metrics.exporter.env.user | string | `"admin"` | qbittorrent username update value after configuring qbittorrent |
+| metrics.exporter.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| metrics.exporter.image.repository | string | `"esanchezm/prometheus-qbittorrent-exporter"` | image repository |
+| metrics.exporter.image.tag | string | `"v1.2.0"` | image tag |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"15s"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"5s"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 | settings.automaticPortSetup | bool | `false` | Enables automatic port configuration at startup This sets the qbittorrent port to the value of `service.bittorrent.ports.bittorrent.port`. |
@@ -92,6 +105,24 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [13.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
+### [12.2.0]
+
+#### Changed
+
+- Switched to serviceMonitor instead of podMonitor. This would revert scrape intervals and timeouts if changed from default.
+
+### [12.1.0]
+
+#### Added
+
+- Added podMonitor and the ability to use [prometheus-qbittorrent-exporter](https://github.com/esanchezm/prometheus-qbittorrent-exporter) as a sidecar container.
+
 ### [12.0.0]
 
 #### Changed
@@ -119,6 +150,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[13.0.0]: #1300
+[12.2.0]: #1220
+[12.1.0]: #1210
 [12.0.0]: #1200
 [11.0.0]: #1100
 [10.0.0]: #1000

charts/stable/qbittorrent/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,24 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [13.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor.
+
+### [12.2.0]
+
+#### Changed
+
+- Switched to serviceMonitor instead of podMonitor. This would revert scrape intervals and timeouts if changed from default.
+
+### [12.1.0]
+
+#### Added
+
+- Added podMonitor and the ability to use [prometheus-qbittorrent-exporter](https://github.com/esanchezm/prometheus-qbittorrent-exporter) as a sidecar container.
+
 ### [12.0.0]
 
 #### Changed
@@ -36,6 +54,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[13.0.0]: #1300
+[12.2.0]: #1220
+[12.1.0]: #1210
 [12.0.0]: #1200
 [11.0.0]: #1100
 [10.0.0]: #1000

charts/stable/qbittorrent/templates/common.yaml

@@ -1,19 +1,54 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "common.values.setup" . }}
 
-{{/* Append the configMap volume to the volumes */}}
-{{- define "qbittorrent.configmapVolume" -}}
-enabled: "true"
-mountPath: "/config/custom-cont-init.d"
-type: "custom"
-volumeSpec:
-  configMap:
-    name: {{ include "common.names.fullname" . }}-scripts
-    defaultMode: 511
-{{- end -}}
-{{- if and .Values.settings.automaticPortSetup -}}
-  {{- $_ := set .Values.persistence "qbittorrent-scripts" (include "qbittorrent.configmapVolume" . | fromYaml) -}}
+{{/* Append the hardcoded settings */}}
+{{- define "qbittorrent.harcodedValues" -}}
+{{ if and .Values.settings.automaticPortSetup }}
+persistence:
+  qbittorrent-scripts:
+    enabled: "true"
+    mountPath: "/config/custom-cont-init.d"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ include "common.names.fullname" . }}-scripts
+        defaultMode: 511
+{{ end }}
+
+{{ if .Values.metrics.enabled }}
+additionalContainers:
+  exporter:
+    name: exporter
+    image: "{{ .Values.metrics.exporter.image.repository }}:{{ .Values.metrics.exporter.image.tag }}"
+    imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy }}
+    env:
+      - name: QBITTORRENT_HOST
+        value: "http://localhost"
+      - name: QBITTORRENT_PORT
+        value: "{{ .Values.service.main.ports.http.port }}"
+      - name: QBITTORRENT_USER
+        value: "{{ .Values.metrics.exporter.env.user }}"
+      - name: QBITTORRENT_PASS
+        value: "{{ .Values.metrics.exporter.env.password }}"
+      - name: EXPORTER_PORT
+        value: "{{ .Values.metrics.exporter.env.port }}"
+      - name: EXPORTER_LOG_LEVEL
+        value: "{{ .Values.metrics.exporter.env.logLevel }}"
+    ports:
+      - name: metrics
+        containerPort: {{ .Values.metrics.exporter.env.port }}
+
+service:
+  metrics:
+    enabled: true
+    ports:
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: {{ .Values.metrics.exporter.env.port }}
+{{ end }}
 {{- end -}}
+{{- $_ := mergeOverwrite .Values (include "qbittorrent.harcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}

charts/stable/qbittorrent/templates/prometheusrules.yaml

@@ -0,0 +1,37 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: qBittorrentExporterAbsent
+          annotations:
+            description: qBittorrent Exporter has disappeared from Prometheus
+              service discovery.
+            summary: qBittorrent Exporter is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: qBittorrentDown
+          annotations:
+            description: qBittorrent service is down.
+            summary: qBittorrent is down.
+          expr: |
+            qbittorrent_up{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/qbittorrent/templates/servicemonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}

charts/stable/qbittorrent/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: ghcr.io/k8s-at-home/qbittorrent
   # -- image tag
-  tag: v4.3.5
+  tag: v4.3.7
   # -- image pull policy
   pullPolicy: IfNotPresent
 
@@ -60,3 +60,48 @@ persistence:
   downloads:
     enabled: false
     mountPath: /downloads
+
+metrics:
+  # -- Enable and configure prometheus-qbittorrent-exporter sidecar and Prometheus podMonitor.
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 15s
+    scrapeTimeout: 5s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: qBittorrentDown
+      #   annotations:
+      #     description: qBittorrent service is down.
+      #     summary: qBittorrent is down.
+      #   expr: |
+      #     qbittorrent_up == 0
+      #   for: 5m
+      #   labels:
+      #     severity: critical
+  exporter:
+    image:
+      # -- image repository
+      repository: esanchezm/prometheus-qbittorrent-exporter
+      # -- image tag
+      tag: v1.2.0
+      # -- image pull policy
+      pullPolicy: IfNotPresent
+    env:
+      # -- qbittorrent username
+      # update value after configuring qbittorrent
+      user: "admin"
+      # -- qbittorrent password
+      # update value after configuring qbittorrent
+      password: "adminadmin"
+      # -- metrics port
+      port: 9022
+      # -- log level [DEBUG|INFO|WARNING|ERROR|CRITICAL]
+      logLevel: INFO

charts/stable/radarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v3.2.2.5080
 description: A fork of Sonarr to work with movies à la Couchpotato
 name: radarr
-version: 13.0.0
+version: 15.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - radarr

charts/stable/radarr/README.md

@@ -1,6 +1,6 @@
 # radarr
 
-![Version: 13.0.0](https://img.shields.io/badge/Version-13.0.0-informational?style=flat-square) ![AppVersion: v3.2.2.5080](https://img.shields.io/badge/AppVersion-v3.2.2.5080-informational?style=flat-square)
+![Version: 15.0.2](https://img.shields.io/badge/Version-15.0.2-informational?style=flat-square) ![AppVersion: v3.2.2.5080](https://img.shields.io/badge/AppVersion-v3.2.2.5080-informational?style=flat-square)
 
 A fork of Sonarr to work with movies à la Couchpotato
 
@@ -82,9 +82,20 @@ N/A
 | image.repository | string | `"ghcr.io/k8s-at-home/radarr"` | image repository |
 | image.tag | string | `"v3.2.2.5080"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure Exportarr sidecar and Prometheus serviceMonitor. |
+| metrics.exporter.env.additionalMetrics | bool | `false` | Set to true to enable gathering of additional metrics (slow) |
+| metrics.exporter.env.port | int | `9793` | metrics port |
+| metrics.exporter.env.unknownQueueItems | bool | `false` | Set to true to enable gathering unknown queue items |
+| metrics.exporter.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| metrics.exporter.image.repository | string | `"ghcr.io/onedr0p/exportarr"` | image repository |
+| metrics.exporter.image.tag | string | `"v0.6.1"` | image tag |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"3m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"1m"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | probes | object | See values.yaml | Configures the probes for the main Pod. |
-| prometheus.podMonitor | object | See values.yaml | Enable and configure a Prometheus podMonitor for the chart under this key. See also the notes under `additionalContainers`. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -93,6 +104,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [15.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [14.0.0]
+
+#### Changed
+
+- Refactoring of the Exportarr sidecar and Prometheus podMonitor. This is a breaking change if it was enabled previously.
+
 ### [13.0.0]
 
 #### Changed
@@ -119,6 +142,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[15.0.0]: #1500
+[14.0.0]: #1400
 [13.0.0]: #1300
 [12.0.0]: #1200
 [11.0.0]: #1100

charts/stable/radarr/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [15.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [14.0.0]
+
+#### Changed
+
+- Refactoring of the Exportarr sidecar and Prometheus podMonitor. This is a breaking change if it was enabled previously.
+
 ### [13.0.0]
 
 #### Changed
@@ -35,6 +47,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[15.0.0]: #1500
+[14.0.0]: #1400
 [13.0.0]: #1300
 [12.0.0]: #1200
 [11.0.0]: #1100

charts/stable/radarr/ci/ct-exportarr-values.yaml

@@ -7,7 +7,7 @@ persistence:
 additionalContainers:
   exportarr:
     name: exportarr
-    image: ghcr.io/onedr0p/exportarr:v0.6.0
+    image: ghcr.io/onedr0p/exportarr:v0.6.1
     imagePullPolicy: IfNotPresent
     args: ["exportarr", "radarr"]
     env:

charts/stable/radarr/templates/common.yaml

@@ -1 +1,47 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "radarr.harcodedValues" -}}
+{{ if .Values.metrics.enabled }}
+additionalContainers:
+  exporter:
+    name: exporter
+    image: "{{ .Values.metrics.exporter.image.repository }}:{{ .Values.metrics.exporter.image.tag }}"
+    imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy }}
+    args: ["exportarr", "radarr"]
+    env:
+      - name: URL
+        value: "http://localhost"
+      - name: CONFIG
+        value: "/config/config.xml"
+      - name: PORT
+        value: "{{ .Values.metrics.exporter.env.port }}"
+      - name: ENABLE_ADDITIONAL_METRICS
+        value: "{{ .Values.metrics.exporter.env.additionalMetrics }}"
+      - name: ENABLE_UNKNOWN_QUEUE_ITEMS
+        value: "{{ .Values.metrics.exporter.env.unknownQueueItems }}"
+    ports:
+      - name: metrics
+        containerPort: {{ .Values.metrics.exporter.env.port }}
+    volumeMounts:
+      {{ if .Values.persistence.config.enabled }}
+      - name: config
+        mountPath: /config
+        readOnly: true
+      {{ end }}
+
+service:
+  metrics:
+    enabled: true
+    ports:
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: {{ .Values.metrics.exporter.env.port }}
+{{ end }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "radarr.harcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
 {{ include "common.all" . }}

charts/stable/radarr/templates/podmonitor.yaml

@@ -1,24 +0,0 @@
-{{- if .Values.prometheus.podMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.podMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  podMetricsEndpoints:
-  - port: exportarr
-    {{- with .Values.prometheus.podMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ . }}
-    {{- end }}
-    path: /metrics
-{{- end }}

charts/stable/radarr/templates/prometheusrules.yaml

@@ -0,0 +1,37 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: ExportarrAbsent
+          annotations:
+            description: Radarr Exportarr has disappeared from Prometheus
+              service discovery.
+            summary: Exportarr is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        - alert: RadarrDown
+          annotations:
+            description: Radarr service is down.
+            summary: Radarr is down.
+          expr: |
+            radarr_system_status{job=~".*{{ include "common.names.fullname" . }}.*"} == 0
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/stable/radarr/templates/servicemonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}

charts/stable/radarr/values.yaml

@@ -57,6 +57,7 @@ probes:
       timeoutSeconds: 10
 
 # -- Configure persistence settings for the chart under this key.
+## Config persistence is required for the Prometheus exporter sidecar.
 # @default -- See values.yaml
 persistence:
   config:
@@ -66,35 +67,43 @@ persistence:
     enabled: false
     mountPath: /media
 
-prometheus:
-  # -- Enable and configure a Prometheus podMonitor for the chart under this key.
-  # See also the notes under `additionalContainers`.
+metrics:
+  # -- Enable and configure Exportarr sidecar and Prometheus serviceMonitor.
   # @default -- See values.yaml
-  podMonitor:
-    enabled: false
+  enabled: false
+  serviceMonitor:
     interval: 3m
     scrapeTimeout: 1m
-    additionalLabels: {}
-
-# # When using the prometheus.podMonitor the following
-# # container is required
-# additionalContainers:
-#   exportarr:
-#     name: exportarr
-#     image: ghcr.io/onedr0p/exportarr:v0.6.0
-#     imagePullPolicy: IfNotPresent
-#     args: ["exportarr", "radarr"]
-#     env:
-#     - name: PORT
-#       value: "32123"
-#     - name: URL
-#       value: "http://localhost"
-#     - name: CONFIG
-#       value: "/config/config.xml"
-#     ports:
-#     - name: exportarr
-#       containerPort: 32123
-#     volumeMounts:
-#     - name: config
-#       mountPath: /config
-#       readOnly: true
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: RadarrDown
+      #   annotations:
+      #     description: Radarr service is down.
+      #     summary: Radarr is down.
+      #   expr: |
+      #     radarr_system_status == 0
+      #   for: 5m
+      #   labels:
+      #     severity: critical
+  exporter:
+    image:
+      # -- image repository
+      repository: ghcr.io/onedr0p/exportarr
+      # -- image tag
+      tag: v0.6.1
+      # -- image pull policy
+      pullPolicy: IfNotPresent
+    env:
+      # -- metrics port
+      port: 9793
+      # -- Set to true to enable gathering of additional metrics (slow)
+      additionalMetrics: false
+      # -- Set to true to enable gathering unknown queue items
+      unknownQueueItems: false

charts/stable/sonarr/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v3.0.6.1196
+appVersion: v3.0.6.1265
 description: Smart PVR for newsgroup and bittorrent users
 name: sonarr
-version: 13.0.0
+version: 15.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - sonarr

charts/stable/sonarr/README.md

@@ -1,6 +1,6 @@
 # sonarr
 
-![Version: 13.0.0](https://img.shields.io/badge/Version-13.0.0-informational?style=flat-square) ![AppVersion: v3.0.6.1196](https://img.shields.io/badge/AppVersion-v3.0.6.1196-informational?style=flat-square)
+![Version: 15.0.2](https://img.shields.io/badge/Version-15.0.2-informational?style=flat-square) ![AppVersion: v3.0.6.1265](https://img.shields.io/badge/AppVersion-v3.0.6.1265-informational?style=flat-square)
 
 Smart PVR for newsgroup and bittorrent users
 
@@ -80,11 +80,22 @@ N/A
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/k8s-at-home/sonarr"` | image repository |
-| image.tag | string | `"v3.0.6.1196"` | image tag |
+| image.tag | string | `"v3.0.6.1265"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure Exportarr sidecar and Prometheus serviceMonitor. |
+| metrics.exporter.env.additionalMetrics | bool | `false` | Set to true to enable gathering of additional metrics (slow) |
+| metrics.exporter.env.port | int | `9794` | metrics port |
+| metrics.exporter.env.unknownQueueItems | bool | `false` | Set to true to enable gathering unknown queue items |
+| metrics.exporter.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| metrics.exporter.image.repository | string | `"ghcr.io/onedr0p/exportarr"` | image repository |
+| metrics.exporter.image.tag | string | `"v0.6.1"` | image tag |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"3m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"1m"` |  |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | probes | object | See values.yaml | Configures the probes for the main Pod. |
-| prometheus.podMonitor | object | See values.yaml | Enable and configure a Prometheus podMonitor for the chart under this key. See also the notes under `additionalContainers`. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
@@ -93,6 +104,18 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [15.0.0]
+
+#### Changed
+
+- **BREAKING**: Refactored Prometheus metrics section to add rules. Enabling metrics automatically enables the serviceMonitor and exporter sidecar.
+
+### [14.0.0]
+
+#### Changed
+
+- Refactoring of the Exportarr sidecar and Prometheus podMonitor. This is a breaking change if it was enabled previously.
+
 ### [13.0.0]
 
 #### Changed
@@ -118,6 +141,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Initial version
 
+[15.0.0]: #1500
+[14.0.0]: #1400
 [13.0.0]: #1300
 [12.0.0]: #1200
 [11.0.0]: #1100