Try to get sentry to 24.2.0

charts/sentry/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 23.6.1
+appVersion: 24.2.0
 dependencies:
 - condition: sourcemaps.enabled
   name: memcached
@@ -39,4 +39,4 @@ maintainers:
 - name: sentry-kubernetes
 name: sentry
 type: application
-version: 19.4.0-plural2
+version: 19.4.1-plural

charts/sentry/templates/configmap-sentry.yaml

@@ -440,6 +440,53 @@ data:
                 "organizations:metrics",
                 "organizations:metrics-extraction",
                 "organizations:transaction-metrics-extraction",
+
+                {{- if .Values.sentry.features.enableSessionReplay}}
+                "organizations:session-replay",
+                "organizations:session-replay-ui",
+                "organizations:session-replay-sdk",
+                "organizations:session-replay-count-query-optimize",
+                "organizations:session-replay-sdk-errors-only",
+                "organizations:session-replay-recording-scrubbing",
+                "organizations:session-replay-a11y-tab",
+                "organizations:session-replay-slack-new-issue",
+                "organizations:session-replay-issue-emails",
+                "organizations:session-replay-event-linking",
+                "organizations:session-replay-weekly-email",
+                "organizations:session-replay-trace-table",
+                "organizations:session-replay-rage-dead-selectors",
+                "organizations:session-replay-new-event-counts",
+                "organizations:session-replay-new-timeline",
+                "organizations:issue-details-replay-event",
+                {{ end -}}
+
+                "organizations:issue-platform",
+
+                {{- if .Values.sentry.features.enableProfiling }}
+                "organizations:profiling",
+                "organizations:profiling-ui-frames",
+                "organizations:profiling-using-transactions",
+                "organizations:profiling-beta",
+                "organizations:profiling-stacktrace-links",
+                "organizations:profiling-global-suspect-functions",
+                "organizations:profiling-cpu-chart",
+                "organizations:profiling-memory-chart",
+                "organizations:profiling-view",
+                {{ end -}}
+
+                {{- if .Values.sentry.features.enableFeedback }}
+                "organizations:user-feedback-ui",
+                "organizations:user-feedback-ingest",
+                "organizations:feedback-ingest",
+                "organizations:feedback-post-process-group",
+                "organizations:feedback-visible",
+                {{ end -}}
+
+                "organizations:dashboards-mep",
+                "organizations:mep-rollout-flag",
+                "organizations:dashboards-rh-widget",
+                "organizations:metrics-extraction",
+                "organizations:transaction-metrics-extraction",
                 "organizations:session-replay",
 
                 "projects:alert-filters",

charts/sentry/templates/configmap-snuba.yaml

@@ -19,6 +19,7 @@ data:
 
     DEBUG = env("DEBUG", "0").lower() in ("1", "true")
 
+
     # Clickhouse Options
     CLUSTERS = [
       {
@@ -34,6 +35,7 @@ data:
             "events",
             "events_ro",
             "metrics",
+            "metrics_summaries",
             "migrations",
             "outcomes",
             "querylog",
@@ -47,6 +49,8 @@ data:
             "search_issues",
             "generic_metrics_counters",
             "spans",
+            "group_attributes",
+            "generic_metrics_gauges",
         },
         {{- /*
           The default clickhouse installation runs in distributed mode, while the external

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"

charts/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml

@@ -0,0 +1,148 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "sentry.fullname" . }}-generic-metrics-consumer
+  labels:
+    app: {{ template "sentry.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    app.kubernetes.io/managed-by: "Helm"
+  {{- if .Values.asHook }}
+  {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}}
+  annotations:
+    meta.helm.sh/release-name: "{{ .Release.Name }}"
+    meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
+    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook-weight": "10"
+  {{- end }}
+spec:
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      app: {{ template "sentry.fullname" . }}
+      release: "{{ .Release.Name }}"
+      role: generic-metrics-consumer
+  replicas: {{ .Values.sentry.genericMetricsConsumer.replicas }}
+  template:
+    metadata:
+      annotations:
+        checksum/configYml: {{ .Values.config.configYml | toYaml | toString | sha256sum }}
+        checksum/sentryConfPy: {{ .Values.config.sentryConfPy | sha256sum }}
+        checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-sentry.yaml") . | sha256sum }}
+        {{- if .Values.sentry.genericMetricsConsumer.annotations }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.annotations | indent 8 }}
+        {{- end }}
+      labels:
+        app: {{ template "sentry.fullname" . }}
+        release: "{{ .Release.Name }}"
+        role: generic-metrics-consumer
+        {{- if .Values.sentry.genericMetricsConsumer.podLabels }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.podLabels | indent 8 }}
+        {{- end }}
+    spec:
+      affinity:
+      {{- if .Values.sentry.genericMetricsConsumer.affinity }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.sentry.genericMetricsConsumer.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.sentry.genericMetricsConsumer.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.sentry.genericMetricsConsumer.tolerations }}
+      tolerations:
+{{ toYaml .Values.sentry.genericMetricsConsumer.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.images.sentry.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.images.sentry.imagePullSecrets | indent 8 }}
+      {{- end }}
+      {{- if .Values.dnsPolicy }}
+      dnsPolicy: {{ .Values.dnsPolicy | quote }}
+      {{- end }}
+      {{- if .Values.dnsConfig }}
+      dnsConfig:
+{{ toYaml .Values.dnsConfig | indent 8 }}
+      {{- end }}
+      {{- if .Values.sentry.genericMetricsConsumer.securityContext }}
+      securityContext:
+{{ toYaml .Values.sentry.genericMetricsConsumer.securityContext | indent 8 }}
+      {{- end }}
+      containers:
+      - name: {{ .Chart.Name }}-generic-metrics-consumer
+        image: "{{ template "sentry.image" . }}"
+        imagePullPolicy: {{ default "IfNotPresent" .Values.images.sentry.pullPolicy }}
+        command: ["sentry"]
+        args:
+          - "run"
+          - "consumer"
+          - "ingest-generic-metrics"
+          - "--consumer-group"
+          - "generic-metrics-consumer"
+          {{- if .Values.sentry.genericMetricsConsumer.concurrency }}
+          - "--concurrency"
+          - "{{ .Values.sentry.genericMetricsConsumer.concurrency }}"
+          {{- end }}
+          {{- if .Values.sentry.genericMetricsConsumer.maxBatchSize }}
+          - "--max-batch-size"
+          - "{{ .Values.sentry.genericMetricsConsumer.maxBatchSize }}"
+          {{- end }}
+        env:
+        - name: C_FORCE_ROOT
+          value: "true"
+{{ include "sentry.env" . | indent 8 }}
+{{- if .Values.sentry.genericMetricsConsumer.env }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.env | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - mountPath: /etc/sentry
+          name: config
+          readOnly: true
+        - mountPath: {{ .Values.filestore.filesystem.path }}
+          name: sentry-data
+        {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }}
+        - name: sentry-google-cloud-key
+          mountPath: /var/run/secrets/google
+        {{ end }}
+{{- if .Values.sentry.genericMetricsConsumer.volumeMounts }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.volumeMounts | indent 8 }}
+{{- end }}
+        resources:
+{{ toYaml .Values.sentry.genericMetricsConsumer.resources | indent 12 }}
+{{- if .Values.sentry.genericMetricsConsumer.containerSecurityContext }}
+        securityContext:
+{{ toYaml .Values.sentry.genericMetricsConsumer.containerSecurityContext | indent 12 }}
+{{- end }}
+{{- if .Values.sentry.genericMetricsConsumer.sidecars }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.sidecars | indent 6 }}
+{{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ .Values.serviceAccount.name }}-generic-metrics-consumer
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ template "sentry.fullname" . }}-sentry
+      - name: sentry-data
+      {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }}
+      {{- if .Values.filestore.filesystem.persistence.existingClaim }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.filestore.filesystem.persistence.existingClaim }}
+      {{- else }}
+        persistentVolumeClaim:
+          claimName: {{ template "sentry.fullname" . }}-data
+      {{- end }}
+      {{- else }}
+        emptyDir: {}
+      {{ end }}
+      {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }}
+      - name: sentry-google-cloud-key
+        secret:
+          secretName: {{ .Values.filestore.gcs.secretName }}
+      {{ end }}
+{{- if .Values.sentry.genericMetricsConsumer.volumes }}
+{{ toYaml .Values.sentry.genericMetricsConsumer.volumes | indent 6 }}
+{{- end }}
+      {{- if .Values.sentry.genericMetricsConsumer.priorityClassName }}
+      priorityClassName: "{{ .Values.sentry.genericMetricsConsumer.priorityClassName }}"
+      {{- end }}

charts/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml

@@ -77,15 +77,22 @@ spec:
         command: ["sentry"]
         args:
           - "run"
+          - "consumer"
+          - "ingest-attachments"
+          - "--consumer-group"
           - "ingest-consumer"
-          - "--consumer-type=attachments"
-          {{- if .Values.sentry.ingestConsumer.concurrency }}
-          - "--concurrency"
-          - "{{ .Values.sentry.ingestConsumer.concurrency }}"
+          {{- if .Values.sentry.ingestConsumerAttachments.livenessProbe.enabled }}
+          - "--healthcheck-file-path"
+          - "/tmp/health.txt"
           {{- end }}
-          {{- if .Values.sentry.ingestConsumer.maxBatchSize }}
+          - "--"
+          {{- if .Values.sentry.ingestConsumerAttachments.maxBatchSize }}
           - "--max-batch-size"
-          - "{{ .Values.sentry.ingestConsumer.maxBatchSize }}"
+          - "{{ .Values.sentry.ingestConsumerAttachments.maxBatchSize }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerAttachments.concurrency }}
+          - "--processes"
+          - "{{ .Values.sentry.ingestConsumerAttachments.concurrency }}"
           {{- end }}
         env:
         - name: C_FORCE_ROOT

charts/sentry/templates/deployment-sentry-ingest-consumer-events.yaml

@@ -77,10 +77,20 @@ spec:
         command: ["sentry"]
         args:
           - "run"
+          - "consumer"
+          - "ingest-events"
+          - "--consumer-group"
           - "ingest-consumer"
-          - "--consumer-type=events"
+          {{- if .Values.sentry.ingestConsumerEvents.noStrictOffsetReset }}
+          - "--no-strict-offset-reset"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerEvents.livenessProbe.enabled }}
+          - "--healthcheck-file-path"
+          - "/tmp/health.txt"
+          {{- end }}
+          - "--"
           {{- if .Values.sentry.ingestConsumer.concurrency }}
-          - "--concurrency"
+          - "--processes"
           - "{{ .Values.sentry.ingestConsumer.concurrency }}"
           {{- end }}
           {{- if .Values.sentry.ingestConsumer.maxBatchSize }}

charts/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml

@@ -77,8 +77,10 @@ spec:
         command: ["sentry"]
         args:
           - "run"
+          - "consumer"
+          - "ingest-transactions"
+          - "--consumer-group"
           - "ingest-consumer"
-          - "--consumer-type=transactions"
           {{- if .Values.sentry.ingestConsumer.concurrency }}
           - "--concurrency"
           - "{{ .Values.sentry.ingestConsumer.concurrency }}"

charts/sentry/templates/deployment-sentry-ingest-monitors.yaml

@@ -77,6 +77,9 @@ spec:
         command: ["sentry"]
         args:
           - "run"
+          - "consumer"
+          - "ingest-monitors"
+          - "--consumer-group"
           - "ingest-monitors"
         env:
         - name: C_FORCE_ROOT