From 18321767822aa1c7a7ec80d1abbcc6f6705d256e Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Sat, 17 Aug 2024 13:18:41 +0200
Subject: [PATCH] fix(mautrix-signal): drop of metrics (see
 https://github.com/mautrix/signal/issues/532

---
 mautrix-signal/Chart.yaml                    |  2 +-
 mautrix-signal/README.adoc                   | 22 +-------------------
 mautrix-signal/templates/deployment.yaml     |  5 -----
 mautrix-signal/templates/service.yaml        |  6 ------
 mautrix-signal/templates/servicemonitor.yaml | 18 ----------------
 mautrix-signal/values.yaml                   | 12 -----------
 6 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 mautrix-signal/templates/servicemonitor.yaml

diff --git a/mautrix-signal/Chart.yaml b/mautrix-signal/Chart.yaml
index b1ce738..10ce145 100644
--- a/mautrix-signal/Chart.yaml
+++ b/mautrix-signal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mautrix-signal
 description: A Matrix-Signal puppeting bridge.
 type: application
-version: 0.0.9
+version: 0.0.10
 # renovate: image=dock.mau.dev/mautrix/signal
 appVersion: "0.7.0"
 maintainers:
diff --git a/mautrix-signal/README.adoc b/mautrix-signal/README.adoc
index 61370c8..620c447 100644
--- a/mautrix-signal/README.adoc
+++ b/mautrix-signal/README.adoc
@@ -2,7 +2,7 @@
 
 = mautrix-signal
 
-image::https://img.shields.io/badge/Version-0.0.9-informational?style=flat-square[Version: 0.0.9]
+image::https://img.shields.io/badge/Version-0.0.10-informational?style=flat-square[Version: 0.0.10]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square[AppVersion: 0.7.0]
 == Maintainers
@@ -605,16 +605,6 @@ helm uninstall mautrix-signal-release
 | `false`
 | Should the bridge update the m.direct account data event when double puppeting is enabled. Note that updating the m.direct event is not atomic (except with mautrix-asmux) and is therefore prone to race conditions.
 
-| config.metrics.enabled
-| bool
-| `true`
-| Enable prometheus metrics?
-
-| config.metrics.listen
-| string
-| `"0.0.0.0:8000"`
-| IP and port where the metrics listener should be. The path is always /metrics
-
 | config.provisioning.debug_endpoints
 | bool
 | `false`
@@ -835,16 +825,6 @@ helm uninstall mautrix-signal-release
 | `{}`
 |
 
-| prometheus.servicemonitor.enabled
-| bool
-| `false`
-|
-
-| prometheus.servicemonitor.labels
-| object
-| `{}`
-|
-
 | readinessProbe.httpGet.path
 | string
 | `"/_matrix/mau/ready"`
diff --git a/mautrix-signal/templates/deployment.yaml b/mautrix-signal/templates/deployment.yaml
index 31f6add..dacb6e6 100644
--- a/mautrix-signal/templates/deployment.yaml
+++ b/mautrix-signal/templates/deployment.yaml
@@ -43,11 +43,6 @@ spec:
             - name: http
               containerPort: {{ .Values.config.appservice.port }}
               protocol: TCP
-            {{- if .Values.config.metrics.enabled }}
-            - name: metrics
-              containerPort: {{ regexSplit ":" .Values.config.metrics.listen -1 | last  }}
-              protocol: TCP
-            {{- end }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
diff --git a/mautrix-signal/templates/service.yaml b/mautrix-signal/templates/service.yaml
index d5bfdd1..1f9e3a7 100644
--- a/mautrix-signal/templates/service.yaml
+++ b/mautrix-signal/templates/service.yaml
@@ -15,10 +15,4 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-    {{- if .Values.config.metrics.enabled }}
-    - port: {{ regexSplit ":" .Values.config.metrics.listen -1 | last }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-    {{- end }}
 {{- end }}
diff --git a/mautrix-signal/templates/servicemonitor.yaml b/mautrix-signal/templates/servicemonitor.yaml
deleted file mode 100644
index c60d257..0000000
--- a/mautrix-signal/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and .Values.prometheus.servicemonitor.enabled ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "mautrix-signal.fullname" . }}
-  labels:
-    {{- include "mautrix-signal.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.servicemonitor.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "mautrix-signal.selectorLabels" . | nindent 6 }}
-  endpoints:
-    - port: metrics
-      path: /metrics
-{{- end }}
diff --git a/mautrix-signal/values.yaml b/mautrix-signal/values.yaml
index 67e1347..175c41b 100644
--- a/mautrix-signal/values.yaml
+++ b/mautrix-signal/values.yaml
@@ -407,13 +407,6 @@ config:
     # -- Optional extra text sent when joining a management room.
     additional_help: ""
 
-  # Prometheus config.
-  metrics:
-    # -- Enable prometheus metrics?
-    enabled: true
-    # -- IP and port where the metrics listener should be. The path is always /metrics
-    listen: 0.0.0.0:8000
-
   signal:
     # -- Displayname template for Signal users. This is also used as the room name in DMs if private_chat_portal_meta is enabled.
     # {{.ProfileName}} - The Signal profile name set by the user.
@@ -575,8 +568,3 @@ persistence:
   accessMode: ReadWriteOnce
   # -- size
   size: 10Gi
-
-prometheus:
-  servicemonitor:
-    enabled: false
-    labels: {}