From 97b61a4bd2489045e51e4742821cc7d55a6c90fe Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Tue, 4 Feb 2025 13:55:01 +0100
Subject: [PATCH] Local exporter is enabled by default for sidekiq

---
 templates/deployment-sidekiq.yaml | 8 +++-----
 values.yaml                       | 5 -----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index ce012ff..f1af6cb 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -213,17 +213,15 @@ spec:
               value: {{ $context.Values.mastodon.metrics.prometheus.host }}
             - name: PROMETHEUS_EXPORTER_PORT
               value: "{{ $context.Values.mastodon.metrics.prometheus.port }}"
-            {{- if $context.Values.mastodon.metrics.prometheus.sidekiq.detailed }}
-            - name: MASTODON_PROMETHEUS_EXPORTER_SIDEKIQ_DETAILED_METRICS
-              value: "true"
-            {{- end }}
-            {{- if $context.Values.mastodon.metrics.prometheus.sidekiq.local.enabled }}
             - name: MASTODON_PROMETHEUS_EXPORTER_LOCAL
               value: "true"
             - name: MASTODON_PROMETHEUS_EXPORTER_HOST
               value: {{ $context.Values.mastodon.metrics.prometheus.sidekiq.local.host }}
             - name: MASTODON_PROMETHEUS_EXPORTER_PORT
               value: "{{ $context.Values.mastodon.metrics.prometheus.sidekiq.local.port }}"
+            {{- if $context.Values.mastodon.metrics.prometheus.sidekiq.detailed }}
+            - name: MASTODON_PROMETHEUS_EXPORTER_SIDEKIQ_DETAILED_METRICS
+              value: "true"
             {{- end }}
             {{- end }}
           volumeMounts:
diff --git a/values.yaml b/values.yaml
index 59ebe01..ec15799 100644
--- a/values.yaml
+++ b/values.yaml
@@ -449,11 +449,6 @@ mastodon:
       sidekiq:
         # Collect per-job metrics for every job
         detailed: false
-        # Use a local in-process exporter instead
-        local:
-          enabled: true
-          host: localhost
-          port: 9394
 
   # Open Telemetry configuration for all deployments. Component-specific
   # configuration will override these values.