From 91e0a8923fe27d764b345ddc7cdf24fee4d64779 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Thu, 26 Sep 2024 15:33:28 +0200 Subject: [PATCH 1/3] Add additional OTEL options --- Chart.yaml | 2 +- templates/deployment-sidekiq.yaml | 2 ++ templates/deployment-web.yaml | 2 ++ values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 8d078ca8..69938974 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.4.0 +version: 5.4.1 # 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 0fcb2393..f59cade9 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -203,6 +203,8 @@ spec: 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 }} + - name: OTEL_SERVICE_NAME_SEPARATOR + value: {{ coalesce $context.Values.mastodon.sidekiq.otel.nameSeparator $context.Values.mastodon.otel.nameSeparator }} {{- end }} volumeMounts: {{- if (not $context.Values.mastodon.s3.enabled) }} diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index c7b288f6..ae8db552 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -193,6 +193,8 @@ spec: 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 }} + - name: OTEL_SERVICE_NAME_SEPARATOR + value: {{ coalesce .Values.mastodon.web.otel.nameSeparator .Values.mastodon.otel.nameSeparator }} {{- end }} volumeMounts: {{- if (not .Values.mastodon.s3.enabled) }} diff --git a/values.yaml b/values.yaml index 5117a6dc..dcfb5968 100644 --- a/values.yaml +++ b/values.yaml @@ -185,6 +185,7 @@ mastodon: enabled: exporterUri: namePrefix: + nameSeparator: workers: - name: all-queues @@ -384,6 +385,7 @@ mastodon: enabled: exporterUri: namePrefix: + nameSeparator: # HTTP cache buster configuration. # See the documentation for more information about this feature: @@ -413,6 +415,7 @@ mastodon: enabled: false exporterUri: namePrefix: mastodon + nameSeparator: / # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements preparedStatements: true From 4b79176d15c2f099480929dc303084ffa4e3d1fd Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Mon, 30 Sep 2024 15:29:21 +0200 Subject: [PATCH 2/3] Change default values --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index dcfb5968..24031b29 100644 --- a/values.yaml +++ b/values.yaml @@ -415,7 +415,7 @@ mastodon: enabled: false exporterUri: namePrefix: mastodon - nameSeparator: / + nameSeparator: - # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements preparedStatements: true From e1f2048bd251993881ddbba87bb6330f84988fc5 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Mon, 30 Sep 2024 16:18:07 +0200 Subject: [PATCH 3/3] Fix default values --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 24031b29..3afa7ae0 100644 --- a/values.yaml +++ b/values.yaml @@ -415,7 +415,7 @@ mastodon: enabled: false exporterUri: namePrefix: mastodon - nameSeparator: - + nameSeparator: "-" # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements preparedStatements: true