From 78de49b0f94633cf098aff320a79d7a48443b9a5 Mon Sep 17 00:00:00 2001
From: Anton Patsev <10828883+patsevanton@users.noreply.github.com>
Date: Wed, 28 Aug 2024 13:54:32 +0600
Subject: [PATCH] feat: add logLevel, maxPollIntervalMs, inputBlockSize,
 maxBatchTimeMs (#1403)

---
 charts/sentry/Chart.yaml                           |  2 +-
 ...deployment-sentry-generic-metrics-consumer.yaml |  8 ++++++++
 .../deployment-sentry-ingest-consumer-events.yaml  | 12 ++++++++++++
 ...oyment-sentry-ingest-consumer-transactions.yaml | 12 ++++++++++++
 .../deployment-sentry-metrics-consumer.yaml        |  8 ++++++++
 .../sentry/templates/deployment-sentry-worker.yaml |  8 ++++++++
 charts/sentry/values.yaml                          | 14 +++++++++++++-
 7 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/charts/sentry/Chart.yaml b/charts/sentry/Chart.yaml
index aecf6c9e1..c695ebad5 100644
--- a/charts/sentry/Chart.yaml
+++ b/charts/sentry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 25.1.0
+version: 25.2.0
 appVersion: 24.5.1
 dependencies:
   - name: memcached
diff --git a/charts/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml b/charts/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml
index b0f371253..f4980b12d 100644
--- a/charts/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml
+++ b/charts/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml
@@ -97,6 +97,14 @@ spec:
           - "--processes"
           - "{{ .Values.sentry.genericMetricsConsumer.concurrency }}"
           {{- end }}
+          {{- if .Values.sentry.genericMetricsConsumer.logLevel }}
+          - "--log-level"
+          - "{{ .Values.sentry.genericMetricsConsumer.logLevel }}"
+          {{- end }}
+          {{- if .Values.sentry.genericMetricsConsumer.maxPollIntervalMs }}
+          - "--max-poll-interval-ms"
+          - "{{ .Values.sentry.genericMetricsConsumer.maxPollIntervalMs }}"
+          {{- end }}
         {{- if .Values.sentry.genericMetricsConsumer.livenessProbe.enabled }}
         livenessProbe:
           exec:
diff --git a/charts/sentry/templates/deployment-sentry-ingest-consumer-events.yaml b/charts/sentry/templates/deployment-sentry-ingest-consumer-events.yaml
index 8e4c17285..664c43591 100644
--- a/charts/sentry/templates/deployment-sentry-ingest-consumer-events.yaml
+++ b/charts/sentry/templates/deployment-sentry-ingest-consumer-events.yaml
@@ -102,6 +102,18 @@ spec:
           - "--processes"
           - "{{ .Values.sentry.ingestConsumerEvents.concurrency }}"
           {{- end }}
+          {{- if .Values.sentry.ingestConsumerEvents.logLevel }}
+          - "--log-level"
+          - "{{ .Values.sentry.ingestConsumerEvents.logLevel }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerEvents.inputBlockSize }}
+          - "--input-block-size"
+          - "{{ .Values.sentry.ingestConsumerEvents.inputBlockSize }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerEvents.maxBatchTimeMs }}
+          - "--max-batch-time-ms"
+          - "{{ .Values.sentry.ingestConsumerEvents.maxBatchTimeMs }}"
+          {{- end }}
         {{- if .Values.sentry.ingestConsumerEvents.livenessProbe.enabled }}
         livenessProbe:
           exec:
diff --git a/charts/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml b/charts/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml
index dadbd11dc..bd3c1fa41 100644
--- a/charts/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml
+++ b/charts/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml
@@ -102,6 +102,18 @@ spec:
           - "--processes"
           - "{{ .Values.sentry.ingestConsumerTransactions.concurrency }}"
           {{- end }}
+          {{- if .Values.sentry.ingestConsumerTransactions.logLevel }}
+          - "--log-level"
+          - "{{ .Values.sentry.ingestConsumerTransactions.logLevel }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerTransactions.inputBlockSize }}
+          - "--input-block-size"
+          - "{{ .Values.sentry.ingestConsumerTransactions.inputBlockSize }}"
+          {{- end }}
+          {{- if .Values.sentry.ingestConsumerTransactions.maxBatchTimeMs }}
+          - "--max-batch-time-ms"
+          - "{{ .Values.sentry.ingestConsumerTransactions.maxBatchTimeMs }}"
+          {{- end }}
         {{- if .Values.sentry.ingestConsumerTransactions.livenessProbe.enabled }}
         livenessProbe:
           exec:
diff --git a/charts/sentry/templates/deployment-sentry-metrics-consumer.yaml b/charts/sentry/templates/deployment-sentry-metrics-consumer.yaml
index add9648d2..68ac787b7 100644
--- a/charts/sentry/templates/deployment-sentry-metrics-consumer.yaml
+++ b/charts/sentry/templates/deployment-sentry-metrics-consumer.yaml
@@ -97,6 +97,14 @@ spec:
           - "--processes"
           - "{{ .Values.sentry.metricsConsumer.concurrency }}"
           {{- end }}
+          {{- if .Values.sentry.metricsConsumer.logLevel }}
+          - "--log-level"
+          - "{{ .Values.sentry.metricsConsumer.logLevel }}"
+          {{- end }}
+          {{- if .Values.sentry.metricsConsumer.maxPollIntervalMs }}
+          - "--max-poll-interval-ms"
+          - "{{ .Values.sentry.metricsConsumer.maxPollIntervalMs }}"
+          {{- end }}
         {{- if .Values.sentry.metricsConsumer.livenessProbe.enabled }}
         livenessProbe:
           exec:
diff --git a/charts/sentry/templates/deployment-sentry-worker.yaml b/charts/sentry/templates/deployment-sentry-worker.yaml
index eb3c1c996..a646ca018 100644
--- a/charts/sentry/templates/deployment-sentry-worker.yaml
+++ b/charts/sentry/templates/deployment-sentry-worker.yaml
@@ -78,6 +78,14 @@ spec:
           - "-c"
           - "{{ .Values.sentry.worker.concurrency }}"
           {{- end }}
+          {{- if .Values.sentry.worker.logLevel }}
+          - "--log-level"
+          - "{{ .Values.sentry.worker.logLevel }}"
+          {{- end }}
+          {{- if .Values.sentry.worker.logFormat }}
+          - "--logformat"
+          - "{{ .Values.sentry.worker.logFormat }}"
+          {{- end }}
         env:
         - name: C_FORCE_ROOT
           value: "true"
diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml
index 44148eb81..cfc5e4baa 100644
--- a/charts/sentry/values.yaml
+++ b/charts/sentry/values.yaml
@@ -205,6 +205,8 @@ sentry:
     nodeSelector: {}
     # tolerations: []
     # podLabels: []
+    # logLevel: "WARNING"
+    # logFormat: "machine"
 
     # it's better to use prometheus adapter and scale based on
     # the size of the rabbitmq queue
@@ -331,6 +333,9 @@ sentry:
     # tolerations: []
     # podLabels: []
     # maxBatchSize: ""
+    # logLevel: "info"
+    # inputBlockSize: ""
+    # maxBatchTimeMs: ""
 
     # it's better to use prometheus adapter and scale based on
     # the size of the rabbitmq queue
@@ -366,6 +371,9 @@ sentry:
     # tolerations: []
     # podLabels: []
     # maxBatchSize: ""
+    # logLevel: "info"
+    # inputBlockSize: ""
+    # maxBatchTimeMs: ""
 
     # it's better to use prometheus adapter and scale based on
     # the size of the rabbitmq queue
@@ -555,6 +563,8 @@ sentry:
     # tolerations: []
     # podLabels: []
     # maxBatchSize: ""
+    # maxPollIntervalMs: ""
+    # logLevel: "info"
 
     # it's better to use prometheus adapter and scale based on
     # the size of the rabbitmq queue
@@ -588,6 +598,8 @@ sentry:
     # tolerations: []
     # podLabels: []
     # maxBatchSize: ""
+    # logLevel: "info"
+    # maxPollIntervalMs: ""
 
     # it's better to use prometheus adapter and scale based on
     # the size of the rabbitmq queue
@@ -1395,7 +1407,7 @@ hooks:
   enabled: true
   preUpgrade: false
   removeOnSuccess: true
-  activeDeadlineSeconds: 100
+  activeDeadlineSeconds: 600
   shareProcessNamespace: false
   dbCheck:
     enabled: true