From 9f0fb12e90e4fade621fa387539e5f015fd11827 Mon Sep 17 00:00:00 2001
From: zhaozhenfang <zhaozhenfang@kylinos.cn>
Date: Thu, 15 Jun 2023 17:08:47 +0800
Subject: [PATCH] change prometheus plugin apis

---
 prometheus/web/src/api/prometheus.ts        |  6 +++---
 prometheus/web/src/components/MyEcharts.vue | 14 ++++++++++++--
 prometheus/web/src/store/charts.ts          |  4 ++--
 prometheus/web/src/store/mac.ts             |  7 ++++++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/prometheus/web/src/api/prometheus.ts b/prometheus/web/src/api/prometheus.ts
index f367fb77..fc9d44bb 100644
--- a/prometheus/web/src/api/prometheus.ts
+++ b/prometheus/web/src/api/prometheus.ts
@@ -2,7 +2,7 @@ import request from './request'
 // 获取指标列表
 export function getPromRules() {
   return request({
-    url: '/plugin/Prometheus/targets',
+    url: '/plugin/Prometheus/api/v1/targets',
     method: 'get',
   })
 }
@@ -10,7 +10,7 @@ export function getPromRules() {
 // 获取prome某一时间点的数据
 export function getPromeCurrent(data: object) {
   return request({
-    url: '/plugin/Prometheus/query',
+    url: '/plugin/Prometheus/api/v1/query',
     method: 'get',
     params: data
   })
@@ -19,7 +19,7 @@ export function getPromeCurrent(data: object) {
 // 获取prome某一时间段的数据
 export function getPromeRange(data: object) {
   return request({
-    url: '/plugin/Prometheus/query_range',
+    url: '/plugin/Prometheus/api/v1/query_range',
     method: 'get',
     params: data
   })
diff --git a/prometheus/web/src/components/MyEcharts.vue b/prometheus/web/src/components/MyEcharts.vue
index 3b9912e7..a41b5d34 100644
--- a/prometheus/web/src/components/MyEcharts.vue
+++ b/prometheus/web/src/components/MyEcharts.vue
@@ -352,10 +352,12 @@ onMounted(() => {
   if (props.query.isChart) {
     myChart.value.setOption(option.value, true)
   }
-  setTimeout(() => {
+  macIp.value = useMacStore().newIp + ':9100';
+  getPromeData(props.query);
+  /* setTimeout(() => {
     macIp.value = useMacStore().macIp;
     getPromeData(props.query);
-  }, 8)
+  }, 8) */
   window.addEventListener('resize', resize)
 })
 
@@ -389,6 +391,14 @@ watch(() => line_arr.value, (new_line_arr) => {
 }, {
   deep: true
 })
+
+watch(() => useMacStore().newIp, (new_macIp, old_macIp) => {
+  if (new_macIp) {
+    macIp.value = new_macIp + ':9100';
+    getPromeData(props.query);
+  }
+}, { deep: true })
+
 defineExpose({
   resize
 })
diff --git a/prometheus/web/src/store/charts.ts b/prometheus/web/src/store/charts.ts
index 376b0b96..9300221c 100644
--- a/prometheus/web/src/store/charts.ts
+++ b/prometheus/web/src/store/charts.ts
@@ -9,9 +9,9 @@ export const useLayoutStore = defineStore('layoutOption', {
           x: 0, y: 0, w: 1, h: 4, i: '0',
           static: true, display: true, title: '运行时间',
           query: {
-            sqls: [{ sql: '(time()-node_boot_time_seconds{instance="{macIp}"})/(60*60)' }],
+            sqls: [{ sql: '(time()-node_boot_time_seconds{instance="{macIp}"})/(60*60*24)' }],
             type: 'value', range: false, isValue: true, interval: 5,
-            target: 'value_series', unit: 'h', float: 2
+            target: 'value_series', unit: '天', float: 2
           }
         },
         {
diff --git a/prometheus/web/src/store/mac.ts b/prometheus/web/src/store/mac.ts
index 12f18acb..3940b1a9 100644
--- a/prometheus/web/src/store/mac.ts
+++ b/prometheus/web/src/store/mac.ts
@@ -6,10 +6,15 @@ export const useMacStore = defineStore('mac', {
       macIp: '',
     };
   },
-  getters: {},
+  getters: {
+    newIp(state) {
+      return state.macIp.length > 0 ? state.macIp.split(':')[0] : '';
+    },
+  },
   actions: {
     setMacIp(ip: string) {
       this.macIp = ip;
+      this.newIp;
     }
   }
 });
-- 
Gitee