From a1d415c7fd9e024c2ae948907ee61addd33bfffb Mon Sep 17 00:00:00 2001 From: Andrei Palade Date: Fri, 7 Nov 2025 14:29:45 +0000 Subject: [PATCH 1/5] Bump edgenode-observability version to 0.10.6 and orchestrator-observability chart version to 0.5.7 --- argocd/applications/templates/edgenode-observability.yaml | 2 +- argocd/applications/templates/orchestrator-observability.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd/applications/templates/edgenode-observability.yaml b/argocd/applications/templates/edgenode-observability.yaml index aded021d6..cc9fca710 100644 --- a/argocd/applications/templates/edgenode-observability.yaml +++ b/argocd/applications/templates/edgenode-observability.yaml @@ -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.6 helm: releaseName: {{$appName}} valuesObject: diff --git a/argocd/applications/templates/orchestrator-observability.yaml b/argocd/applications/templates/orchestrator-observability.yaml index 5d1dd1cd2..35e01bb51 100644 --- a/argocd/applications/templates/orchestrator-observability.yaml +++ b/argocd/applications/templates/orchestrator-observability.yaml @@ -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.7 helm: releaseName: {{$appName}} valuesObject: From fd82f965f196ac4bda2a640420ae0db3c0fa049c Mon Sep 17 00:00:00 2001 From: Andrei Palade Date: Tue, 11 Nov 2025 12:46:06 +0000 Subject: [PATCH 2/5] Update charts --- .../configs/edgenode-observability.yaml | 17 +++++++++++++++++ .../configs/orchestrator-observability.yaml | 17 +++++++++++++++++ .../custom/edgenode-observability.tpl | 4 ---- .../custom/orchestrator-observability.tpl | 14 ++++++++++---- orch-configs/profiles/o11y-release-large.yaml | 2 -- 5 files changed, 44 insertions(+), 10 deletions(-) diff --git a/argocd/applications/configs/edgenode-observability.yaml b/argocd/applications/configs/edgenode-observability.yaml index d3464469f..9464fcfab 100644 --- a/argocd/applications/configs/edgenode-observability.yaml +++ b/argocd/applications/configs/edgenode-observability.yaml @@ -18,6 +18,23 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" + mimir: + structuredConfig: + # These values override the default configuration to run Grafana Mimir in classic architecture. + # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. + # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, + # the distributors push series directly to the ingesters. + # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + ingest_storage: + enabled: false + kafka: + address: null + topic: null + auto_create_topic_default_partitions: null + distributor: + remote_timeout: null + ingester: + push_grpc_method_enabled: null opentelemetry-collector: alternateConfig: diff --git a/argocd/applications/configs/orchestrator-observability.yaml b/argocd/applications/configs/orchestrator-observability.yaml index 8286aaa29..cdecec46e 100644 --- a/argocd/applications/configs/orchestrator-observability.yaml +++ b/argocd/applications/configs/orchestrator-observability.yaml @@ -18,6 +18,23 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" + mimir: + structuredConfig: + # These values override the default configuration to run Grafana Mimir in classic architecture. + # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. + # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, + # the distributors push series directly to the ingesters. + # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + ingest_storage: + enabled: false + kafka: + address: null + topic: null + auto_create_topic_default_partitions: null + distributor: + remote_timeout: null + ingester: + push_grpc_method_enabled: null opentelemetry-collector: alternateConfig: diff --git a/argocd/applications/custom/edgenode-observability.tpl b/argocd/applications/custom/edgenode-observability.tpl index d72757d4b..bf03680fc 100644 --- a/argocd/applications/custom/edgenode-observability.tpl +++ b/argocd/applications/custom/edgenode-observability.tpl @@ -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 }} diff --git a/argocd/applications/custom/orchestrator-observability.tpl b/argocd/applications/custom/orchestrator-observability.tpl index 9458cf3bd..b93f6415c 100644 --- a/argocd/applications/custom/orchestrator-observability.tpl +++ b/argocd/applications/custom/orchestrator-observability.tpl @@ -186,14 +186,20 @@ mimir-distributed: # Need to set a few values to null when using IRSA structuredConfig: {{- if and .Values.argo.o11y .Values.argo.o11y.orchestrator .Values.argo.o11y.orchestrator.mimir .Values.argo.o11y.orchestrator.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: null {{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }} 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 }} diff --git a/orch-configs/profiles/o11y-release-large.yaml b/orch-configs/profiles/o11y-release-large.yaml index dafc3edb7..a0cc17dcd 100644 --- a/orch-configs/profiles/o11y-release-large.yaml +++ b/orch-configs/profiles/o11y-release-large.yaml @@ -104,7 +104,6 @@ argo: volumeSize: 40Gi structuredConfig: # TODO use direct structuredConfig querySchedulerMaxOutstandingRequestsPerTenant: null - frontendMaxOutstandingRequestsPerTenant: null querierTime: null metricsRetentionPeriod: 360h ingestionRate: 4000000 @@ -146,7 +145,6 @@ argo: volumeSize: 40Gi structuredConfig: # TODO use direct structuredConfig querySchedulerMaxOutstandingRequestsPerTenant: null - frontendMaxOutstandingRequestsPerTenant: null querierTime: null ingestionRate: null ingestionBurstSize: null From 2e291c9e05d3ccd36e52fcd48bde1771aab18eaa Mon Sep 17 00:00:00 2001 From: Andrei Palade Date: Tue, 11 Nov 2025 13:23:26 +0000 Subject: [PATCH 3/5] Disable kafka --- .../applications/configs/edgenode-observability.yaml | 12 +++++++----- .../configs/orchestrator-observability.yaml | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/argocd/applications/configs/edgenode-observability.yaml b/argocd/applications/configs/edgenode-observability.yaml index 9464fcfab..55990c13e 100644 --- a/argocd/applications/configs/edgenode-observability.yaml +++ b/argocd/applications/configs/edgenode-observability.yaml @@ -18,13 +18,15 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" + # These values override the default configuration to run Grafana Mimir in classic architecture. + # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. + # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, + # the distributors push series directly to the ingesters. + # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + kafka: + enabled: false mimir: structuredConfig: - # These values override the default configuration to run Grafana Mimir in classic architecture. - # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. - # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, - # the distributors push series directly to the ingesters. - # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml ingest_storage: enabled: false kafka: diff --git a/argocd/applications/configs/orchestrator-observability.yaml b/argocd/applications/configs/orchestrator-observability.yaml index cdecec46e..db1999126 100644 --- a/argocd/applications/configs/orchestrator-observability.yaml +++ b/argocd/applications/configs/orchestrator-observability.yaml @@ -18,13 +18,15 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" + # These values override the default configuration to run Grafana Mimir in classic architecture. + # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. + # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, + # the distributors push series directly to the ingesters. + # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + kafka: + enabled: false mimir: structuredConfig: - # These values override the default configuration to run Grafana Mimir in classic architecture. - # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. - # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, - # the distributors push series directly to the ingesters. - # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml ingest_storage: enabled: false kafka: From 434d2d14caead2ac831aeadce3e98bc3cb60d56d Mon Sep 17 00:00:00 2001 From: Andrei Palade Date: Tue, 11 Nov 2025 17:56:57 +0000 Subject: [PATCH 4/5] Bump charts --- .../applications/configs/edgenode-observability.yaml | 2 +- .../configs/orchestrator-observability.yaml | 2 +- .../applications/custom/orchestrator-observability.tpl | 10 ---------- .../applications/templates/edgenode-observability.yaml | 2 +- .../templates/orchestrator-observability.yaml | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/argocd/applications/configs/edgenode-observability.yaml b/argocd/applications/configs/edgenode-observability.yaml index 55990c13e..2848832c3 100644 --- a/argocd/applications/configs/edgenode-observability.yaml +++ b/argocd/applications/configs/edgenode-observability.yaml @@ -36,7 +36,7 @@ mimir-distributed: distributor: remote_timeout: null ingester: - push_grpc_method_enabled: null + push_grpc_method_enabled: true opentelemetry-collector: alternateConfig: diff --git a/argocd/applications/configs/orchestrator-observability.yaml b/argocd/applications/configs/orchestrator-observability.yaml index db1999126..f7cc757c0 100644 --- a/argocd/applications/configs/orchestrator-observability.yaml +++ b/argocd/applications/configs/orchestrator-observability.yaml @@ -36,7 +36,7 @@ mimir-distributed: distributor: remote_timeout: null ingester: - push_grpc_method_enabled: null + push_grpc_method_enabled: true opentelemetry-collector: alternateConfig: diff --git a/argocd/applications/custom/orchestrator-observability.tpl b/argocd/applications/custom/orchestrator-observability.tpl index b93f6415c..c36a57c1e 100644 --- a/argocd/applications/custom/orchestrator-observability.tpl +++ b/argocd/applications/custom/orchestrator-observability.tpl @@ -186,16 +186,6 @@ mimir-distributed: # Need to set a few values to null when using IRSA structuredConfig: {{- if and .Values.argo.o11y .Values.argo.o11y.orchestrator .Values.argo.o11y.orchestrator.mimir .Values.argo.o11y.orchestrator.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: null {{- if .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }} query_scheduler: max_outstanding_requests_per_tenant: {{ .Values.argo.o11y.orchestrator.mimir.structuredConfig.querySchedulerMaxOutstandingRequestsPerTenant }} diff --git a/argocd/applications/templates/edgenode-observability.yaml b/argocd/applications/templates/edgenode-observability.yaml index cc9fca710..66b5abe66 100644 --- a/argocd/applications/templates/edgenode-observability.yaml +++ b/argocd/applications/templates/edgenode-observability.yaml @@ -19,7 +19,7 @@ spec: sources: - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} chart: o11y/charts/{{$appName}} - targetRevision: 0.10.6 + targetRevision: 0.10.7 helm: releaseName: {{$appName}} valuesObject: diff --git a/argocd/applications/templates/orchestrator-observability.yaml b/argocd/applications/templates/orchestrator-observability.yaml index 35e01bb51..cbbb13a84 100644 --- a/argocd/applications/templates/orchestrator-observability.yaml +++ b/argocd/applications/templates/orchestrator-observability.yaml @@ -21,7 +21,7 @@ spec: sources: - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} chart: o11y/charts/{{$appName}} - targetRevision: 0.5.7 + targetRevision: 0.5.8 helm: releaseName: {{$appName}} valuesObject: From 9484ad2a1520d08e24dfa26f7c4fabf9357e67cf Mon Sep 17 00:00:00 2001 From: Andrei Palade Date: Sat, 15 Nov 2025 11:49:50 +0000 Subject: [PATCH 5/5] Update observability --- argocd/applications/configs/edgenode-observability.yaml | 9 ++++----- .../applications/configs/orchestrator-observability.yaml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/argocd/applications/configs/edgenode-observability.yaml b/argocd/applications/configs/edgenode-observability.yaml index 2848832c3..87ff15ef3 100644 --- a/argocd/applications/configs/edgenode-observability.yaml +++ b/argocd/applications/configs/edgenode-observability.yaml @@ -18,11 +18,10 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" - # These values override the default configuration to run Grafana Mimir in classic architecture. - # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. - # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, - # the distributors push series directly to the ingesters. - # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + 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: diff --git a/argocd/applications/configs/orchestrator-observability.yaml b/argocd/applications/configs/orchestrator-observability.yaml index f7cc757c0..b32b665c3 100644 --- a/argocd/applications/configs/orchestrator-observability.yaml +++ b/argocd/applications/configs/orchestrator-observability.yaml @@ -18,11 +18,10 @@ mimir-distributed: exitCommand: "" makePolicyJob: exitCommand: "" - # These values override the default configuration to run Grafana Mimir in classic architecture. - # The "classic" architecture is what Mimir 2.x (mimir-distributed Helm chart version 5.x) used by default. - # In this mode, Grafana Mimir doesn't use Kafka to decouple write and read paths. Instead, - # the distributors push series directly to the ingesters. - # https://github.com/grafana/mimir/blob/main/operations/helm/charts/mimir-distributed/classic-architecture.yaml + 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: