From 0ff5314d1e2bab641b83b79d9a757fea72cbb498 Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Thu, 18 Jul 2024 16:27:04 +0800
Subject: [PATCH] web: modify node connector; modify elk search template aggs
 field

---
 web/src/components/PGTopo.vue    | 6 +++---
 web/src/views/nodeDetail.vue     | 6 +++---
 web/src/views/topoLogs/index.vue | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/src/components/PGTopo.vue b/web/src/components/PGTopo.vue
index 6950504..3dd55a9 100644
--- a/web/src/components/PGTopo.vue
+++ b/web/src/components/PGTopo.vue
@@ -89,11 +89,11 @@ const updateTopoData = (topoData: any) => {
         // item.label = item.Type;
         break;
       case "tcp":
-        // item.label = item.id.split("__")[1];
+        // item.label = item.id.split("_._._")[1];
         item.label = item.Type;
         break;
       case "udp":
-        // item.label = item.id.split("__")[1];
+        // item.label = item.id.split("_._._")[1];
         item.label = item.Type;
         break;
     }
@@ -107,7 +107,7 @@ const updateTopoData = (topoData: any) => {
         item.type = "image";
         item.size = 40;
         item.nodeStrength = -200;
-        item.label = item.id.split("_").pop();
+        item.label = item.id.split("_._").pop();
         item.style = {
           cursor: "all-scroll"
         };
diff --git a/web/src/views/nodeDetail.vue b/web/src/views/nodeDetail.vue
index 2a2b1c3..9150a4f 100644
--- a/web/src/views/nodeDetail.vue
+++ b/web/src/views/nodeDetail.vue
@@ -139,7 +139,7 @@ watch(() => useTopoStore().nodeData, (new_node_data, _old_node_data) => {
     // 是否是host类型
     if (node_data.Type === 'host') {
       isHost.value = true;
-      useMacStore().setMacIp(node_data.id.split("_")[2]);
+      useMacStore().setMacIp(node_data.id.split("_._")[2]);
     }
     node_or_edge.name = node_data.label || node_data.name;
     node_or_edge.type = node_data.Type;
@@ -166,9 +166,9 @@ watch(() => useTopoStore().edgeData, (new_edge_data, _old_edge_data) => {
     // 是否是host类型
     // if (node_data.Type === 'host') {
     //   isHost.value = true;
-    //   useMacStore().setMacIp(node_data.id.split("_")[2]);
+    //   useMacStore().setMacIp(node_data.id.split("_._")[2]);
     // }
-    node_or_edge.name = edge_data.id.split("__")[1];
+    node_or_edge.name = edge_data.id.split("_._._")[1];
     node_or_edge.type = edge_data.Type;
     tags = edge_data.tags;
     table_data = [];
diff --git a/web/src/views/topoLogs/index.vue b/web/src/views/topoLogs/index.vue
index 95c7aad..a2827cc 100644
--- a/web/src/views/topoLogs/index.vue
+++ b/web/src/views/topoLogs/index.vue
@@ -117,7 +117,7 @@ const handleParams = (_params?: any) => {
       queryfield_datastream_dataset: "system.syslog",
       queryfield_range_gte: 1719226716185,
       queryfield_range_lte: 1719226836185,
-      aggsfield: "host.hostname",
+      aggsfield: "agent.hostname",
       size: 0,
       fixed_interval: "5s",
     }
-- 
Gitee