From c8a07350a1b6b953e5c607f4633f4db8c1ef9f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E5=8B=87=E8=92=BF=40fyh01789115?= Date: Thu, 4 Jul 2024 14:07:21 +0800 Subject: [PATCH 1/3] Fixed a bug where clicking on a link resulted in incorrect redirection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯勇蒿@fyh01789115 --- deploy/helm/lunettes/templates/grafana/grafana-cm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml index 9443ba29..788031a6 100644 --- a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml +++ b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml @@ -672,7 +672,7 @@ data: { "targetBlank": true, "title": "yaml", - "url": "/d/podyamllinks/podyaml?orgId=1&var-uid=${__data.fields[\"PodUID\"]}" + "url": "/d/podyamllinks/podyaml?var-uid=${__data.fields[\"PodUID\"]}" } ] }, @@ -697,7 +697,7 @@ data: { "targetBlank": true, "title": "NodeYaml", - "url": "/d/nodeyamllinks/nodeyaml?orgId=1&var-nodeName=${__data.fields[\"NodeName\"]}" + "url": "/d/nodeyamllinks/nodeyaml?var-nodeName=${__data.fields[\"NodeName\"]}" } ] }, @@ -2609,7 +2609,7 @@ data: { "targetBlank": true, "title": "Pod信息", - "url": "\r\nhttp://lunettes.lunettes.svc.cluster.local:8080/api/v1/debugpod?uid=${__data.fields.PodUid}" + "url": "\r\nd/lunettes-debugpod/lunettes-debugpod?var-podinfo=uid&var-podinfovalue=${__data.fields.PodUid}" } ] } From 51c38512ad47a4374cf3055d19c5db1dbbc6fc3e Mon Sep 17 00:00:00 2001 From: LLKCoder <15971849849@163.com> Date: Mon, 8 Jul 2024 10:59:14 +0800 Subject: [PATCH 2/3] remove no used new line character, unify the format of grafana data --- deploy/helm/lunettes/templates/grafana/grafana-cm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml index 788031a6..fac34184 100644 --- a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml +++ b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml @@ -697,7 +697,7 @@ data: { "targetBlank": true, "title": "NodeYaml", - "url": "/d/nodeyamllinks/nodeyaml?var-nodeName=${__data.fields[\"NodeName\"]}" + "url": "/d/nodeyamllinks/nodeyaml?var-nodeName=${__data.fields.NodeName}" } ] }, @@ -2609,7 +2609,7 @@ data: { "targetBlank": true, "title": "Pod信息", - "url": "\r\nd/lunettes-debugpod/lunettes-debugpod?var-podinfo=uid&var-podinfovalue=${__data.fields.PodUid}" + "url": "d/lunettes-debugpod/lunettes-debugpod?var-podinfo=uid&var-podinfovalue=${__data.fields.PodUid}" } ] } From 3b8a909ec14892722927f7e6484e454cac5ccb39 Mon Sep 17 00:00:00 2001 From: LLKCoder <15971849849@163.com> Date: Tue, 9 Jul 2024 10:22:48 +0800 Subject: [PATCH 3/3] Uniform variable format. Signed-off-by: LLKCoder <15971849849@163.com> --- deploy/helm/lunettes/templates/grafana/grafana-cm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml index fac34184..63c838a2 100644 --- a/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml +++ b/deploy/helm/lunettes/templates/grafana/grafana-cm.yaml @@ -672,7 +672,7 @@ data: { "targetBlank": true, "title": "yaml", - "url": "/d/podyamllinks/podyaml?var-uid=${__data.fields[\"PodUID\"]}" + "url": "/d/podyamllinks/podyaml?var-uid=${__data.fields.PodUID}" } ] },