From 1120b745e6b51ab84b9b9150ba4b1e5b5a164d88 Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Thu, 6 Mar 2025 09:53:04 +0100
Subject: [PATCH] Add puma metrics for web and sidekiq pods (#170)
---
templates/deployment-sidekiq.yaml | 19 +++++++++++++++++
templates/deployment-web.yaml | 35 +++++++++++++++++++++++++++++++
values.yaml | 18 ++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index 1b3042d..5951bd6 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -206,6 +206,25 @@ spec:
- name: OTEL_SERVICE_NAME_SEPARATOR
value: "{{ coalesce $context.Values.mastodon.sidekiq.otel.nameSeparator $context.Values.mastodon.otel.nameSeparator }}"
{{- end }}
+ {{- if $context.Values.mastodon.metrics.prometheus.enabled }}
+ - name: MASTODON_PROMETHEUS_EXPORTER_ENABLED
+ value: "true"
+ - name: MASTODON_PROMETHEUS_EXPORTER_LOCAL
+ value: "true"
+ - name: MASTODON_PROMETHEUS_EXPORTER_HOST
+ value: "0.0.0.0"
+ - name: MASTODON_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 }}
+ {{- end }}
+ {{- if $context.Values.mastodon.metrics.prometheus.enabled }}
+ ports:
+ - name: prometheus
+ containerPort: {{ $context.Values.mastodon.metrics.prometheus.port }}
+ {{- end }}
volumeMounts:
{{- if (not $context.Values.mastodon.s3.enabled) }}
- name: assets
diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
index d787c3f..078bb5f 100644
--- a/templates/deployment-web.yaml
+++ b/templates/deployment-web.yaml
@@ -196,6 +196,20 @@ spec:
- name: OTEL_SERVICE_NAME_SEPARATOR
value: "{{ coalesce .Values.mastodon.web.otel.nameSeparator .Values.mastodon.otel.nameSeparator }}"
{{- end }}
+ {{- if .Values.mastodon.metrics.prometheus.enabled }}
+ - name: MASTODON_PROMETHEUS_EXPORTER_ENABLED
+ value: "true"
+ - name: PROMETHEUS_EXPORTER_HOST
+ value: "127.0.0.1"
+ - name: PROMETHEUS_EXPORTER_PORT
+ value: "{{ .Values.mastodon.metrics.prometheus.port }}"
+ {{- if .Values.mastodon.metrics.prometheus.web.detailed }}
+ - name: MASTODON_PROMETHEUS_EXPORTER_WEB_DETAILED_METRICS
+ value: "true"
+ {{- end }}
+ {{- end }}
+ - name: TEST_ENV_VALUE
+ value: {{ .Values.mastodon.metrics.statsd.address }}
volumeMounts:
{{- if (not .Values.mastodon.s3.enabled) }}
- name: assets
@@ -233,6 +247,27 @@ spec:
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
+ {{- if .Values.mastodon.metrics.prometheus.enabled }}
+ - name: prometheus-exporter
+ image: "{{ coalesce .Values.mastodon.web.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.web.image.tag .Values.image.tag .Chart.AppVersion }}"
+ command:
+ - ./bin/prometheus_exporter
+ args:
+ - "--bind"
+ - "0.0.0.0"
+ - "--port"
+ - "{{ .Values.mastodon.metrics.prometheus.port }}"
+ resources:
+ requests:
+ cpu: "0.1"
+ memory: "180M"
+ limits:
+ cpu: "0.5"
+ memory: "250M"
+ ports:
+ - name: prometheus
+ containerPort: {{ .Values.mastodon.metrics.prometheus.port }}
+ {{- end }}
{{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
{{- with .Values.nodeSelector }}
nodeSelector:
diff --git a/values.yaml b/values.yaml
index 5b1ec64..bcb6a44 100644
--- a/values.yaml
+++ b/values.yaml
@@ -434,6 +434,24 @@ mastodon:
enabled: false
port: 9102
+ # Settings for Prometheus metrics. NOTE: Only available in Mastodon v4.4.
+ # For more information, see:
+ # https://docs.joinmastodon.org/admin/config/#prometheus
+ prometheus:
+ enabled: false
+ # Port for the exporter to listen on
+ port: 9394
+
+ # Prometheus for web pods
+ web:
+ # Collect per-controller/action metrics for every request
+ detailed: false
+
+ # Prometheus for sidekiq pods
+ sidekiq:
+ # Collect per-job metrics for every job
+ detailed: false
+
# Open Telemetry configuration for all deployments. Component-specific
# configuration will override these values.
otel: