Skip to content

Commit 9dfeb70

Browse files
committed
Update charts
1 parent a46e980 commit 9dfeb70

File tree

5 files changed

+44
-10
lines changed

5 files changed

+44
-10
lines changed

argocd/applications/configs/edgenode-observability.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,23 @@ mimir-distributed:
1818
exitCommand: ""
1919
makePolicyJob:
2020
exitCommand: ""
21+
mimir:
22+
structuredConfig:
23+
# These values override the default configuration to run Grafana Mimir in classic architecture.
24+
# The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default.
25+
# In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead,
26+
# the distributors push series directly to the ingesters.
27+
# https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml
28+
ingest_storage:
29+
enabled: false
30+
kafka:
31+
address: null
32+
topic: null
33+
auto_create_topic_default_partitions: null
34+
distributor:
35+
remote_timeout: null
36+
ingester:
37+
push_grpc_method_enabled: null
2138

2239
opentelemetry-collector:
2340
alternateConfig:

argocd/applications/configs/orchestrator-observability.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,23 @@ mimir-distributed:
1818
exitCommand: ""
1919
makePolicyJob:
2020
exitCommand: ""
21+
mimir:
22+
structuredConfig:
23+
# These values override the default configuration to run Grafana Mimir in classic architecture.
24+
# The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default.
25+
# In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead,
26+
# the distributors push series directly to the ingesters.
27+
# https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml
28+
ingest_storage:
29+
enabled: false
30+
kafka:
31+
address: null
32+
topic: null
33+
auto_create_topic_default_partitions: null
34+
distributor:
35+
remote_timeout: null
36+
ingester:
37+
push_grpc_method_enabled: null
2138

2239
opentelemetry-collector:
2340
alternateConfig:

argocd/applications/custom/edgenode-observability.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,6 @@ mimir-distributed:
417417
query_scheduler:
418418
max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
419419
{{- end }}
420-
{{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
421-
frontend:
422-
max_outstanding_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
423-
{{- end }}
424420
{{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}
425421
querier:
426422
query_store_after: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}

argocd/applications/custom/orchestrator-observability.tpl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,20 @@ mimir-distributed:
186186
# Need to set a few values to null when using IRSA
187187
structuredConfig:
188188
{{- if and .Values.argo.o11y .Values.argo.o11y.orchestrator .Values.argo.o11y.orchestrator.mimir .Values.argo.o11y.orchestrator.mimir.structuredConfig }}
189+
ingest_storage:
190+
enabled: false
191+
kafka:
192+
address: null
193+
topic: null
194+
auto_create_topic_default_partitions: null
195+
distributor:
196+
remote_timeout: null
197+
ingester:
198+
push_grpc_method_enabled: null
189199
{{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
190200
query_scheduler:
191201
max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
192202
{{- end }}
193-
{{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
194-
frontend:
195-
max_outstanding_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
196-
{{- end }}
197203
{{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}
198204
querier:
199205
query_store_after: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}

orch-configs/profiles/o11y-release-large.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ argo:
104104
volumeSize: 40Gi
105105
structuredConfig: # TODO use direct structuredConfig
106106
querySchedulerMaxOutstandingRequestsPerTenant: null
107-
frontendMaxOutstandingRequestsPerTenant: null
108107
querierTime: null
109108
metricsRetentionPeriod: 360h
110109
ingestionRate: 4000000
@@ -146,7 +145,6 @@ argo:
146145
volumeSize: 40Gi
147146
structuredConfig: # TODO use direct structuredConfig
148147
querySchedulerMaxOutstandingRequestsPerTenant: null
149-
frontendMaxOutstandingRequestsPerTenant: null
150148
querierTime: null
151149
ingestionRate: null
152150
ingestionBurstSize: null

0 commit comments

Comments
 (0)