fix(dbm-services): 资源导入时，解析脚本输出忽略错误message #6135

TencentBlueKing · Aug 8, 2024 · caecf05 · caecf05
1 parent d7b4511
commit caecf05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dbm-services/common/db-resource/internal/svr/bk/disk.go b/dbm-services/common/db-resource/internal/svr/bk/disk.go
@@ -15,6 +15,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"maps"
+	"regexp"
 	"time"
 
 	"dbm-services/common/go-pubpkg/cmutil"
@@ -156,6 +157,7 @@ func GetDiskInfo(hosts []IPList, bk_biz_id int, hostOsMap map[string]string) (re
 	}
 	ipLogContentMap := make(map[string]*ShellResCollection)
 	ipFailedLogMap := make(map[string]string)
+	jsonRe := regexp.MustCompile("{*.*}")
 	for os_type, ipList := range ipListOsMap {
 		if len(ipList) == 0 {
 			continue
@@ -169,7 +171,9 @@ func GetDiskInfo(hosts []IPList, bk_biz_id int, hostOsMap map[string]string) (re
 			maps.Copy(ipFailedLogMap, ipFailedLogMapWin)
 			for _, d := range ipLogs.ScriptTaskLogs {
 				var dl PowerShellResCollection
-				if err = json.Unmarshal([]byte(d.LogContent), &dl); err != nil {
+				jsonBody := jsonRe.FindString(d.LogContent)
+				logger.Info("%s shell grab json body: %s", d.Ip, jsonBody)
+				if err = json.Unmarshal([]byte(jsonBody), &dl); err != nil {
 					logger.Error("unmarshal log content failed %s", err.Error())
 					continue
 				}
@@ -187,7 +191,9 @@ func GetDiskInfo(hosts []IPList, bk_biz_id int, hostOsMap map[string]string) (re
 			maps.Copy(ipFailedLogMap, ipFailedLogMapLiunx)
 			for _, d := range ipLogs.ScriptTaskLogs {
 				var dl ShellResCollection
-				if err = json.Unmarshal([]byte(d.LogContent), &dl); err != nil {
+				jsonBody := jsonRe.FindString(d.LogContent)
+				logger.Info("%s shell grab json body: %s", d.Ip, jsonBody)
+				if err = json.Unmarshal([]byte(jsonBody), &dl); err != nil {
 					logger.Error("unmarshal log content failed %s", err.Error())
 					continue
 				}

diff --git a/helm-charts/bk-dbm/charts/db-resource/Chart.yaml b/helm-charts/bk-dbm/charts/db-resource/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.98
+appVersion: 0.0.1-alpha.99
 description: A Helm chart for Kubernetes
 name: db-resource
 type: application