create metricinfo

traas-stack · Aug 2, 2023 · 0c84cad · 0c84cad
1 parent f5afb33
commit 0c84cad
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 7 deletions.
diff --git a/...r/common/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/MetricInfo.java b/...r/common/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/MetricInfo.java
@@ -50,6 +50,8 @@ public class MetricInfo {
 
   public boolean deleted;
 
+  public String storageTenant;
+
   @TableField(value = "`gmt_create`")
   public Date gmtCreate;
 

diff --git a/...n/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/dto/MetricInfoDTO.java b/...n/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/dto/MetricInfoDTO.java
@@ -45,6 +45,8 @@ public class MetricInfoDTO {
   public String ref;
   public String extInfo;
 
+  public String storageTenant;
+
   public Date gmtCreate;
 
   public Date gmtModified;

diff --git a/...nsion-common-flyway/src/main/resources/db/migration/V14__230801_ADD_metricinfo_COLUMN.sql b/...nsion-common-flyway/src/main/resources/db/migration/V14__230801_ADD_metricinfo_COLUMN.sql
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
+ */
+
+-- ----------------------------
+-- Table structure for metric_info
+-- ----------------------------
+ALTER TABLE `metric_info`
+    ADD COLUMN `storage_tenant` VARCHAR(200) NULL AFTER `ext_info`;
diff --git a/...home-task/src/main/java/io/holoinsight/server/home/task/AbstractMetricCrawlerBuilder.java b/...home-task/src/main/java/io/holoinsight/server/home/task/AbstractMetricCrawlerBuilder.java
@@ -40,7 +40,8 @@ public List<MetricInfo> buildEntity(IntegrationProductDTO integrationProduct) {
       if (!CollectionUtils.isEmpty(model.getMetricInfoList())) {
         metricInfoList.addAll(model.getMetricInfoList());
       }
-      List<MetricInfo> list = getMetricInfoList(model.getMetric(), model.getTags());
+      List<MetricInfo> list =
+          getMetricInfoList(model.getMetric(), model.getTags(), model.getMetricInfoTemplate());
       if (!CollectionUtils.isEmpty(list)) {
         metricInfoList.addAll(list);
       }
@@ -50,7 +51,8 @@ public List<MetricInfo> buildEntity(IntegrationProductDTO integrationProduct) {
     return metricInfoList;
   }
 
-  protected abstract List<MetricInfo> getMetricInfoList(String metric, List<String> tags);
+  protected abstract List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate);
 
 
   public List<MetricInfoModel> getMetricInfoModel(String product) {
@@ -68,6 +70,7 @@ public static class MetricInfoModel {
     public String metric;
     public List<String> tags = new ArrayList<>();
     public List<MetricInfo> metricInfoList = new ArrayList<>();
+    public MetricInfo metricInfoTemplate;
   }
 
   public MetricInfo genMetricInfo(String tenant, String workspace, String organization,

diff --git a/...e-task/src/main/java/io/holoinsight/server/home/task/crawler/ApmMetricCrawlerBuilder.java b/...e-task/src/main/java/io/holoinsight/server/home/task/crawler/ApmMetricCrawlerBuilder.java
@@ -84,7 +84,8 @@ public List<MetricInfo> buildEntity(IntegrationProductDTO integrationProduct) {
   }
 
   @Override
-  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags) {
+  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate) {
     return null;
   }
 }
diff --git a/...e-task/src/main/java/io/holoinsight/server/home/task/crawler/JvmMetricCrawlerBuilder.java b/...e-task/src/main/java/io/holoinsight/server/home/task/crawler/JvmMetricCrawlerBuilder.java
@@ -29,7 +29,8 @@
 public class JvmMetricCrawlerBuilder extends AbstractMetricCrawlerBuilder {
 
   @Override
-  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags) {
+  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate) {
     List<MetricInfo> metricInfoList = new ArrayList<>();
 
     metricInfoList.add(genMetricInfo(GLOBAL_TENANT, GLOBAL_WORKSPACE, GLOBAL_ORGANIZATION, "jvm",

diff --git a/...task/src/main/java/io/holoinsight/server/home/task/crawler/MysqlMetricCrawlerBuilder.java b/...task/src/main/java/io/holoinsight/server/home/task/crawler/MysqlMetricCrawlerBuilder.java
@@ -33,7 +33,8 @@
 @MetricCrawler(code = "io.holoinsight.plugin.MysqlPlugin")
 public class MysqlMetricCrawlerBuilder extends AbstractMetricCrawlerBuilder {
   @Override
-  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags) {
+  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate) {
 
     List<MetricInfo> metricInfoList = new ArrayList<>();
     Map<String, List<IntegrationMetricDTO>> listMap = J.fromJson(metricData,

diff --git a/.../src/main/java/io/holoinsight/server/home/task/crawler/PortCheckMetricCrawlerBuilder.java b/.../src/main/java/io/holoinsight/server/home/task/crawler/PortCheckMetricCrawlerBuilder.java
@@ -28,7 +28,8 @@
 public class PortCheckMetricCrawlerBuilder extends AbstractMetricCrawlerBuilder {
 
   @Override
-  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags) {
+  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate) {
     List<MetricInfo> metricInfoList = new ArrayList<>();
 
     metricInfoList.add(genMetricInfo(GLOBAL_TENANT, GLOBAL_WORKSPACE, GLOBAL_ORGANIZATION,

diff --git a/...ask/src/main/java/io/holoinsight/server/home/task/crawler/SystemMetricCrawlerBuilder.java b/...ask/src/main/java/io/holoinsight/server/home/task/crawler/SystemMetricCrawlerBuilder.java
@@ -25,7 +25,8 @@
 public class SystemMetricCrawlerBuilder extends AbstractMetricCrawlerBuilder {
 
   @Override
-  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags) {
+  protected List<MetricInfo> getMetricInfoList(String metric, List<String> tags,
+      MetricInfo metricInfoTemplate) {
     List<MetricInfo> metricInfoList = new ArrayList<>();
     metricInfoList.add(genMetricInfo(GLOBAL_TENANT, GLOBAL_WORKSPACE, GLOBAL_ORGANIZATION, "system",
         "CPU", "cpu_util", "k8s_pod_cpu_util", "cpu 使用率", PERCENT_UNIT, 60, tags));