diff --git a/agent/app/model/cronjob.go b/agent/app/model/cronjob.go index daaff4352..7744967c9 100644 --- a/agent/app/model/cronjob.go +++ b/agent/app/model/cronjob.go @@ -43,6 +43,8 @@ type Cronjob struct { EntryIDs string `json:"entryIDs"` Records []JobRecords `json:"records"` Secret string `json:"secret"` + + Config string `json:"config"` } type JobRecords struct { diff --git a/agent/app/model/monitor.go b/agent/app/model/monitor.go index a53392e43..5a2c594b5 100644 --- a/agent/app/model/monitor.go +++ b/agent/app/model/monitor.go @@ -2,14 +2,18 @@ package model type MonitorBase struct { BaseModel - Cpu float64 `json:"cpu"` + Cpu float64 `json:"cpu"` + TopCPU string `json:"topCPU"` + TopCPUItems interface{} `gorm:"-" json:"topCPUItems"` + + Memory float64 `json:"memory"` + TopMem string `json:"topMem"` + TopMemItems interface{} `gorm:"-" json:"topMemItems"` LoadUsage float64 `json:"loadUsage"` CpuLoad1 float64 `json:"cpuLoad1"` CpuLoad5 float64 `json:"cpuLoad5"` CpuLoad15 float64 `json:"cpuLoad15"` - - Memory float64 `json:"memory"` } type MonitorIO struct { diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go index 9763b498a..e7ae4d32a 100644 --- a/agent/init/migration/migrations/init.go +++ b/agent/init/migration/migrations/init.go @@ -661,14 +661,14 @@ var UpdateMonitorInterval = &gormigrate.Migration{ } var AddMonitorProcess = &gormigrate.Migration{ - ID: "20251030-add-monitor-process", + ID: "20251202-add-monitor-process", Migrate: func(tx *gorm.DB) error { return global.MonitorDB.AutoMigrate(&model.MonitorBase{}) }, } var UpdateCronJob = &gormigrate.Migration{ - ID: "20251105-update-cronjob", + ID: "20251202-update-cronjob", Migrate: func(tx *gorm.DB) error { return tx.AutoMigrate(&model.Cronjob{}) },