release 1.38.2

GuanceCloud · Sep 19, 2024 · ab973f8 · ab973f8
1 parent 657b701
commit ab973f8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
 
 variables:
   PROJECT: "datakit"
-  CI_VERSION: "1.38.1"
+  CI_VERSION: "1.38.2"
   CI_TESTING_VERSION: $CI_VERSION-testing_$CI_COMMIT_BRANCH
   DISABLED_MR_TARGET_BRANCHES: '/^master|main/'
   DISABLED_MR_TITLE: '/^(\[Draft\]|\(Draft\)|Draft:)/'

diff --git a/internal/export/doc/en/changelog.md b/internal/export/doc/en/changelog.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.38.2 (2024/09/19) {#cl-1.38.2}
+
+This release is a Hotfix release addressing the following issues:
+
+- Fixed an issue where the global-tag was incorrectly added during Nginx collection (#2406).
+- Resolved a CPU core collection error in the host object collector on Windows (#2398).
+- The Chrony collector now integrates with the Dataway time synchronization mechanism to prevent data collection from being affected by Datakit's local time discrepancies (#2351).
+    - This feature requires Dataway version 1.6.0 or higher.
+- Fixed a crash issue in Datakit's HTTP API that could occur under timeout conditions (#2091).
+
+---
+
 ## 1.38.1 (2024/09/11) {#cl-1.38.1}
 
 This release is a hotfix release, fixed the following issues:
@@ -317,7 +329,7 @@ If your time series storage is InfluxDB, then **do not upgrade Datakit**. Please
 
 Additionally, if the central has been upgraded to a newer version (1.87.167+), then lower versions of Datakit should also **use the `v1` upload protocol**. Please switch from `v2` to `v1` if you have set `v2` before.
 
-If you do indeed want to upgrade to a newer version of Datakit, please replace the time series engine with guance-storage.
+If you do indeed want to upgrade to a newer version of Datakit, please replace the time series engine with GuanceDB for metrics.
 
 ---
 

diff --git a/internal/export/doc/zh/changelog.md b/internal/export/doc/zh/changelog.md
@@ -1,5 +1,17 @@
 # 更新日志
 
+## 1.38.2(2024/09/19) {#cl-1.38.2}
+
+本次发布属于 Hotfix 发布，修复如下问题：
+
+- 修复 Nginx 采集时 global-tag 添加错误问题（#2406）
+- 修复主机对象采集器在 Windows 下 CPU 核心采集错误问题（#2398）
+- Chrony 采集器增加跟 Dataway 对时机制，避免其采集的数据受到 Datakit 本机时间偏差的影响（#2351）
+    - 本功能依赖 Dataway 1.6.0（含）以上的版本
+- 修复 Datakit HTTP API 在 timeout 情况下可能导致的崩溃问题（#2091）
+
+---
+
 ## 1.38.1(2024/09/11) {#cl-1.38.1}
 
 本次发布属于 Hotfix 发布，修复如下问题：
@@ -311,7 +323,7 @@
 
 另外，如果中心升级到了较新的版本（1.87.167+），则低版本的 Datakit 也 **不要采用 `v2` 上传协议**，请改用 `v1` 版本的上传协议。
 
-如果确实要要升级到较新的 Datakit 版本，请替换时序引擎为 guance-storage。
+如果确实要要升级到较新的 Datakit 版本，请替换时序引擎为 GuanceDB for metrics。
 
 ---
 

diff --git a/internal/export/non_input_docs.go b/internal/export/non_input_docs.go
@@ -149,15 +149,15 @@ func envDataway() []*inputs.ENVInfo {
 		{
 			ENVName: "ENV_DATAWAY_NTP_INTERVAL",
 			Type:    doc.String,
-			Desc:    "Set NTP sync interval [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.39.0)",
-			DescZh:  "设置 NTP 时间同步间隔 [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.39.0)",
+			Desc:    "Set NTP sync interval [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.38.2)",
+			DescZh:  "设置 NTP 时间同步间隔 [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.38.2)",
 		},
 
 		{
 			ENVName: "ENV_DATAWAY_NTP_DIFF",
 			Type:    doc.String,
-			Desc:    "Set NTP sync difference [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.39.0)",
-			DescZh:  "设置 NTP 时间同步的误差[:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.39.0)",
+			Desc:    "Set NTP sync difference [:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.38.2)",
+			DescZh:  "设置 NTP 时间同步的误差[:octicons-tag-24: Version-1.39.0](changelog.md#cl-1.38.2)",
 		},
 	}