fix log sample query

traas-stack · Aug 11, 2023 · 6341796 · 6341796
1 parent 427639d
commit 6341796
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...-alert/src/main/java/io/holoinsight/server/home/alert/plugin/AlertSaveHistoryHandler.java b/...-alert/src/main/java/io/holoinsight/server/home/alert/plugin/AlertSaveHistoryHandler.java
@@ -43,6 +43,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static io.holoinsight.server.home.alert.service.data.load.RuleAlarmLoadData.filterConvert;
+
 /**
  * @author wangsiyuan
  * @date 2022/3/28 9:32 下午
@@ -258,9 +260,9 @@ private QueryProto.Datasource buildSampleDatasource(DataSource dataSource, Trigg
     long end = TimeRangeUtil.getEndTimestamp(alarmTime, dataSource);
     String metric = dataSource.getMetric() + "_logsamples";
 
-    QueryProto.Datasource.Builder builder =
-        QueryProto.Datasource.newBuilder().setStart(start).setEnd(end).setMetric(metric)
-            .setAggregator("sample").addAllGroupBy(Collections.singletonList("app"));
+    QueryProto.Datasource.Builder builder = QueryProto.Datasource.newBuilder().setStart(start)
+        .setEnd(end).setMetric(metric).addAllFilters(filterConvert(dataSource.getFilters()))
+        .setAggregator("sample").addAllGroupBy(Collections.singletonList("app"));
     return builder.build();
   }
 

diff --git a/...t/src/main/java/io/holoinsight/server/home/alert/service/data/load/RuleAlarmLoadData.java b/...t/src/main/java/io/holoinsight/server/home/alert/service/data/load/RuleAlarmLoadData.java
@@ -22,13 +22,9 @@
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author wangsiyuan
@@ -166,7 +162,7 @@ private long parseTime(String downsample) {
     return Long.parseLong(timeStr.substring(0, timeStr.length() - 1));
   }
 
-  private List<QueryProto.QueryFilter> filterConvert(List<Filter> filters) {
+  public static List<QueryProto.QueryFilter> filterConvert(List<Filter> filters) {
     if (filters == null) {
       return new ArrayList<>();
     }