✨ (miniflux): Add ServiceMonitor values

gabe565 · Jul 9, 2023 · aa3c133 · aa3c133
1 parent 10011da
commit aa3c133
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/charts/miniflux/Chart.yaml b/charts/miniflux/Chart.yaml
@@ -4,7 +4,7 @@ description: Miniflux is a minimalist and opinionated feed reader.
 home: https://charts.gabe565.com/charts/miniflux/
 icon: https://raw.githubusercontent.com/miniflux/logo/40cb83cc5b190212ad29fb4d5db6b52b335e4dc2/icon.svg
 type: application
-version: 0.6.1
+version: 0.6.2
 # renovate datasource=docker depName=ghcr.io/miniflux/miniflux
 appVersion: 2.0.45
 kubeVersion: ">=1.22.0-0"
@@ -25,8 +25,8 @@ sources:
   - https://github.com/miniflux/v2
 annotations:
   artifacthub.io/changes: |-
-    - kind: changed
-      description: Update ghcr.io/miniflux/miniflux Docker tag to v2.0.45
+    - kind: added
+      description: Add ServiceMonitor values
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/miniflux/v2

diff --git a/charts/miniflux/README.md b/charts/miniflux/README.md
@@ -2,7 +2,7 @@
 
 <img src="https://raw.githubusercontent.com/miniflux/logo/40cb83cc5b190212ad29fb4d5db6b52b335e4dc2/icon.svg" align="right" width="92" alt="miniflux logo">
 
-![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat)
+![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
 ![AppVersion: 2.0.45](https://img.shields.io/badge/AppVersion-2.0.45-informational?style=flat)
 
@@ -11,7 +11,7 @@ Miniflux is a minimalist and opinionated feed reader.
 **Homepage:** <https://charts.gabe565.com/charts/miniflux/>
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised
-[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=miniflux&version=0.6.1)**
+[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=miniflux&version=0.6.2)**
 
 ## Source Code
 
@@ -95,6 +95,9 @@ N/A
 | ingress.main | object | See [values.yaml](./values.yaml) | Enable and configure ingress settings for the chart under this key. |
 | postgresql | object | Enabled (See [values.yaml](./values.yaml) for more details) | 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) |
 | service.main | object | See [values.yaml](./values.yaml) | Configures service settings for the chart. |
+| serviceMonitor.main.allowedNetworks | string | `"127.0.0.1/8"` | List of networks allowed to access the `/metrics` endpoint (comma-separated values).    [[ref]](https://miniflux.app/docs/configuration.html#metrics-allowed-networks) |
+| serviceMonitor.main.enabled | bool | `false` | Enables or disables the serviceMonitor. |
+| serviceMonitor.main.endpoints | list | See [values.yaml](./values.yaml) | Configures the endpoints for the serviceMonitor. |
 
 ---
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
diff --git a/charts/miniflux/templates/_metrics.yaml b/charts/miniflux/templates/_metrics.yaml
@@ -0,0 +1,9 @@
+{{- define "miniflux.metrics.defaultValues" -}}
+{{- with .Values.serviceMonitor.main }}
+{{- if .enabled }}
+env:
+  METRICS_COLLECTOR: "1"
+  METRICS_ALLOWED_NETWORKS: {{ .allowedNetworks }}
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/charts/miniflux/templates/common.yaml b/charts/miniflux/templates/common.yaml
@@ -28,6 +28,7 @@
           port: {{ .Values.service.main.ports.http.port }}
 {{- end -}}
 {{- $_ := merge .Values (include "miniflux.harcodedValues" . | fromYaml) -}}
+{{- $_ := merge .Values (include "miniflux.metrics.defaultValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
 {{ include "bjw-s.common.loader.all" . }}
diff --git a/charts/miniflux/values.yaml b/charts/miniflux/values.yaml
@@ -66,3 +66,19 @@ postgresql:
     enabled: false
     # storageClass: ""
     # size: 8Gi
+
+serviceMonitor:
+  main:
+    # -- Enables or disables the serviceMonitor.
+    enabled: false
+    # -- List of networks allowed to access the `/metrics` endpoint (comma-separated values).
+    #    [[ref]](https://miniflux.app/docs/configuration.html#metrics-allowed-networks)
+    allowedNetworks: 127.0.0.1/8
+    # -- Configures the endpoints for the serviceMonitor.
+    # @default -- See [values.yaml](./values.yaml)
+    endpoints:
+      - port: http
+        scheme: http
+        path: /metrics
+        interval: 1m
+        scrapeTimeout: 10s