From ce14d82406c039935ae18d4929e32c0538ee6be9 Mon Sep 17 00:00:00 2001
From: liugq <silenceqi@hotmail.com>
Date: Thu, 8 Jun 2023 10:43:30 +0800
Subject: [PATCH] get metric data with root agg timestamp

---
 plugin/api/insight/metadata.go    | 2 +-
 plugin/api/insight/metric_util.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/api/insight/metadata.go b/plugin/api/insight/metadata.go
index 8178aebb..63b25c06 100644
--- a/plugin/api/insight/metadata.go
+++ b/plugin/api/insight/metadata.go
@@ -214,7 +214,7 @@ func getMetricData(metric *insight.Metric) (interface{}, error) {
 			agg = aggM["filter_agg"]
 		}
 	}
-	metricData := CollectMetricData(agg, metric.TimeBeforeGroup)
+	metricData := CollectMetricData(agg, true)
 
 	var targetMetricData []insight.MetricData
 	formula := strings.TrimSpace(metric.Formula)
diff --git a/plugin/api/insight/metric_util.go b/plugin/api/insight/metric_util.go
index 5290b4c4..34dee336 100644
--- a/plugin/api/insight/metric_util.go
+++ b/plugin/api/insight/metric_util.go
@@ -79,7 +79,7 @@ func generateAgg(metricItem *insight.MetricItem, timeField string) map[string]in
 }
 
 func GenerateQuery(metric *insight.Metric) (interface{}, error) {
-	var timeBeforeGroup = metric.TimeBeforeGroup
+	var timeBeforeGroup = true
 	basicAggs := util.MapStr{}
 	i := 0
 	for _, metricItem := range metric.Items {