From 31a2965fe42004279026e8d8a5c1d1ad1c6cfc36 Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Sat, 9 Mar 2024 12:26:53 +0800 Subject: [PATCH] Avoid restarting grafana Signed-off-by: Weifeng Wang Avoid restarting grafana Signed-off-by: Weifeng Wang Avoid restarting grafana Signed-off-by: Weifeng Wang --- Makefile | 28 ++++++------- .../common/grafana/configs/datasources.yaml | 10 +++++ kubernetes/common/grafana/kustomization.yaml | 3 ++ .../grafana/manifests/k8s-all-in-one.yaml | 20 ++++++++-- .../logs/k8s-all-in-one.yaml | 2 +- .../logs/kustomization.yaml | 1 - .../metrics/k8s-all-in-one.yaml | 2 +- .../metrics/kustomization.yaml | 1 - .../profiles/k8s-all-in-one.yaml | 2 +- .../profiles/kustomization.yaml | 1 - .../configs/grafana-datasources-tempo.yaml | 2 + .../traces/k8s-all-in-one.yaml | 18 ++------- .../traces/kustomization.yaml | 10 ----- .../all-in-one/k8s-all-in-one.yaml | 13 ------ .../all-in-one/kustomization.yaml | 6 --- .../configs/grafana-datasources-mimir.yaml | 2 +- .../metrics/k8s-all-in-one.yaml | 40 +++++++++++++++++++ .../metrics/kustomization.yaml | 8 ++++ .../traces/k8s-all-in-one.yaml | 14 ------- .../monolithic-mode/traces/kustomization.yaml | 11 ----- .../read-write-mode/logs/k8s-all-in-one.yaml | 2 +- .../read-write-mode/logs/kustomization.yaml | 1 - .../metrics/k8s-all-in-one.yaml | 2 +- .../metrics/kustomization.yaml | 1 - 24 files changed, 103 insertions(+), 97 deletions(-) diff --git a/Makefile b/Makefile index 90a7fc0f..fa69cacc 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,9 @@ deploy-minio: @$(KUSTOMIZE) build --enable-helm kubernetes/common/minio-operator | kubectl apply -f - kubectl rollout status -n minio-system deployment/minio-operator --watch --timeout=600s @$(KUSTOMIZE) build --enable-helm kubernetes/common/minio-tenant | kubectl apply -f - - +delete-minio: + @$(KUSTOMIZE) build --enable-helm kubernetes/common/minio-tenant | kubectl delete --ignore-not-found -f - + .PHONY: deploy-gateway deploy-gateway: $(info ******************** deploy gateway manifests ********************) @@ -221,8 +223,6 @@ define config_changes_trigger_pod_restart kubectl rollout status -n gateway deployment/nginx --watch --timeout=600s @kubectl rollout restart daemonset -n monitoring-system grafana-agent kubectl rollout status -n monitoring-system daemonset/grafana-agent --watch --timeout=600s - @kubectl rollout restart deployment -n monitoring-system grafana - kubectl rollout status -n monitoring-system deployment/grafana --watch --timeout=600s @$(call echo_info, ${$@_MSG}) endef @@ -233,7 +233,7 @@ deploy-monolithic-mode-metrics: deploy-grafana ## Deploy monolithic-mode metrics @$(KUSTOMIZE) build kubernetes/monolithic-mode/metrics | kubectl apply -f - kubectl rollout status -n monitoring-system deployment/mimir --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the metrics.") -delete-monolithic-mode-metrics: +delete-monolithic-mode-metrics: delete-minio @$(KUSTOMIZE) build kubernetes/monolithic-mode/metrics | kubectl delete -f - @@ -243,7 +243,7 @@ deploy-monolithic-mode-logs: deploy-grafana ## Deploy monolithic-mode logs @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/logs | kubectl apply -f - kubectl rollout status -n logging-system statefulset/loki --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the logs.") -delete-monolithic-mode-logs: +delete-monolithic-mode-logs: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/logs | kubectl delete -f - @@ -253,7 +253,7 @@ deploy-monolithic-mode-profiles: deploy-grafana ## Deploy monolithic-mode profil @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/profiles | kubectl apply -f - kubectl rollout status -n profiles-system statefulset/pyroscope --watch --timeout=600s @$(call config_changes_trigger_pod_restart,"Go to http://localhost:8080/explore for the profiles.") -delete-monolithic-mode-profiles: +delete-monolithic-mode-profiles: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/profiles | kubectl delete -f - @@ -263,7 +263,7 @@ deploy-monolithic-mode-traces: deploy-grafana ## Deploy monolithic-mode traces @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/traces | kubectl apply -f - kubectl rollout status -n tracing-system statefulset/tempo --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the traces.") -delete-monolithic-mode-traces: +delete-monolithic-mode-traces: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/traces | kubectl delete -f - @@ -273,7 +273,7 @@ deploy-monolithic-mode-all-in-one: deploy-grafana ## Deploy monolithic-mode all- @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/all-in-one | kubectl apply -f - kubectl rollout status -n monitoring-system deployment/mimir --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the all-in-one.") -delete-monolithic-mode-all-in-one: +delete-monolithic-mode-all-in-one: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/monolithic-mode/all-in-one | kubectl delete -f - @@ -284,7 +284,7 @@ deploy-read-write-mode-metrics: deploy-grafana ## Deploy read-write-mode metrics @$(KUSTOMIZE) build kubernetes/read-write-mode/metrics | kubectl apply -f - kubectl rollout status -n monitoring-system deployment/mimir-write --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the metrics.") -delete-read-write-mode-metrics: +delete-read-write-mode-metrics: delete-minio @$(KUSTOMIZE) build kubernetes/read-write-mode/metrics | kubectl delete -f - @@ -294,7 +294,7 @@ deploy-read-write-mode-logs: deploy-grafana ## Deploy read-write-mode logs @$(KUSTOMIZE) build --enable-helm kubernetes/read-write-mode/logs | kubectl apply -f - kubectl rollout status -n logging-system statefulset/loki-write --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the logs.") -delete-read-write-mode-logs: +delete-read-write-mode-logs: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/read-write-mode/logs | kubectl delete -f - @@ -305,7 +305,7 @@ deploy-microservices-mode-logs: deploy-grafana ## Deploy microservices-mode logs @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/logs | kubectl apply -f - kubectl rollout status -n logging-system statefulset/loki-distributed-ingester --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the logs.") -delete-microservices-mode-logs: +delete-microservices-mode-logs: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/logs | kubectl delete -f - @@ -315,7 +315,7 @@ deploy-microservices-mode-metrics: deploy-grafana ## Deploy microservices-mode m @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/metrics | kubectl apply -f - kubectl rollout status -n monitoring-system statefulset/mimir-distributed-ingester --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the metrics.") -delete-microservices-mode-metrics: +delete-microservices-mode-metrics: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/metrics | kubectl delete -f - @@ -324,7 +324,7 @@ deploy-microservices-mode-profiles: deploy-grafana ## Deploy microservices-mode $(info ******************** deploy microservices-mode profiles manifests ********************) @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/profiles | kubectl apply -f - @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the profiles.") -delete-microservices-mode-profiles: +delete-microservices-mode-profiles: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/profiles | kubectl delete -f - @@ -334,7 +334,7 @@ deploy-microservices-mode-traces: deploy-grafana ## Deploy microservices-mode tr @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/traces | kubectl apply -f - kubectl rollout status -n tracing-system statefulset/tempo-distributed-ingester --watch --timeout=600s @$(call config_changes_trigger_pod_restart, "Go to http://localhost:8080/explore for the traces.") -delete-microservices-mode-traces: +delete-microservices-mode-traces: delete-minio @$(KUSTOMIZE) build --enable-helm kubernetes/microservices-mode/traces | kubectl delete -f - diff --git a/kubernetes/common/grafana/configs/datasources.yaml b/kubernetes/common/grafana/configs/datasources.yaml index b565a9cd..8b1cd660 100644 --- a/kubernetes/common/grafana/configs/datasources.yaml +++ b/kubernetes/common/grafana/configs/datasources.yaml @@ -1,5 +1,15 @@ apiVersion: 1 +deleteDatasources: +- name: Metrics + uid: metrics +- name: Logs + uid: logs +- name: Traces + uid: traces +- name: Profiles + uid: profiles + datasources: # Mimir for metrics - name: Metrics diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml index 59478e56..cb3493ba 100644 --- a/kubernetes/common/grafana/kustomization.yaml +++ b/kubernetes/common/grafana/kustomization.yaml @@ -16,6 +16,8 @@ helmCharts: images: - name: docker.io/grafana/grafana newTag: 10.4.0 +- name: quay.io/kiwigrid/k8s-sidecar + newTag: 1.26.1 resources: - namespace.yaml @@ -53,3 +55,4 @@ secretGenerator: literals: - NAMESPACE=monitoring-system - GF_LOG_LEVEL=info + - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml index 6dfa1dcf..3b3e4cab 100644 --- a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml +++ b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml @@ -165,6 +165,16 @@ data: datasources.yaml: | apiVersion: 1 + deleteDatasources: + - name: Metrics + uid: metrics + - name: Logs + uid: logs + - name: Traces + uid: traces + - name: Profiles + uid: profiles + datasources: # Mimir for metrics - name: Metrics @@ -215,7 +225,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources-6chtc6cfg8 + name: grafana-datasources-gcc7kf6bh4 namespace: monitoring-system --- apiVersion: v1 @@ -3439,6 +3449,10 @@ metadata: --- apiVersion: v1 data: + GF_FEATURE_TOGGLES_ENABLE: | + dHJhY2VxbEVkaXRvciB0cmFjZXNFbWJlZGRlZEZsYW1lR3JhcGggdHJhY2VxbFNlYXJjaC + Bjb3JyZWxhdGlvbnMgbWV0cmljc1N1bW1hcnkgdHJhY2VUb01ldHJpY3MgdHJhY2VUb1By + b2ZpbGVz GF_LOG_LEVEL: aW5mbw== NAMESPACE: bW9uaXRvcmluZy1zeXN0ZW0= kind: Secret @@ -3542,7 +3556,7 @@ spec: value: http://localhost:3000/api/admin/provisioning/dashboards/reload - name: REQ_METHOD value: POST - image: quay.io/kiwigrid/k8s-sidecar:1.25.2 + image: quay.io/kiwigrid/k8s-sidecar:1.26.1 imagePullPolicy: IfNotPresent name: grafana-sc-dashboard securityContext: @@ -3582,7 +3596,7 @@ spec: value: http://localhost:3000/api/admin/provisioning/datasources/reload - name: REQ_METHOD value: POST - image: quay.io/kiwigrid/k8s-sidecar:1.25.2 + image: quay.io/kiwigrid/k8s-sidecar:1.26.1 imagePullPolicy: IfNotPresent name: grafana-sc-datasources securityContext: diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml index 27623a6e..48ed9e5a 100644 --- a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml @@ -336,7 +336,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-9tgbk45h65 namespace: monitoring-system --- apiVersion: v1 diff --git a/kubernetes/microservices-mode/logs/kustomization.yaml b/kubernetes/microservices-mode/logs/kustomization.yaml index 56d98ce6..91b15643 100644 --- a/kubernetes/microservices-mode/logs/kustomization.yaml +++ b/kubernetes/microservices-mode/logs/kustomization.yaml @@ -21,7 +21,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: diff --git a/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml b/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml index b10934f8..4eb34dc4 100644 --- a/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml @@ -4098,7 +4098,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-5bcgmmbbkh namespace: monitoring-system --- apiVersion: v1 diff --git a/kubernetes/microservices-mode/metrics/kustomization.yaml b/kubernetes/microservices-mode/metrics/kustomization.yaml index 537f93f8..f58fd442 100644 --- a/kubernetes/microservices-mode/metrics/kustomization.yaml +++ b/kubernetes/microservices-mode/metrics/kustomization.yaml @@ -30,7 +30,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: diff --git a/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml b/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml index b7d6b86a..3f348c08 100644 --- a/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml @@ -144,7 +144,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-t756b6d8cg namespace: monitoring-system --- apiVersion: v1 diff --git a/kubernetes/microservices-mode/profiles/kustomization.yaml b/kubernetes/microservices-mode/profiles/kustomization.yaml index 49274202..65405591 100644 --- a/kubernetes/microservices-mode/profiles/kustomization.yaml +++ b/kubernetes/microservices-mode/profiles/kustomization.yaml @@ -22,7 +22,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: diff --git a/kubernetes/microservices-mode/traces/configs/grafana-datasources-tempo.yaml b/kubernetes/microservices-mode/traces/configs/grafana-datasources-tempo.yaml index a767f7b6..ebe3c764 100644 --- a/kubernetes/microservices-mode/traces/configs/grafana-datasources-tempo.yaml +++ b/kubernetes/microservices-mode/traces/configs/grafana-datasources-tempo.yaml @@ -1,6 +1,8 @@ apiVersion: 1 deleteDatasources: +- name: Metrics + uid: metrics - name: Traces uid: traces diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml index 8a5d210c..fbb7f2c7 100644 --- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml @@ -4111,6 +4111,8 @@ data: apiVersion: 1 deleteDatasources: + - name: Metrics + uid: metrics - name: Traces uid: traces @@ -4172,7 +4174,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-k2hbd65tcb namespace: monitoring-system --- apiVersion: v1 @@ -43572,20 +43574,6 @@ metadata: namespace: tracing-system --- apiVersion: v1 -data: - GF_FEATURE_TOGGLES_ENABLE: | - dHJhY2VxbEVkaXRvciB0cmFjZXNFbWJlZGRlZEZsYW1lR3JhcGggdHJhY2VxbFNlYXJjaC - Bjb3JyZWxhdGlvbnMgbWV0cmljc1N1bW1hcnkgdHJhY2VUb01ldHJpY3MgdHJhY2VUb1By - b2ZpbGVz - GF_LOG_LEVEL: d2Fybg== - NAMESPACE: bW9uaXRvcmluZy1zeXN0ZW0= -kind: Secret -metadata: - name: grafana-env - namespace: monitoring-system -type: Opaque ---- -apiVersion: v1 data: MIMIR_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20= kind: Secret diff --git a/kubernetes/microservices-mode/traces/kustomization.yaml b/kubernetes/microservices-mode/traces/kustomization.yaml index 1dac8681..6b6aa126 100644 --- a/kubernetes/microservices-mode/traces/kustomization.yaml +++ b/kubernetes/microservices-mode/traces/kustomization.yaml @@ -15,15 +15,6 @@ resources: - ../../../monitoring-mixins/mimir-mixin/deploy secretGenerator: -- name: grafana-env - namespace: monitoring-system - options: - disableNameSuffixHash: true - literals: - - NAMESPACE=monitoring-system - - GF_LOG_LEVEL=warn - - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles - - name: tempo-distributed-env namespace: tracing-system literals: @@ -43,7 +34,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml index c45be866..463c906e 100644 --- a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml @@ -62897,19 +62897,6 @@ metadata: type: Opaque --- apiVersion: v1 -data: - GF_FEATURE_TOGGLES_ENABLE: | - dHJhY2VxbEVkaXRvciB0cmFjZXNFbWJlZGRlZEZsYW1lR3JhcGggdHJhY2VxbFNlYXJjaC - Bjb3JyZWxhdGlvbnMgbWV0cmljc1N1bW1hcnkgdHJhY2VUb01ldHJpY3MgdHJhY2VUb1By - b2ZpbGVz - GF_LOG_LEVEL: d2Fybg== -kind: Secret -metadata: - name: grafana-env - namespace: monitoring-system -type: Opaque ---- -apiVersion: v1 data: MIMIR_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20= kind: Secret diff --git a/kubernetes/monolithic-mode/all-in-one/kustomization.yaml b/kubernetes/monolithic-mode/all-in-one/kustomization.yaml index 394b0852..11b89293 100644 --- a/kubernetes/monolithic-mode/all-in-one/kustomization.yaml +++ b/kubernetes/monolithic-mode/all-in-one/kustomization.yaml @@ -23,12 +23,6 @@ generatorOptions: disableNameSuffixHash: true secretGenerator: -- name: grafana-env - namespace: monitoring-system - literals: - - GF_LOG_LEVEL=warn - - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles - - name: loki-env namespace: logging-system literals: diff --git a/kubernetes/monolithic-mode/metrics/configs/grafana-datasources-mimir.yaml b/kubernetes/monolithic-mode/metrics/configs/grafana-datasources-mimir.yaml index abd752fa..4621df12 100644 --- a/kubernetes/monolithic-mode/metrics/configs/grafana-datasources-mimir.yaml +++ b/kubernetes/monolithic-mode/metrics/configs/grafana-datasources-mimir.yaml @@ -25,6 +25,6 @@ datasources: access: proxy url: http://nginx.gateway.svc.cluster.local:3100 basicAuth: false - isDefault: true + isDefault: false version: 1 editable: true diff --git a/kubernetes/monolithic-mode/metrics/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/metrics/k8s-all-in-one.yaml index da2aa4f3..d6e2fc02 100644 --- a/kubernetes/monolithic-mode/metrics/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/metrics/k8s-all-in-one.yaml @@ -4022,6 +4022,46 @@ metadata: namespace: monitoring-system --- apiVersion: v1 +data: + datasources.yaml: | + apiVersion: 1 + + deleteDatasources: + - name: Metrics + uid: metrics + - name: Logs + uid: logs + + datasources: + # Mimir for metrics + - name: Metrics + type: prometheus + uid: metrics + access: proxy + url: http://nginx.gateway.svc.cluster.local:8080/prometheus + basicAuth: false + isDefault: true + version: 1 + editable: true + + # Loki for logs + - name: Logs + type: loki + uid: logs + access: proxy + url: http://nginx.gateway.svc.cluster.local:3100 + basicAuth: false + isDefault: false + version: 1 + editable: true +kind: ConfigMap +metadata: + labels: + grafana_datasource: "1" + name: grafana-datasources-45d66kgh8f + namespace: monitoring-system +--- +apiVersion: v1 data: mimir-alertmanager-resources.json: | { diff --git a/kubernetes/monolithic-mode/metrics/kustomization.yaml b/kubernetes/monolithic-mode/metrics/kustomization.yaml index 6ef01fce..6bbd67df 100644 --- a/kubernetes/monolithic-mode/metrics/kustomization.yaml +++ b/kubernetes/monolithic-mode/metrics/kustomization.yaml @@ -27,6 +27,14 @@ configMapGenerator: files: - configs/config.river +- name: grafana-datasources + namespace: monitoring-system + options: + labels: + grafana_datasource: "1" + files: + - datasources.yaml=configs/grafana-datasources-mimir.yaml + - name: mimir-config namespace: monitoring-system files: diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml index de7ab3ea..8d376f0c 100644 --- a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml @@ -43547,20 +43547,6 @@ metadata: namespace: tracing-system --- apiVersion: v1 -data: - GF_FEATURE_TOGGLES_ENABLE: | - dHJhY2VxbEVkaXRvciB0cmFjZXNFbWJlZGRlZEZsYW1lR3JhcGggdHJhY2VxbFNlYXJjaC - Bjb3JyZWxhdGlvbnMgbWV0cmljc1N1bW1hcnkgdHJhY2VUb01ldHJpY3MgdHJhY2VUb1By - b2ZpbGVz - GF_LOG_LEVEL: d2Fybg== - NAMESPACE: bW9uaXRvcmluZy1zeXN0ZW0= -kind: Secret -metadata: - name: grafana-env - namespace: monitoring-system -type: Opaque ---- -apiVersion: v1 data: MIMIR_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20= kind: Secret diff --git a/kubernetes/monolithic-mode/traces/kustomization.yaml b/kubernetes/monolithic-mode/traces/kustomization.yaml index df776402..2e74924a 100644 --- a/kubernetes/monolithic-mode/traces/kustomization.yaml +++ b/kubernetes/monolithic-mode/traces/kustomization.yaml @@ -16,17 +16,6 @@ resources: # - ../../../monitoring-mixins/tempo-mixin/deploy secretGenerator: -- name: grafana-env - namespace: monitoring-system - options: - disableNameSuffixHash: true - literals: - - NAMESPACE=monitoring-system - - GF_LOG_LEVEL=warn - # - GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS=grafana-agent.monitoring-system.svc.cluster.local:4317 - # - GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES=app:grafana - - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles - - name: tempo-env namespace: tracing-system literals: diff --git a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml index 28990c0c..8ac7ca37 100644 --- a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml @@ -348,7 +348,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-9tgbk45h65 namespace: monitoring-system --- apiVersion: v1 diff --git a/kubernetes/read-write-mode/logs/kustomization.yaml b/kubernetes/read-write-mode/logs/kustomization.yaml index 93357d67..3a693a39 100644 --- a/kubernetes/read-write-mode/logs/kustomization.yaml +++ b/kubernetes/read-write-mode/logs/kustomization.yaml @@ -20,7 +20,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: diff --git a/kubernetes/read-write-mode/metrics/k8s-all-in-one.yaml b/kubernetes/read-write-mode/metrics/k8s-all-in-one.yaml index f2fe6cb5..405738ef 100644 --- a/kubernetes/read-write-mode/metrics/k8s-all-in-one.yaml +++ b/kubernetes/read-write-mode/metrics/k8s-all-in-one.yaml @@ -4073,7 +4073,7 @@ kind: ConfigMap metadata: labels: grafana_datasource: "1" - name: grafana-datasources + name: grafana-datasources-5c8h5c4899 namespace: monitoring-system --- apiVersion: v1 diff --git a/kubernetes/read-write-mode/metrics/kustomization.yaml b/kubernetes/read-write-mode/metrics/kustomization.yaml index 8733c409..51b35466 100644 --- a/kubernetes/read-write-mode/metrics/kustomization.yaml +++ b/kubernetes/read-write-mode/metrics/kustomization.yaml @@ -33,7 +33,6 @@ configMapGenerator: - name: grafana-datasources namespace: monitoring-system options: - disableNameSuffixHash: true labels: grafana_datasource: "1" files: