From 15dd6771238adf71df870d5c70ab61d5d446761c Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 25 Oct 2023 15:17:16 +0800
Subject: [PATCH 1/7] =?UTF-8?q?NEZ-3256=20feat=EF=BC=9ALicense=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=A1=A8=E6=A0=BC=E5=A2=9E=E5=8A=A0=20hostname=20?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/page/config/system/license.vue | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue
index cbc79df5e..61d4041f1 100644
--- a/nezha-fronted/src/components/page/config/system/license.vue
+++ b/nezha-fronted/src/components/page/config/system/license.vue
@@ -75,10 +75,16 @@
               <span class="data-column__span">{{item.label}} <i class="nz-icon nz-icon-label" v-if="item.type==='label'"/></span>
             </template>
             <template slot-scope="scope" :column="item">
-              <template v-if="item.prop === 'devicesName'">
+              <!-- hostname -->
+              <template v-if="item.prop === 'hostname'">
+                <span>{{scope.row.hostname}}</span>
+              </template>
+              <!-- ip -->
+              <template v-if="item.prop === 'ip'">
                 <span>{{getLicense(scope.row)}}</span>
               </template>
-              <template v-else-if="item.prop === 'status'">
+              <!-- state -->
+              <template v-else-if="item.prop === 'state'">
                 <div v-if="scope.row.status === 0">
                   <div class="active-icon green-bg inline-block"></div> {{ $t('overall.active') }}
                 </div>
@@ -178,12 +184,16 @@ export default {
       tableData: [],
       tableTitle: [
         {
-          label: this.$t('asset.server'),
-          prop: 'devicesName'
+          label: this.$t('license.hostname'),
+          prop: 'hostname'
+        },
+        {
+          label: 'IP:port',
+          prop: 'ip'
         },
         {
           label: this.$t('overall.state'),
-          prop: 'status'
+          prop: 'state'
         }
       ],
       expData: {},

From ba2ff962db53e88f1b321676517a46b434168353 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 25 Oct 2023 15:42:37 +0800
Subject: [PATCH 2/7] =?UTF-8?q?NEZ-3260=20fix=EF=BC=9AAgent=E4=B8=ADScrape?=
 =?UTF-8?q?=20duration=E6=82=AC=E6=B5=AE=E6=A1=86=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/table/settings/scrapeEndpointTable.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
index 60596e10d..9a273f024 100644
--- a/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/scrapeEndpointTable.vue
@@ -70,8 +70,8 @@
       <template v-else-if="item.prop === 'lastScrapeDuration'">
         <el-tooltip effect="light" placement="right">
           <div slot="content">
-            <div><span>Interval:&nbsp;</span>{{ scope.row.discoveredLabels._scrape_interval_ ? scope.row.discoveredLabels._scrape_interval_ + 's' : '0s' }}</div>
-            <div><span>Timeout:&nbsp;</span>{{ scope.row.discoveredLabels._scrape_timeout_ ? scope.row.discoveredLabels._scrape_timeout_ + 's' : '0s'}}</div>
+            <div><span>Interval:&nbsp;</span>{{ scope.row.discoveredLabels.__scrape_interval__ ? scope.row.discoveredLabels.__scrape_interval__ : '0s' }}</div>
+            <div><span>Timeout:&nbsp;</span>{{ scope.row.discoveredLabels.__scrape_timeout__ ? scope.row.discoveredLabels.__scrape_timeout__  : '0s'}}</div>
           </div>
           <span>{{ scope.row.lastScrapeDuration }}</span>
         </el-tooltip>

From 073156e8d718b2a2c550f4f10710ba9fea638b47 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 25 Oct 2023 16:09:55 +0800
Subject: [PATCH 3/7] =?UTF-8?q?NEZ-3264=20=20fix=EF=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=20Agents=20=E8=AF=A6=E6=83=85=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/cortexDetail.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue
index cd109ff48..4c7b7675a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue
@@ -54,8 +54,10 @@ export default {
       async handler (n) {
         this.loading = true
         this.getReadyTableData().then(res => {
+          this.ringTableData = []
           this.getTableData()
         }).catch(res => {
+          this.ringTableData = []
           this.ringTableData.push([])
           this.$refs.loading.endLoading()
           this.loading = false
@@ -80,6 +82,7 @@ export default {
   },
   methods: {
     async getTableData () {
+      this.servicesTableData = []
       await this.getCompactorTableData()
       await this.getservicesTableData()
       await this.getIngesterTableData()

From 9800496e9baa1f1fc5d2bb09648b1f2a6cfda04b Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 25 Oct 2023 16:50:05 +0800
Subject: [PATCH 4/7] =?UTF-8?q?NEZ-3263=20fix=EF=BC=9AChart=20tooltip=20?=
 =?UTF-8?q?=E6=9C=AA=E6=8C=89=E7=85=A7=E9=85=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/chart/chart/chartTimeSeries.vue   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 3c582e027..c42c01664 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -684,7 +684,7 @@ export default {
     },
     chartClick (params) {
       // 先取消多表联动 防止其它图表setOption
-      if (this.isConnect !== 'none') {
+      if (this.isConnect && this.isConnect !== 'none') {
         echarts.disconnect('timeSeriesGroup')
       }
       getChart(this.chartId).dispatchAction({
@@ -740,7 +740,7 @@ export default {
       this.toolbox.clickIndex = params.seriesIndex
       const e = params.event.event
       this.toolboxPosition(e)
-      if (this.isConnect !== 'none') {
+      if (this.isConnect && this.isConnect !== 'none') {
         echarts.connect('timeSeriesGroup')
       }
     },
@@ -748,7 +748,7 @@ export default {
       this.toolbox.show = false
     },
     showSelectedSeries () {
-      if (this.isConnect !== 'none') {
+      if (this.isConnect && this.isConnect !== 'none') {
         echarts.disconnect('timeSeriesGroup')
       }
 
@@ -768,13 +768,13 @@ export default {
 
       this.isGrey = this.isGrey.map((g, i) => i !== this.toolbox.clickIndex)
       this.$refs.legend.isGrey = this.isGrey
-      if (this.isConnect !== 'none') {
-        echarts.disconnect('timeSeriesGroup')
+      if (this.isConnect && this.isConnect !== 'none') {
+        echarts.connect('timeSeriesGroup')
       }
       this.clickout()
     },
     showAllSeries () {
-      if (this.isConnect !== 'none') {
+      if (this.isConnect && this.isConnect !== 'none') {
         echarts.disconnect('timeSeriesGroup')
       }
       getChart(this.chartId).dispatchAction({
@@ -782,8 +782,8 @@ export default {
       })
       this.isGrey = this.isGrey.map(() => false)
       this.$refs.legend.isGrey = this.isGrey
-      if (this.isConnect !== 'none') {
-        echarts.disconnect('timeSeriesGroup')
+      if (this.isConnect && this.isConnect !== 'none') {
+        echarts.connect('timeSeriesGroup')
       }
       this.clickout()
     }

From b65707de8f42ba9ebf0fa5e44a30beedbc935239 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 26 Oct 2023 10:08:45 +0800
Subject: [PATCH 5/7] =?UTF-8?q?NEZ-3272=20fix=EF=BC=9A=E4=BF=AE=E5=A4=8Den?=
 =?UTF-8?q?dpoint=20=E9=80=89=E4=B8=ADlog=E5=90=8E=20=E5=88=87=E6=8D=A2=20?=
 =?UTF-8?q?endpoint=20=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/logBottomTab.vue         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 1fd1c6118..cb5afe849 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -85,6 +85,20 @@ export default {
       return this.$store.getters.getTimePickerRange
     }
   },
+  watch: {
+    obj: {
+      immediate: false,
+      deep: true,
+      handler (n) {
+        if (this.from === fromRoute.endpoint) {
+          this.expressions = [`{project="${this.obj.project.name}",module="${this.obj.module.name}",endpoint="${this.obj.name}"}`]
+        } else if (this.from === fromRoute.asset) {
+          this.expressions = [`{asset="${this.obj.name}"}`]
+        }
+        this.queryLogData()
+      }
+    }
+  },
   methods: {
     exportLog ({ limit, descending }) {
       const params = {

From c954fa03c3ed1b34af037c89f2f11cdc619db9de Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 26 Oct 2023 10:31:01 +0800
Subject: [PATCH 6/7] =?UTF-8?q?NEZ-3266=20fix=EF=BC=9ADashboard=E4=B8=AD,?=
 =?UTF-8?q?=E5=9C=A8=E4=BB=AA=E8=A1=A8=E7=9B=98=E8=A7=A3=E9=94=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD=E5=9B=BE?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=A4=A7=E5=B0=8F=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartAutotopology.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index 6c9a11b1f..a85e7c254 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -134,7 +134,7 @@ export default {
     },
     resize () {
       this.allProject.forEach((item, index) => {
-        this.$refs['topology' + index][0] && this.$refs['topology' + index][0].topoResize()
+        this.$refs['topology' + index] && this.$refs['topology' + index][0] && this.$refs['topology' + index][0].topoResize('autoTopology' + item.id + (this.isFullscreen ? 'screen' : ''))
       })
     }
   },

From aa43f25d931234a06abd8abab0c029cfa02b22c6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 26 Oct 2023 10:48:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=88=90=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/licenseManagementTab.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
index 0c0fc399b..96b7ce1f7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/licenseManagementTab.vue
@@ -206,7 +206,7 @@ export default {
       form.append('saId', this.obj.id)
       const res = await this.$post('/license/uploadV2C', form, { 'Content-Type': 'multipart/form-data' })
       if (res.code === 200) {
-        this.$message.success()
+        this.$message.success(this.$t('tip.uploadSuccess'))
       } else {
         this.$message.error(res.msg)
       }