diff --git a/Chart.yaml b/Chart.yaml index 8bb36ad..97bf23b 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time # you make changes to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.2.0 +version: 5.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index 9eec596..8898715 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -186,6 +186,12 @@ spec: name: {{ $context.Values.mastodon.cacheBuster.authToken.existingSecret }} key: password {{- end }} + {{- if or $context.Values.mastodon.sidekiq.otel.enabled (and $context.Values.mastodon.otel.enabled (ne $context.Values.mastodon.sidekiq.otel.enabled false)) }} + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: {{ coalesce $context.Values.mastodon.sidekiq.otel.endpointUri $context.Values.mastodon.otel.endpointUri }} + - name: OTEL_SERVICE_NAME_PREFIX + value: {{ coalesce $context.Values.mastodon.sidekiq.otel.namePrefix $context.Values.mastodon.otel.namePrefix }} + {{- end }} volumeMounts: {{- if (not $context.Values.mastodon.s3.enabled) }} - name: assets diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index 2956a21..b3a2620 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -176,6 +176,12 @@ spec: name: {{ .Values.mastodon.cacheBuster.authToken.existingSecret }} key: password {{- end }} + {{- if or .Values.mastodon.web.otel.enabled (and .Values.mastodon.otel.enabled (ne .Values.mastodon.web.otel.enabled false)) }} + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }} + - name: OTEL_SERVICE_NAME_PREFIX + value: {{ coalesce .Values.mastodon.web.otel.namePrefix .Values.mastodon.otel.namePrefix }} + {{- end }} volumeMounts: {{- if (not .Values.mastodon.s3.enabled) }} - name: assets diff --git a/values.yaml b/values.yaml index d9782fd..064774d 100644 --- a/values.yaml +++ b/values.yaml @@ -164,6 +164,13 @@ mastodon: # requests: # cpu: 250m # memory: 512Mi + + # Open Telemetry configuration for sidekiq pods. Overrides global settings. + otel: + enabled: + exporterUri: + namePrefix: + workers: - name: all-queues # -- Number of threads / parallel sidekiq jobs that are executed per Pod @@ -333,6 +340,12 @@ mastodon: name: key: + # Open Telemetry configuration for web pods. Overrides global settings. + otel: + enabled: + exporterUri: + namePrefix: + # HTTP cache buster configuration. # See the documentation for more information about this feature: # https://docs.joinmastodon.org/admin/config/#http-cache-buster @@ -355,6 +368,13 @@ mastodon: enabled: false port: 9102 + # Open Telemetry configuration for all deployments. Component-specific + # configuration will override these values. + otel: + enabled: false + exporterUri: + namePrefix: mastodon + # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements preparedStatements: true