fix remaining sentry issues for upgrade

pluralsh · May 16, 2024 · 6c409ce · 6c409ce
1 parent 4a27237
commit 6c409ce
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 121 deletions.
diff --git a/charts/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml b/charts/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml
@@ -76,12 +76,24 @@ spec:
         imagePullPolicy: {{ default "IfNotPresent" .Values.images.sentry.pullPolicy }}
         command: ["sentry"]
         args:
-          - "run"
-          - "billing-metrics-consumer"
-          {{- if .Values.sentry.billingMetricsConsumer.maxBatchSize }}
-          - "--max-batch-size"
-          - "{{ .Values.sentry.billingMetricsConsumer.maxBatchSize }}"
-          {{- end }}
+        - "run"
+        - "consumer"
+        - "billing-metrics-consumer"
+        - "--consumer-group"
+        - "billing-metrics-consumer"
+        {{- if .Values.sentry.billingMetricsConsumer.livenessProbe.enabled }}
+        - "--healthcheck-file-path"
+        - "/tmp/health.txt"
+        {{- end }}
+        - "--"
+        {{- if .Values.sentry.billingMetricsConsumer.maxBatchSize }}
+        - "--max-batch-size"
+        - "{{ .Values.sentry.billingMetricsConsumer.maxBatchSize }}"
+        {{- end }}
+        {{- if .Values.sentry.billingMetricsConsumer.concurrency }}
+        - "--processes"
+        - "{{ .Values.sentry.billingMetricsConsumer.concurrency }}"
+        {{- end }}
         env:
         - name: C_FORCE_ROOT
           value: "true"

diff --git a/charts/sentry/templates/deployment-snuba-api.yaml b/charts/sentry/templates/deployment-snuba-api.yaml
@@ -88,7 +88,7 @@ spec:
         livenessProbe:
           failureThreshold: 5
           httpGet:
-            path: /
+            path: /health
             port: {{ template "snuba.port" }}
             scheme: HTTP
           initialDelaySeconds: {{ .Values.snuba.api.probeInitialDelaySeconds }}
@@ -98,7 +98,7 @@ spec:
         readinessProbe:
           failureThreshold: 10
           httpGet:
-            path: /
+            path: /health
             port: {{ template "snuba.port" }}
             scheme: HTTP
           initialDelaySeconds: {{ .Values.snuba.api.probeInitialDelaySeconds }}

diff --git a/charts/sentry/templates/deployment-snuba-subscription-consumer-sessions.yaml b/charts/sentry/templates/deployment-snuba-subscription-consumer-sessions.yaml
diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml
@@ -668,11 +668,104 @@ kafka:
     schedulerName: ""
     sidecars: []
     topics:
+    - name: events
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: event-replacements
+    - name: snuba-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: cdc
+    - name: transactions
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: snuba-transactions-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: snuba-metrics
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: outcomes
+    - name: outcomes-billing
+    - name: ingest-sessions
+    - name: snuba-sessions-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: snuba-metrics-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: scheduled-subscriptions-events
+    - name: scheduled-subscriptions-transactions
+    - name: scheduled-subscriptions-sessions
+    - name: scheduled-subscriptions-metrics
+    - name: scheduled-subscriptions-generic-metrics-sets
+    - name: scheduled-subscriptions-generic-metrics-distributions
+    - name: scheduled-subscriptions-generic-metrics-counters
+    - name: events-subscription-results
+    - name: transactions-subscription-results
+    - name: sessions-subscription-results
+    - name: metrics-subscription-results
+    - name: generic-metrics-subscription-results
+    - name: snuba-queries
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: processed-profiles
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: profiles-call-tree
+    - name: ingest-replay-events
+      config:
+        "message.timestamp.type": LogAppendTime
+        "max.message.bytes": "15000000"
+    - name: snuba-generic-metrics
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: snuba-generic-metrics-sets-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: snuba-generic-metrics-distributions-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: snuba-generic-metrics-counters-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: generic-events
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: snuba-generic-events-commit-log
+      config:
+        "cleanup.policy": "compact,delete"
+        "min.compaction.lag.ms": "3600000"
+    - name: group-attributes
+      config:
+        "message.timestamp.type": LogAppendTime
+    - name: snuba-attribution
+    - name: snuba-dead-letter-metrics
+    - name: snuba-dead-letter-sessions
+    - name: snuba-dead-letter-generic-metrics
+    - name: snuba-dead-letter-replays
+    - name: snuba-dead-letter-generic-events
+    - name: snuba-dead-letter-querylog
+    - name: snuba-dead-letter-group-attributes
     - name: ingest-attachments
     - name: ingest-transactions
     - name: ingest-events
     - name: ingest-replay-recordings
+    - name: ingest-metrics
+    - name: ingest-performance-metrics
+    - name: ingest-monitors
     - name: profiles
+    - name: ingest-occurrences
+    - name: snuba-spans
+    - name: shared-resources-usage
+    - name: snuba-metrics-summaries
     waitForKafka: true
   rbac:
     create: false