fix: correct real-time QPS calculation at the index level (#172)

* fix: correct real-time QPS calculation at the index level in agentless mode

* chore: update release notes

Author: silenceqi

docs/content.en/docs/release-notes/_index.md

@@ -11,6 +11,7 @@ Information about release notes of INFINI Console is provided here.
 ### Breaking changes  
 ### Features  
 ### Bug fix  
+- Fixed incorrect real-time QPS calculation at the index level in agentless mode (#172)
 ### Improvements  
 
 ## 1.29.0 (2025-02-27)

docs/content.zh/docs/release-notes/_index.md

@@ -11,6 +11,7 @@ title: "版本历史"
 ### Breaking changes  
 ### Features  
 ### Bug fix  
+- 修复 agentless 模式下计算索引级别实时 qps 不准确的问题 (#172)
 ### Improvements  
 
 ## 1.29.0 (2025-02-27)

modules/elastic/api/cluster_overview.go

@@ -28,6 +28,7 @@ import (
 	"errors"
 	"fmt"
 	cerr "infini.sh/console/core/errors"
+	v1 "infini.sh/console/modules/elastic/api/v1"
 	"infini.sh/framework/modules/elastic/adapter"
 	"net/http"
 	"strings"
@@ -727,7 +728,12 @@ func (h *APIHandler) GetRealtimeClusterNodes(w http.ResponseWriter, req *http.Re
 			shardCounts[shardInfo.NodeName] = 1
 		}
 	}
-	qps, err := h.getNodeQPS(id, 20)
+	minBucketSize, err := v1.GetMetricMinBucketSize(id, v1.MetricTypeNodeStats)
+	if err != nil {
+		h.WriteJSON(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	qps, err := h.getNodeQPS(id, minBucketSize)
 	if err != nil {
 		h.WriteJSON(w, util.MapStr{
 			"error": err.Error(),
@@ -1176,7 +1182,7 @@ func (h *APIHandler) getNodeQPS(clusterID string, bucketSizeInSeconds int) (map[
 					{
 						"range": util.MapStr{
 							"timestamp": util.MapStr{
-								"gte": "now-1m",
+								"gte": fmt.Sprintf("now-1%ds", bucketSizeInSeconds),
 								"lte": "now",
 							},
 						},
@@ -1414,6 +1420,7 @@ func (h *APIHandler) getClusterMonitorState(w http.ResponseWriter, req *http.Req
 		}
 
 	}
+	ret["request"] = string(dsl)
 	h.WriteJSON(w, ret, http.StatusOK)
 }
 

modules/elastic/api/v1/cluster_overview.go

@@ -631,7 +631,13 @@ func (h *APIHandler) GetRealtimeClusterIndices(w http.ResponseWriter, req *http.
 		indexInfos = &filterIndices
 	}
 
-	qps, err := h.getIndexQPS(id, 20)
+	minBucketSize, err := GetMetricMinBucketSize(id, MetricTypeIndexStats)
+	if err != nil {
+		resBody["error"] = err.Error()
+		h.WriteJSON(w, resBody, http.StatusInternalServerError)
+		return
+	}
+	qps, err := h.getIndexQPS(id, minBucketSize)
 	if err != nil {
 		resBody["error"] = err.Error()
 		h.WriteJSON(w, resBody, http.StatusInternalServerError)
@@ -685,7 +691,7 @@ func (h *APIHandler) getIndexQPS(clusterID string, bucketSizeInSeconds int) (map
 					"date": util.MapStr{
 						"date_histogram": util.MapStr{
 							"field":       "timestamp",
-							intervalField: "10s",
+							intervalField: bucketSizeStr,
 						},
 						"aggs": util.MapStr{
 							"index_total": util.MapStr{
@@ -729,7 +735,7 @@ func (h *APIHandler) getIndexQPS(clusterID string, bucketSizeInSeconds int) (map
 					{
 						"range": util.MapStr{
 							"timestamp": util.MapStr{
-								"gte": "now-1m",
+								"gte": fmt.Sprintf("now-%ds", bucketSizeInSeconds*5),
 								"lte": "now",
 							},
 						},