From 8e0eea0e5a3805c93d19ea93240d634953461cea Mon Sep 17 00:00:00 2001 From: Anton Donskoy Date: Sun, 13 Oct 2024 18:46:30 +0300 Subject: [PATCH] feat(sentry): Add missing --no-strict-offset-reset and --auto-offset-reset for consumers (#1535) --- ...nt-sentry-ingest-consumer-attachments.yaml | 4 ++ ...loyment-sentry-ingest-consumer-events.yaml | 4 ++ .../deployment-sentry-ingest-monitors.yaml | 7 ++ .../deployment-sentry-ingest-occurrences.yaml | 7 ++ .../deployment-sentry-ingest-profiles.yaml | 7 ++ ...yment-sentry-ingest-replay-recordings.yaml | 7 ++ ...t-sentry-ingest-consumer-transactions.yaml | 4 ++ ...yment-sentry-billing-metrics-consumer.yaml | 7 ++ .../deployment-sentry-metrics-consumer.yaml | 7 ++ ...yment-sentry-generic-metrics-consumer.yaml | 4 ++ ...-sentry-post-process-forwarder-errors.yaml | 6 +- ...post-process-forwarder-issue-platform.yaml | 4 ++ ...y-post-process-forwarder-transactions.yaml | 4 ++ ...t-sentry-subscription-consumer-events.yaml | 7 ++ ...subscription-consumer-generic-metrics.yaml | 7 ++ ...-sentry-subscription-consumer-metrics.yaml | 7 ++ ...ry-subscription-consumer-transactions.yaml | 7 ++ .../snuba/deployment-snuba-consumer.yaml | 2 + ...uba-generic-metrics-counters-consumer.yaml | 2 + ...eneric-metrics-distributions-consumer.yaml | 2 + ...t-snuba-generic-metrics-sets-consumer.yaml | 2 + ...yment-snuba-group-attributes-consumer.yaml | 2 + ...yment-snuba-issue-occurrence-consumer.yaml | 2 + .../deployment-snuba-metrics-consumer.yaml | 2 + ...yment-snuba-outcomes-billing-consumer.yaml | 2 + .../deployment-snuba-outcomes-consumer.yaml | 2 + ...nt-snuba-profiling-functions-consumer.yaml | 2 + ...ent-snuba-profiling-profiles-consumer.yaml | 2 + .../snuba/deployment-snuba-replacer.yaml | 2 + .../deployment-snuba-replays-consumer.yaml | 2 + .../deployment-snuba-spans-consumer.yaml | 2 + ...eployment-snuba-transactions-consumer.yaml | 2 + charts/sentry/values.yaml | 71 +++++++++++++------ 33 files changed, 180 insertions(+), 21 deletions(-) diff --git a/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml b/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml index 0dcd91cb6..dc5e66ad3 100644 --- a/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml +++ b/charts/sentry/templates/sentry/ingest/attachments/deployment-sentry-ingest-consumer-attachments.yaml @@ -86,6 +86,10 @@ spec: - "ingest-attachments" - "--consumer-group" - "ingest-consumer" + {{- if .Values.sentry.ingestConsumerAttachments.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestConsumerAttachments.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.ingestConsumerAttachments.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml b/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml index fb7af5f00..00e632e1a 100644 --- a/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml +++ b/charts/sentry/templates/sentry/ingest/events/deployment-sentry-ingest-consumer-events.yaml @@ -86,6 +86,10 @@ spec: - "ingest-events" - "--consumer-group" - "ingest-consumer" + {{- if .Values.sentry.ingestConsumerEvents.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestConsumerEvents.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.ingestConsumerEvents.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml b/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml index a06640559..2ec7a0036 100644 --- a/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml +++ b/charts/sentry/templates/sentry/ingest/monitors/deployment-sentry-ingest-monitors.yaml @@ -86,6 +86,13 @@ spec: - "ingest-monitors" - "--consumer-group" - "ingest-monitors" + {{- if .Values.sentry.ingestMonitors.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestMonitors.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.ingestMonitors.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.ingestMonitors.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml b/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml index bc2d694fc..8e06249e9 100644 --- a/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml +++ b/charts/sentry/templates/sentry/ingest/occurrences/deployment-sentry-ingest-occurrences.yaml @@ -86,6 +86,13 @@ spec: - "ingest-occurrences" - "--consumer-group" - "ingest-occurrences" + {{- if .Values.sentry.ingestOccurrences.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestOccurrences.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.ingestOccurrences.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.ingestOccurrences.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml b/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml index bb38e1bca..a55752796 100644 --- a/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml +++ b/charts/sentry/templates/sentry/ingest/profiles/deployment-sentry-ingest-profiles.yaml @@ -86,6 +86,13 @@ spec: - "ingest-profiles" - "--consumer-group" - "ingest-profiles" + {{- if .Values.sentry.ingestProfiles.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestProfiles.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.ingestProfiles.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.ingestProfiles.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml b/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml index 45f4fe738..4fce465c3 100644 --- a/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml +++ b/charts/sentry/templates/sentry/ingest/replay-recordings/deployment-sentry-ingest-replay-recordings.yaml @@ -86,6 +86,13 @@ spec: - "ingest-replay-recordings" - "--consumer-group" - "ingest-replay-recordings" + {{- if .Values.sentry.ingestReplayRecordings.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestReplayRecordings.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.ingestReplayRecordings.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.ingestReplayRecordings.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml b/charts/sentry/templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml index fef035011..e4c810c5a 100644 --- a/charts/sentry/templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml +++ b/charts/sentry/templates/sentry/ingest/transactions/deployment-sentry-ingest-consumer-transactions.yaml @@ -86,6 +86,10 @@ spec: - "ingest-transactions" - "--consumer-group" - "ingest-consumer" + {{- if .Values.sentry.ingestConsumerTransactions.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.ingestConsumerTransactions.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.ingestConsumerTransactions.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml index 7a6aa7337..aa9a513d2 100644 --- a/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/billing/deployment-sentry-billing-metrics-consumer.yaml @@ -86,6 +86,13 @@ spec: - "billing-metrics-consumer" - "--consumer-group" - "billing-metrics-consumer" + {{- if .Values.sentry.billingMetricsConsumer.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.billingMetricsConsumer.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.billingMetricsConsumer.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.billingMetricsConsumer.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml index bb4a07f7b..60c10dbcc 100644 --- a/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/deployment-sentry-metrics-consumer.yaml @@ -84,6 +84,13 @@ spec: - "ingest-metrics" - "--consumer-group" - "metrics-consumer" + {{- if .Values.sentry.metricsConsumer.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.metricsConsumer.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.metricsConsumer.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.metricsConsumer.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml b/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml index e6d1ff1d1..df627f422 100644 --- a/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml +++ b/charts/sentry/templates/sentry/metrics/generic/deployment-sentry-generic-metrics-consumer.yaml @@ -82,6 +82,10 @@ spec: - "run" - "consumer" - "ingest-generic-metrics" + {{- if .Values.sentry.genericMetricsConsumer.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.genericMetricsConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.genericMetricsConsumer.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml b/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml index d47f9040b..bbbc9418f 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/errors/deployment-sentry-post-process-forwarder-errors.yaml @@ -86,7 +86,11 @@ spec: - "post-process-forwarder" - "--synchronize-commit-log-topic=snuba-commit-log" - "--synchronize-commit-group=snuba-consumers" - {{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }} + {{- if .Values.sentry.postProcessForwardErrors.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.postProcessForwardErrors.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.postProcessForwardErrors.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} {{- if .Values.sentry.postProcessForwardErrors.livenessProbe.enabled }} diff --git a/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml b/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml index 4abe7180b..23ce450d2 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/issue-platform/deployment-sentry-post-process-forwarder-issue-platform.yaml @@ -87,6 +87,10 @@ spec: - "--synchronize-commit-log-topic=snuba-generic-events-commit-log" - "--synchronize-commit-group" - "generic_events_group" + {{- if .Values.sentry.postProcessForwardIssuePlatform.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.postProcessForwardIssuePlatform.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.postProcessForwardIssuePlatform.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml b/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml index 5a738f2b0..e57adcfc3 100644 --- a/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml +++ b/charts/sentry/templates/sentry/post-process-forwarder/transactions/deployment-sentry-post-process-forwarder-transactions.yaml @@ -87,6 +87,10 @@ spec: - "--synchronize-commit-log-topic=snuba-transactions-commit-log" - "--synchronize-commit-group" - "transactions_group" + {{- if .Values.sentry.postProcessForwardTransactions.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.postProcessForwardTransactions.autoOffsetReset }}" + {{- end }} {{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }} - "--no-strict-offset-reset" {{- end }} diff --git a/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml b/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml index 0442dddd4..f1bd69658 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/events/deployment-sentry-subscription-consumer-events.yaml @@ -75,6 +75,13 @@ spec: - "run" - "consumer" - "events-subscription-results" + {{- if .Values.sentry.subscriptionConsumerEvents.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.subscriptionConsumerEvents.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.subscriptionConsumerEvents.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} - "--consumer-group" - "query-subscription-consumer" {{- if .Values.sentry.subscriptionConsumerEvents.livenessProbe.enabled }} diff --git a/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml b/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml index 13f677ee8..7c6edefd0 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/generic-metrics/deployment-sentry-subscription-consumer-generic-metrics.yaml @@ -84,6 +84,13 @@ spec: - "generic-metrics-subscription-results" - "--consumer-group" - "query-subscription-consumer" + {{- if .Values.sentry.subscriptionConsumerGenericMetrics.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.subscriptionConsumerGenericMetrics.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.subscriptionConsumerGenericMetrics.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.subscriptionConsumerGenericMetrics.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml b/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml index 6e55a1bef..070467144 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/metrics/deployment-sentry-subscription-consumer-metrics.yaml @@ -84,6 +84,13 @@ spec: - "metrics-subscription-results" - "--consumer-group" - "query-subscription-consumer" + {{- if .Values.sentry.subscriptionConsumerMetrics.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.subscriptionConsumerMetrics.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.subscriptionConsumerMetrics.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.subscriptionConsumerMetrics.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml b/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml index 5a2226e94..c60e7ff43 100644 --- a/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml +++ b/charts/sentry/templates/sentry/subscription-consumer/transactions/deployment-sentry-subscription-consumer-transactions.yaml @@ -77,6 +77,13 @@ spec: - "transactions-subscription-results" - "--consumer-group" - "query-subscription-consumer" + {{- if .Values.sentry.subscriptionConsumerTransactions.autoOffsetReset }} + - "--auto-offset-reset" + - "{{ .Values.sentry.subscriptionConsumerTransactions.autoOffsetReset }}" + {{- end }} + {{- if .Values.sentry.subscriptionConsumerTransactions.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} {{- if .Values.sentry.subscriptionConsumerTransactions.livenessProbe.enabled }} - "--healthcheck-file-path" - "/tmp/health.txt" diff --git a/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml index c9194bd9c..baf93841d 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-consumer.yaml @@ -83,8 +83,10 @@ spec: - "errors" - "--consumer-group" - "snuba-consumers" + {{- if .Values.snuba.consumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.consumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.consumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.consumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml index 485bb70b1..0512870af 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-counters-consumer.yaml @@ -83,8 +83,10 @@ spec: - "generic_metrics_counters_raw" - "--consumer-group" - "snuba-gen-metrics-counters-consumers" + {{- if .Values.snuba.genericMetricsCountersConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.genericMetricsCountersConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.genericMetricsCountersConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.genericMetricsCountersConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml index 86a3dbe72..8affacffa 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-distributions-consumer.yaml @@ -83,8 +83,10 @@ spec: - "generic_metrics_distributions_raw" - "--consumer-group" - "snuba-gen-metrics-distributions-consumers" + {{- if .Values.snuba.genericMetricsDistributionConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.genericMetricsDistributionConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.genericMetricsDistributionConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.genericMetricsDistributionConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml index 8509f5999..8d600acb3 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-generic-metrics-sets-consumer.yaml @@ -83,8 +83,10 @@ spec: - "generic_metrics_sets_raw" - "--consumer-group" - "snuba-gen-metrics-sets-consumers" + {{- if .Values.snuba.genericMetricsSetsConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.genericMetricsSetsConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.genericMetricsSetsConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.genericMetricsSetsConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml index 2c5d4819b..134fb889c 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-group-attributes-consumer.yaml @@ -83,8 +83,10 @@ spec: - "group_attributes" - "--consumer-group" - "snuba-group-attributes-group" + {{- if .Values.snuba.groupAttributesConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.groupAttributesConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.groupAttributesConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.groupAttributesConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml index c20bbb00f..cd60e0867 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-issue-occurrence-consumer.yaml @@ -83,8 +83,10 @@ spec: - "search_issues" - "--consumer-group" - "generic_events_group" + {{- if .Values.snuba.issueOccurrenceConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.issueOccurrenceConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.issueOccurrenceConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.issueOccurrenceConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml index bf09db5a5..94fe2cd15 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-metrics-consumer.yaml @@ -83,8 +83,10 @@ spec: - "metrics_raw" - "--consumer-group" - "snuba-metrics-consumers" + {{- if .Values.snuba.metricsConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.metricsConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.metricsConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.metricsConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml index 675925356..080e6c7ae 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-outcomes-billing-consumer.yaml @@ -83,8 +83,10 @@ spec: - "outcomes_raw" - "--consumer-group" - "snuba-consumers" + {{- if .Values.snuba.outcomesBillingConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.outcomesBillingConsumer.autoOffsetReset }}" + {{- end }} - "--raw-events-topic" - "outcomes-billing" {{- if .Values.snuba.outcomesBillingConsumer.maxBatchSize }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml index 2c03f5bfb..3187eda89 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-outcomes-consumer.yaml @@ -83,8 +83,10 @@ spec: - "outcomes_raw" - "--consumer-group" - "snuba-consumers" + {{- if .Values.snuba.outcomesConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.outcomesConsumer.autoOffsetReset }}" + {{- end }} - "--max-batch-size" - "{{ default "3" .Values.snuba.outcomesConsumer.maxBatchSize }}" {{- if .Values.snuba.outcomesConsumer.processes }} diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml index 5720ad381..523e0c8cd 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-profiling-functions-consumer.yaml @@ -83,8 +83,10 @@ spec: - "functions_raw" - "--consumer-group" - "functions_raw_group" + {{- if .Values.snuba.profilingFunctionsConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.profilingFunctionsConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.profilingFunctionsConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.profilingFunctionsConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml index 0a53fcaf9..9eea9d365 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-profiling-profiles-consumer.yaml @@ -83,8 +83,10 @@ spec: - "profiles" - "--consumer-group" - "profiles_group" + {{- if .Values.snuba.profilingProfilesConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.profilingProfilesConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.profilingProfilesConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.profilingProfilesConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml index cc28135ba..36d19baf1 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-replacer.yaml @@ -81,8 +81,10 @@ spec: - "replacer" - "--storage" - "errors" + {{- if .Values.snuba.replacer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.replacer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.replacer.maxBatchTimeMs }} - "--max-batch-time-ms" - "{{ .Values.snuba.replacer.maxBatchTimeMs }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml index c8db39f1e..3c7cf9cd6 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-replays-consumer.yaml @@ -83,8 +83,10 @@ spec: - "replays" - "--consumer-group" - "replays_group" + {{- if .Values.snuba.replaysConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.replaysConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.replaysConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.replaysConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml index ad4b81289..43d4ec523 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-spans-consumer.yaml @@ -83,8 +83,10 @@ spec: - "spans" - "--consumer-group" - "snuba-spans-group" + {{- if .Values.snuba.spansConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.spansConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.spansConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.spansConsumer.maxBatchSize }}" diff --git a/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml b/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml index a1b9c0bc7..e736eb84e 100644 --- a/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml +++ b/charts/sentry/templates/snuba/deployment-snuba-transactions-consumer.yaml @@ -83,8 +83,10 @@ spec: - "transactions" - "--consumer-group" - "transactions_group" + {{- if .Values.snuba.transactionsConsumer.autoOffsetReset }} - "--auto-offset-reset" - "{{ .Values.snuba.transactionsConsumer.autoOffsetReset }}" + {{- end }} {{- if .Values.snuba.transactionsConsumer.maxBatchSize }} - "--max-batch-size" - "{{ .Values.snuba.transactionsConsumer.maxBatchSize }}" diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml index eca606ae4..6e566f922 100644 --- a/charts/sentry/values.yaml +++ b/charts/sentry/values.yaml @@ -366,6 +366,7 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" # noStrictOffsetReset: false ingestConsumerEvents: @@ -405,6 +406,7 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" # noStrictOffsetReset: false ingestConsumerTransactions: @@ -444,6 +446,7 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" # noStrictOffsetReset: false ingestReplayRecordings: @@ -477,6 +480,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false ingestProfiles: replicas: 1 @@ -505,6 +510,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false ingestOccurrences: enabled: true @@ -537,6 +544,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false ingestMonitors: enabled: true @@ -569,6 +578,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false billingMetricsConsumer: enabled: true @@ -601,6 +612,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false genericMetricsConsumer: enabled: true @@ -636,6 +649,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false metricsConsumer: enabled: true @@ -671,6 +686,8 @@ sentry: # volumeMounts: # - mountPath: /dev/shm # name: dshm + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false cron: enabled: true @@ -709,6 +726,7 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" # noStrictOffsetReset: false # volumeMounts: [] @@ -725,6 +743,7 @@ sentry: sidecars: [] topologySpreadConstraints: [] volumes: [] + # autoOffsetReset: "earliest" # noStrictOffsetReset: false # volumeMounts: [] @@ -749,6 +768,7 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" # noStrictOffsetReset: false # volumeMounts: [] @@ -774,6 +794,8 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false postProcessForwardTransactions: enabled: true @@ -798,6 +820,7 @@ sentry: initialDelaySeconds: 5 periodSeconds: 320 # volumeMounts: [] + # autoOffsetReset: "earliest" # noStrictOffsetReset: false postProcessForwardIssuePlatform: @@ -822,6 +845,8 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false subscriptionConsumerGenericMetrics: enabled: true @@ -846,6 +871,8 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false subscriptionConsumerMetrics: enabled: true @@ -870,6 +897,8 @@ sentry: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false cleanup: successfulJobsHistoryLimit: 5 @@ -939,7 +968,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -972,7 +1001,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" # noStrictOffsetReset: false maxBatchSize: "3" livenessProbe: @@ -1005,7 +1034,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" # noStrictOffsetReset: false maxBatchSize: "3" livenessProbe: @@ -1038,7 +1067,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" # maxBatchTimeMs: "" # queuedMaxMessagesKbytes: "" # queuedMinMessages: "" @@ -1057,7 +1086,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1085,13 +1114,14 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 periodSeconds: 320 # volumes: [] # volumeMounts: [] + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false genericMetricsCountersConsumer: enabled: true @@ -1105,7 +1135,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1133,7 +1163,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1161,7 +1191,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1192,7 +1222,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1215,13 +1245,14 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" # volumes: [] # volumeMounts: [] livenessProbe: enabled: true initialDelaySeconds: 5 periodSeconds: 320 + # autoOffsetReset: "earliest" + # noStrictOffsetReset: false subscriptionConsumerSessions: replicas: 1 @@ -1235,7 +1266,7 @@ snuba: # tolerations: [] # podLabels: {} # commitBatchSize: 1 - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" sidecars: [] volumes: [] # noStrictOffsetReset: false @@ -1253,7 +1284,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1285,7 +1316,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" # noStrictOffsetReset: false # maxBatchSize: "" # processes: "" @@ -1314,7 +1345,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1346,7 +1377,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1379,7 +1410,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1412,7 +1443,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1445,7 +1476,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5 @@ -1478,7 +1509,7 @@ snuba: containerSecurityContext: {} # tolerations: [] # podLabels: {} - autoOffsetReset: "earliest" + # autoOffsetReset: "earliest" livenessProbe: enabled: true initialDelaySeconds: 5