Skip to content

Commit 7d476f4

Browse files
committed
feat: add ClickHouse configuration for logging and merge tree settings
1 parent b4d1b88 commit 7d476f4

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

charts/sentry/templates/snuba/_helper-snuba.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ settings.py: |
3131
KAFKA_TOPIC_MAP[topic.value] = f"{SENTRY_CHARTS_KAFKA_TOPIC_PREFIX}{topic.value}"
3232
{{- end }}
3333

34+
SENTRY_DISTRIBUTED_CLICKHOUSE_TABLES = True
35+
3436
# Clickhouse Options
3537
CLUSTERS = [
3638
{
@@ -75,7 +77,7 @@ settings.py: |
7577
clickhouse configured can be configured any way you choose
7678
*/}}
7779
{{- if and .Values.externalClickhouse.singleNode (not .Values.clickhouse.enabled) }}
78-
"single_node": True,
80+
"single_node": False,
7981
{{- else }}
8082
"single_node": False,
8183
{{- end }}

charts/sentry/values.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2265,6 +2265,36 @@ config:
22652265

22662266
clickhouse:
22672267
enabled: true
2268+
configdFiles:
2269+
99-custom.xml: |
2270+
<clickhouse>
2271+
<logger>
2272+
<level>warning</level>
2273+
<console>true</console>
2274+
</logger>
2275+
<query_thread_log remove="remove"/>
2276+
<query_log remove="remove"/>
2277+
<text_log remove="remove"/>
2278+
<trace_log remove="remove"/>
2279+
<metric_log remove="remove"/>
2280+
<asynchronous_metric_log remove="remove"/>
2281+
2282+
<session_log remove="remove"/>
2283+
<part_log remove="remove"/>
2284+
2285+
<allow_nullable_key>1</allow_nullable_key>
2286+
2287+
<profiles>
2288+
<default>
2289+
<log_queries>0</log_queries>
2290+
<log_query_threads>0</log_query_threads>
2291+
</default>
2292+
</profiles>
2293+
<merge_tree>
2294+
<enable_mixed_granularity_parts>1</enable_mixed_granularity_parts>
2295+
<max_suspicious_broken_parts>10</max_suspicious_broken_parts>
2296+
</merge_tree>
2297+
</clickhouse>
22682298
22692299
## This value is only used when clickhouse.enabled is set to false
22702300
##

0 commit comments

Comments
 (0)