Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(sentry): Add missing --no-strict-offset-reset and --auto-offset-reset for consumers #1535

Merged
merged 3 commits into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ spec:
- "ingest-attachments"
- "--consumer-group"
- "ingest-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestConsumerAttachments.autoOffsetReset }}"
{{- if .Values.sentry.ingestConsumerAttachments.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ spec:
- "ingest-events"
- "--consumer-group"
- "ingest-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestConsumerEvents.autoOffsetReset }}"
{{- if .Values.sentry.ingestConsumerEvents.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ spec:
- "ingest-monitors"
- "--consumer-group"
- "ingest-monitors"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestMonitors.autoOffsetReset }}"
{{- if .Values.sentry.ingestMonitors.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.ingestMonitors.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ spec:
- "ingest-occurrences"
- "--consumer-group"
- "ingest-occurrences"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestOccurrences.autoOffsetReset }}"
{{- if .Values.sentry.ingestOccurrences.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.ingestOccurrences.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ spec:
- "ingest-profiles"
- "--consumer-group"
- "ingest-profiles"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestProfiles.autoOffsetReset }}"
{{- if .Values.sentry.ingestProfiles.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.ingestProfiles.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ spec:
- "ingest-replay-recordings"
- "--consumer-group"
- "ingest-replay-recordings"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestReplayRecordings.autoOffsetReset }}"
{{- if .Values.sentry.ingestReplayRecordings.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.ingestReplayRecordings.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ spec:
- "ingest-transactions"
- "--consumer-group"
- "ingest-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.ingestConsumerTransactions.autoOffsetReset }}"
{{- if .Values.sentry.ingestConsumerTransactions.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ spec:
- "billing-metrics-consumer"
- "--consumer-group"
- "billing-metrics-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.billingMetricsConsumer.autoOffsetReset }}"
{{- if .Values.sentry.billingMetricsConsumer.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.billingMetricsConsumer.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ spec:
- "ingest-metrics"
- "--consumer-group"
- "metrics-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.metricsConsumer.autoOffsetReset }}"
{{- if .Values.sentry.metricsConsumer.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.metricsConsumer.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ spec:
- "run"
- "consumer"
- "ingest-generic-metrics"
- "--auto-offset-reset"
- "{{ .Values.sentry.genericMetricsConsumer.autoOffsetReset }}"
{{- if .Values.sentry.genericMetricsConsumer.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ spec:
- "post-process-forwarder"
- "--synchronize-commit-log-topic=snuba-commit-log"
- "--synchronize-commit-group=snuba-consumers"
{{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }}
- "--auto-offset-reset"
- "{{ .Values.sentry.postProcessForwardErrors.autoOffsetReset }}"
{{- if .Values.sentry.postProcessForwardErrors.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.postProcessForwardErrors.livenessProbe.enabled }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ spec:
- "--synchronize-commit-log-topic=snuba-generic-events-commit-log"
- "--synchronize-commit-group"
- "generic_events_group"
- "--auto-offset-reset"
- "{{ .Values.sentry.postProcessForwardIssuePlatform.autoOffsetReset }}"
{{- if .Values.sentry.postProcessForwardIssuePlatform.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ spec:
- "--synchronize-commit-log-topic=snuba-transactions-commit-log"
- "--synchronize-commit-group"
- "transactions_group"
- "--auto-offset-reset"
- "{{ .Values.sentry.postProcessForwardTransactions.autoOffsetReset }}"
{{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ spec:
- "run"
- "consumer"
- "events-subscription-results"
- "--auto-offset-reset"
- "{{ .Values.sentry.subscriptionConsumerEvents.autoOffsetReset }}"
{{- if .Values.sentry.subscriptionConsumerEvents.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
- "--consumer-group"
- "query-subscription-consumer"
{{- if .Values.sentry.subscriptionConsumerEvents.livenessProbe.enabled }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ spec:
- "generic-metrics-subscription-results"
- "--consumer-group"
- "query-subscription-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.subscriptionConsumerGenericMetrics.autoOffsetReset }}"
{{- if .Values.sentry.subscriptionConsumerGenericMetrics.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.subscriptionConsumerGenericMetrics.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ spec:
- "metrics-subscription-results"
- "--consumer-group"
- "query-subscription-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.subscriptionConsumerMetrics.autoOffsetReset }}"
{{- if .Values.sentry.subscriptionConsumerMetrics.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.subscriptionConsumerMetrics.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ spec:
- "transactions-subscription-results"
- "--consumer-group"
- "query-subscription-consumer"
- "--auto-offset-reset"
- "{{ .Values.sentry.subscriptionConsumerTransactions.autoOffsetReset }}"
{{- if .Values.sentry.subscriptionConsumerTransactions.noStrictOffsetReset }}
- "--no-strict-offset-reset"
{{- end }}
{{- if .Values.sentry.subscriptionConsumerTransactions.livenessProbe.enabled }}
- "--healthcheck-file-path"
- "/tmp/health.txt"
Expand Down
35 changes: 33 additions & 2 deletions charts/sentry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestConsumerEvents:
Expand Down Expand Up @@ -405,6 +406,7 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestConsumerTransactions:
Expand Down Expand Up @@ -444,6 +446,7 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestReplayRecordings:
Expand Down Expand Up @@ -477,6 +480,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestProfiles:
replicas: 1
Expand Down Expand Up @@ -505,6 +510,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestOccurrences:
enabled: true
Expand Down Expand Up @@ -537,6 +544,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

ingestMonitors:
enabled: true
Expand Down Expand Up @@ -569,6 +578,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

billingMetricsConsumer:
enabled: true
Expand Down Expand Up @@ -601,6 +612,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

genericMetricsConsumer:
enabled: true
Expand Down Expand Up @@ -636,6 +649,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

metricsConsumer:
enabled: true
Expand Down Expand Up @@ -671,6 +686,8 @@ sentry:
# volumeMounts:
# - mountPath: /dev/shm
# name: dshm
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

cron:
enabled: true
Expand Down Expand Up @@ -709,6 +726,7 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false
# volumeMounts: []

Expand All @@ -725,6 +743,7 @@ sentry:
sidecars: []
topologySpreadConstraints: []
volumes: []
autoOffsetReset: "earliest"
# noStrictOffsetReset: false
# volumeMounts: []

Expand All @@ -749,6 +768,7 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false
# volumeMounts: []

Expand All @@ -774,6 +794,8 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

postProcessForwardTransactions:
enabled: true
Expand All @@ -798,6 +820,7 @@ sentry:
initialDelaySeconds: 5
periodSeconds: 320
# volumeMounts: []
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

postProcessForwardIssuePlatform:
Expand All @@ -822,6 +845,8 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

subscriptionConsumerGenericMetrics:
enabled: true
Expand All @@ -846,6 +871,8 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

subscriptionConsumerMetrics:
enabled: true
Expand All @@ -870,6 +897,8 @@ sentry:
enabled: true
initialDelaySeconds: 5
periodSeconds: 320
autoOffsetReset: "earliest"
# noStrictOffsetReset: false

cleanup:
successfulJobsHistoryLimit: 5
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down