From a9d6f2ab8587dec8d9c1508ceebafd3eb4516a4a Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Mon, 9 Sep 2024 16:23:31 +0800
Subject: [PATCH] Add `Service`, `ServiceInstance`, `Endpoint` dashboard
 forwarder to Kubernetes Topologies. (#12604)

---
 docs/en/changes/changes.md                        |  1 +
 .../k8s_service/k8s-service-root.json             |  8 ++++++++
 .../k8s_service/k8s-service-service.json          | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index ae5da74bdf..4528f00471 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -77,6 +77,7 @@
 * Add a loading view for initialization page.
 * Fix a bug for selectors when clicking the refresh icon.
 * Fix health check to OAP backend.
+* Add `Service`, `ServiceInstance`, `Endpoint` dashboard forwarder to Kubernetes Topologies. 
 
 #### Documentation
 
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
index 96fab9635f..43d1d57f95 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
@@ -94,9 +94,17 @@
                   },
                   "linkDashboard": "K8S-Service-Relation",
                   "nodeDashboard": [
+                    {
+                      "scope": "Service",
+                      "dashboard": "K8S-Service-Service"
+                    },
                     {
                       "scope": "Endpoint",
                       "dashboard": "K8S-Endpoint"
+                    },
+                    {
+                      "scope": "ServiceInstance",
+                      "dashboard": "K8S-Service-Pods"
                     }
                   ],
                   "nodeMetrics": [],
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
index 30336c9f3c..5aaf3657ce 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
@@ -214,7 +214,20 @@
                     "showDepth": true
                   },
                   "linkDashboard": "K8S-Service-Relation",
-                  "nodeDashboard": [],
+                  "nodeDashboard": [
+                    {
+                      "scope": "Service",
+                      "dashboard": "K8S-Service-Service"
+                    },
+                    {
+                      "scope": "Endpoint",
+                      "dashboard": "K8S-Endpoint"
+                    },
+                    {
+                      "scope": "ServiceInstance",
+                      "dashboard": "K8S-Service-Pods"
+                    }
+                  ],
                   "nodeMetrics": [],
                   "linkServerExpressions": [
                     "avg(kubernetes_service_relation_server_write_package_size)/60",