diff --git a/agent/app/service/snapshot.go b/agent/app/service/snapshot.go index 0a16abe68..c5ea3ba3c 100644 --- a/agent/app/service/snapshot.go +++ b/agent/app/service/snapshot.go @@ -121,7 +121,7 @@ func (u *SnapshotService) LoadSnapshotData() (dto.SnapshotData, error) { } i := 0 for _, item := range itemBackups { - if item.Label != "app" && item.Label != "system_snapshot" { + if item.Label != "app" && item.Label != "system_snapshot" && item.Label != "tmp" { itemBackups[i] = item i++ } diff --git a/agent/app/service/snapshot_create.go b/agent/app/service/snapshot_create.go index a59ff556f..c2c5f19c4 100644 --- a/agent/app/service/snapshot_create.go +++ b/agent/app/service/snapshot_create.go @@ -242,6 +242,7 @@ func loadDbConn(snap *snapHelper, targetDir string, req dto.SnapshotCreate) erro return err } snap.snapAgentDB = agentDb + _ = snap.snapAgentDB.Model(&model.Setting{}).Where("key = ?", "SystemIP").Updates(map[string]interface{}{"value": ""}).Error coreDb, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/core.db"), "core.db") snap.Task.LogWithStatus(i18n.GetWithName("SnapNewDB", "core"), err) if err != nil { diff --git a/frontend/src/api/modules/setting.ts b/frontend/src/api/modules/setting.ts index ad94db2fb..178bdf5fc 100644 --- a/frontend/src/api/modules/setting.ts +++ b/frontend/src/api/modules/setting.ts @@ -136,7 +136,7 @@ export const updateAppStoreConfig = (req: App.AppStoreConfigUpdate) => { // snapshot export const loadSnapshotInfo = () => { - return http.get(`/settings/snapshot/load`); + return http.get(`/settings/snapshot/load`, {}, TimeoutEnum.T_60S); }; export const snapshotCreate = (param: Setting.SnapshotCreate) => { return http.post(`/settings/snapshot`, param); diff --git a/frontend/src/views/setting/snapshot/create/index.vue b/frontend/src/views/setting/snapshot/create/index.vue index 98e149ffd..a2a835737 100644 --- a/frontend/src/views/setting/snapshot/create/index.vue +++ b/frontend/src/views/setting/snapshot/create/index.vue @@ -397,6 +397,8 @@ const load18n = (node: any, label: string) => { return i18n.global.t('setting.' + label + 'Label'); case 'system_snapshot': return i18n.global.t('setting.snapshotLabel'); + case 'master': + return i18n.global.t('xpack.node.masterBackup'); default: return label; }