From 1ee6c59d2c70bafc8568e96b24807d211a54fbdc Mon Sep 17 00:00:00 2001
From: silenceqi <silenceqi@hotmail.com>
Date: Thu, 13 Feb 2025 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20missing=20data=20when=20processing=20mul?=
 =?UTF-8?q?tiple=20time=20series=20in=20a=20g=E2=80=A6=20(#127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: address missing data when processing multiple time series in a group with insight data API

* chore: update release notes
---
 docs/content.en/docs/release-notes/_index.md |  1 +
 docs/content.zh/docs/release-notes/_index.md |  1 +
 plugin/api/insight/metadata.go               | 30 ++++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
index c7a39498..23067613 100644
--- a/docs/content.en/docs/release-notes/_index.md
+++ b/docs/content.en/docs/release-notes/_index.md
@@ -15,6 +15,7 @@ Information about release notes of INFINI Console is provided here.
 - Support alerts based on bucket diff state (#119)
 
 ### Bug fix
+- Fixed missing data when processing multiple time series in a group with insight data API (#127)
 
 ### Improvements
 
diff --git a/docs/content.zh/docs/release-notes/_index.md b/docs/content.zh/docs/release-notes/_index.md
index 21efd2a5..739af61c 100644
--- a/docs/content.zh/docs/release-notes/_index.md
+++ b/docs/content.zh/docs/release-notes/_index.md
@@ -14,6 +14,7 @@ title: "版本历史"
 ### Features
 - 告警功能支持根据桶之间文档数差值和内容差异告警 (#119)
 ### Bug fix
+- 修复 Insight API 处理多时间序列数据时数据丢失的问题 (#127)
 
 ### Improvements
 
diff --git a/plugin/api/insight/metadata.go b/plugin/api/insight/metadata.go
index 93c83d1c..9a27a530 100644
--- a/plugin/api/insight/metadata.go
+++ b/plugin/api/insight/metadata.go
@@ -296,7 +296,11 @@ func getMetricData(metric *insight.Metric) (interface{}, error) {
 				Groups: md.Groups,
 				Data:   map[string][]insight.MetricDataItem{},
 			}
-			retMetricDataItem := insight.MetricDataItem{}
+			//merge metric data by timestamp
+			var timeMetricData = map[interface{}]*insight.MetricDataItem{}
+			//non time series data
+			grpMetricData := &insight.MetricDataItem{}
+			isTimeSeries := false
 			for _, formula = range metric.Formulas {
 				tpl, err := template.New("insight_formula").Parse(formula)
 				if err != nil {
@@ -347,6 +351,19 @@ func getMetricData(metric *insight.Metric) (interface{}, error) {
 							continue
 						}
 					}
+					var retMetricDataItem *insight.MetricDataItem
+					//time series data
+					if timestamp != nil {
+						isTimeSeries = true
+						if v, ok := timeMetricData[timestamp]; !ok {
+							retMetricDataItem = &insight.MetricDataItem{}
+						} else {
+							retMetricDataItem = v
+						}
+					} else {
+						//non time series data
+						retMetricDataItem = grpMetricData
+					}
 					retMetricDataItem.Timestamp = timestamp
 					if len(metric.Formulas) <= 1 && metric.Formula != "" {
 						//support older versions by returning the result for a single formula.
@@ -358,9 +375,18 @@ func getMetricData(metric *insight.Metric) (interface{}, error) {
 							retMetricDataItem.Value = map[string]interface{}{formula: result}
 						}
 					}
+					if timestamp != nil {
+						timeMetricData[timestamp] = retMetricDataItem
+					}
+				}
+			}
+			if !isTimeSeries {
+				targetData.Data["result"] = append(targetData.Data["result"], *grpMetricData)
+			} else {
+				for _, v := range timeMetricData {
+					targetData.Data["result"] = append(targetData.Data["result"], *v)
 				}
 			}
-			targetData.Data["result"] = append(targetData.Data["result"], retMetricDataItem)
 			targetMetricData = append(targetMetricData, targetData)
 		}
 	}