Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions argocd/applications/configs/edgenode-observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ mimir-distributed:
exitCommand: ""
makePolicyJob:
exitCommand: ""
query_scheduler:
enabled: true
# Continue using classic architecture (disable ingest storage)
# https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-5.x-to-6.0/#continue-using-classic-architecture-disable-ingest-storage
kafka:
enabled: false
mimir:
structuredConfig:
ingest_storage:
enabled: false
kafka:
address: null
topic: null
auto_create_topic_default_partitions: null
distributor:
remote_timeout: null
ingester:
push_grpc_method_enabled: true

opentelemetry-collector:
alternateConfig:
Expand Down
18 changes: 18 additions & 0 deletions argocd/applications/configs/orchestrator-observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ mimir-distributed:
exitCommand: ""
makePolicyJob:
exitCommand: ""
query_scheduler:
enabled: true
# Continue using classic architecture (disable ingest storage)
# https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-5.x-to-6.0/#continue-using-classic-architecture-disable-ingest-storage
kafka:
enabled: false
mimir:
structuredConfig:
ingest_storage:
enabled: false
kafka:
address: null
topic: null
auto_create_topic_default_partitions: null
distributor:
remote_timeout: null
ingester:
push_grpc_method_enabled: true

opentelemetry-collector:
alternateConfig:
Expand Down
4 changes: 0 additions & 4 deletions argocd/applications/custom/edgenode-observability.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,6 @@ mimir-distributed:
query_scheduler:
max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
{{- end }}
{{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
frontend:
max_outstanding_per_tenant: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
{{- end }}
{{- if .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}
querier:
query_store_after: {{ .Values.argo.o11y.edgeNode.mimir.structuredConfig.querierTime }}
Expand Down
4 changes: 0 additions & 4 deletions argocd/applications/custom/orchestrator-observability.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,6 @@ mimir-distributed:
query_scheduler:
max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }}
{{- end }}
{{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
frontend:
max_outstanding_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.frontendMaxOutstandingRequestsPerTenant }}
{{- end }}
{{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}
querier:
query_store_after: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querierTime }}
Expand Down
2 changes: 1 addition & 1 deletion argocd/applications/templates/edgenode-observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
sources:
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: o11y/charts/{{$appName}}
targetRevision: 0.10.5
targetRevision: 0.10.7
helm:
releaseName: {{$appName}}
valuesObject:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
sources:
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: o11y/charts/{{$appName}}
targetRevision: 0.5.6
targetRevision: 0.5.8
helm:
releaseName: {{$appName}}
valuesObject:
Expand Down
2 changes: 0 additions & 2 deletions orch-configs/profiles/o11y-release-large.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ argo:
volumeSize: 40Gi
structuredConfig: # TODO use direct structuredConfig
querySchedulerMaxOutstandingRequestsPerTenant: null
frontendMaxOutstandingRequestsPerTenant: null
querierTime: null
metricsRetentionPeriod: 360h
ingestionRate: 4000000
Expand Down Expand Up @@ -146,7 +145,6 @@ argo:
volumeSize: 40Gi
structuredConfig: # TODO use direct structuredConfig
querySchedulerMaxOutstandingRequestsPerTenant: null
frontendMaxOutstandingRequestsPerTenant: null
querierTime: null
ingestionRate: null
ingestionBurstSize: null
Expand Down
Loading