From 41a7885fdb68b66191aa8112f95a01dc4d642d92 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 6 May 2021 14:50:12 +0900 Subject: [PATCH 1/3] fix wrong overrided sidecarsService --- lma/base/site-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lma/base/site-values.yaml b/lma/base/site-values.yaml index 8bb6599..8a3fa15 100755 --- a/lma/base/site-values.yaml +++ b/lma/base/site-values.yaml @@ -222,7 +222,7 @@ charts: minio.persistence.storageClass: $(storageClassName) minio.persistence.accessMode: ReadWriteOnce minio.persistence.size: 8Gi - query.sidecarsService: thanos-sidecars + query.dnsDiscovery.sidecarsService: thanos-sidecars - name: thanos-config override: From aaed1ad6247688ab4a562c301ff2186f43296614 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 6 May 2021 15:18:55 +0900 Subject: [PATCH 2/3] use lma-addons 1.5.0 version --- lma/base/resources.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml index e0330c2..e03735d 100755 --- a/lma/base/resources.yaml +++ b/lma/base/resources.yaml @@ -871,7 +871,7 @@ spec: chart: repository: https://openinfradev.github.io/hanu-helm-repo name: lma-addons - version: 1.4.0 + version: 1.5.0 releaseName: addons targetNamespace: lma values: @@ -928,7 +928,7 @@ spec: chart: repository: https://openinfradev.github.io/hanu-helm-repo name: lma-addons - version: 1.4.0 + version: 1.5.0 releaseName: fed-addons targetNamespace: fed values: @@ -953,6 +953,10 @@ spec: enabled: true jaeger: enabled: true + tacoCustomDashboard: + enabled: true + ceph: + enabled: true serviceMonitor: calico: enabled: false From 853f46f094584f177579a8283716eaf5083db900 Mon Sep 17 00:00:00 2001 From: Esther Kim Date: Thu, 6 May 2021 17:14:34 +0900 Subject: [PATCH 3/3] fix prometheus address for grafana dashboard --- lma/base/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml index e03735d..b61500c 100755 --- a/lma/base/resources.yaml +++ b/lma/base/resources.yaml @@ -948,7 +948,7 @@ spec: enabled: true sidecar: datasources: - prometheusAddress: "thanos-query-frontend:9090" + prometheusAddress: "fed-master-prometheus:9090" istio: enabled: true jaeger: