feat: 采集器支持上报系统架构 --story=116223031 (#206)

TencentBlueKing · Feb 23, 2024 · 4cd08b6 · 4cd08b6
1 parent b6b34f8
commit 4cd08b6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/pkg/bkmonitorbeat/VERSION b/pkg/bkmonitorbeat/VERSION
@@ -1 +1 @@
-v3.27.x
+v3.28.x
diff --git a/pkg/bkmonitorbeat/script/generate_support_files/write_root_conf_tpl.sh b/pkg/bkmonitorbeat/script/generate_support_files/write_root_conf_tpl.sh
@@ -203,7 +203,7 @@ EOF
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
 EOF
   cat <<EOF >> "$path"
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下

diff --git a/pkg/bkmonitorbeat/support-files/templates/freebsd/x86_64/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/freebsd/x86_64/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/support-files/templates/linux/aarch64/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/linux/aarch64/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/support-files/templates/linux/x86/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/linux/x86/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/support-files/templates/linux/x86_64/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/linux/x86_64/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/support-files/templates/windows/x86/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/windows/x86/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/support-files/templates/windows/x86_64/etc/bkmonitorbeat.conf.tpl b/pkg/bkmonitorbeat/support-files/templates/windows/x86_64/etc/bkmonitorbeat.conf.tpl
@@ -128,7 +128,7 @@ bkmonitorbeat:
     check_disk_space_interval: 60
     check_oom_interval: 10
     used_max_disk_space_percent: 95
-
+    free_min_disk_space: 10
   # 进程采集：同步 CMDB 进程配置文件到 bkmonitorbeat 子任务文件夹下
   procconf_task:
     task_id: 103

diff --git a/pkg/bkmonitorbeat/tasks/static/utils.go b/pkg/bkmonitorbeat/tasks/static/utils.go
@@ -83,10 +83,16 @@ func (r *Report) AsMapStr() common.MapStr {
 		}
 	}
 
+	arch := "x86"
+	if r.System.Arch == "arm" || r.System.Arch == "aarch64" {
+		arch = "arm"
+	}
+
 	if r.System != nil {
 		result["system"] = common.MapStr{
 			"hostname": r.System.HostName,
 			"os":       r.System.OS,
+			"arch":     arch,
 			"platform": r.System.Platform,
 			"platVer":  r.System.PlatVer,
 			"sysType":  r.System.SysType,
@@ -131,6 +137,7 @@ type System struct {
 	PlatVer   string
 	SysType   string
 	BKAgentID string
+	Arch      string
 }
 
 // GetData 采集全部静态数据
@@ -266,6 +273,7 @@ var GetSystemStatus = func(ctx context.Context) (*System, error) {
 		Platform:  info.Platform,
 		PlatVer:   info.PlatformVersion,
 		BKAgentID: bkAgentID,
+		Arch:      info.KernelArch,
 	}, nil
 }