fix currentPage

aliyun · Jan 13, 2025 · e5a2935 · e5a2935
1 parent 62491f1
commit e5a2935
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 2.37 (2025-01-13)
+
+- 修复 grafana 内部初始化 currentPage 的问题。
+
 # 2.36 (2024-11-25)
 
 - 支持 v4 签名，提供更高的安全性。

diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 2.37 (2025-01-13)
+
+- 修复 grafana 内部初始化 currentPage 的问题。
+
 # 2.36 (2024-11-25)
 
 - 支持 v4 签名，提供更高的安全性。

diff --git a/dist/gpx_log-service-datasource_darwin_amd64 b/dist/gpx_log-service-datasource_darwin_amd64
diff --git a/dist/gpx_log-service-datasource_darwin_arm64 b/dist/gpx_log-service-datasource_darwin_arm64
diff --git a/dist/gpx_log-service-datasource_linux_amd64 b/dist/gpx_log-service-datasource_linux_amd64
diff --git a/dist/gpx_log-service-datasource_linux_arm b/dist/gpx_log-service-datasource_linux_arm
diff --git a/dist/gpx_log-service-datasource_linux_arm64 b/dist/gpx_log-service-datasource_linux_arm64
diff --git a/dist/gpx_log-service-datasource_windows_amd64.exe b/dist/gpx_log-service-datasource_windows_amd64.exe
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -37,8 +37,8 @@
       }
     ],
     "screenshots": [],
-    "version": "2.36",
-    "updated": "2024-11-26"
+    "version": "2.37",
+    "updated": "2025-01-13"
   },
   "dependencies": {
     "grafanaDependency": ">=7.0.0",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aliyun-log-service-datasource",
-  "version": "2.36",
+  "version": "2.37",
   "description": "Aliyun log service datasource (backend version)",
   "scripts": {
     "build": "grafana-toolkit plugin:build && mage",

diff --git a/pkg/sls-plugin.go b/pkg/sls-plugin.go
@@ -316,7 +316,11 @@ func (ds *SlsDatasource) QueryLogs(ch chan Result, query backend.DataQuery, clie
 	queryCount := ds.GetQueryCount(queryInfo)
 	getLogsResp := &sls.GetLogsResponse{}
 	for i := 0; i < int(queryCount); i++ {
-		offset := (queryInfo.CurrentPage - 1) * queryInfo.LogsPerPage
+		currentPage := queryInfo.CurrentPage
+		if currentPage <= 0 {
+			currentPage = 1
+		}
+		offset := (currentPage - 1) * queryInfo.LogsPerPage
 		getLogsReq := &sls.GetLogRequest{
 			From:    from,
 			To:      to,