github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 监控数据改为批量插入 (#512)

pull/511/head
ssongliu 2023-04-06 10:18:15 +08:00 committed by GitHub
parent 8902fdc78a
commit c63967158b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/cron/job/monitor.go
View File

@ -66,6 +66,7 @@ func loadDiskIO() {
time.Sleep(60 * time.Second) time.Sleep(60 * time.Second)
ioStat2, _ := disk.IOCounters() ioStat2, _ := disk.IOCounters()
var ioList []model.MonitorIO
for _, io2 := range ioStat2 { for _, io2 := range ioStat2 {
for _, io1 := range ioStat { for _, io1 := range ioStat {
if io2.Name == io1.Name { if io2.Name == io1.Name {
@ -85,13 +86,14 @@ func loadDiskIO() {
if writeTime > itemIO.Time { if writeTime > itemIO.Time {
itemIO.Time = writeTime itemIO.Time = writeTime
} }
if err := global.DB.Create(&itemIO).Error; err != nil { ioList = append(ioList, itemIO)
global.LOG.Errorf("Insert io monitoring data failed, err: %v", err)
}
break break
} }
} }
} }
if err := global.DB.CreateInBatches(ioList, len(ioList)).Error; err != nil {
global.LOG.Errorf("Insert io monitoring data failed, err: %v", err)
}
} }
func loadNetIO() { func loadNetIO() {
@ -101,6 +103,7 @@ func loadNetIO() {
time.Sleep(60 * time.Second) time.Sleep(60 * time.Second)
netStat2, _ := net.IOCounters(true) netStat2, _ := net.IOCounters(true)
var netList []model.MonitorNetwork
for _, net2 := range netStat2 { for _, net2 := range netStat2 {
for _, net1 := range netStat { for _, net1 := range netStat {
if net2.Name == net1.Name { if net2.Name == net1.Name {
@ -108,9 +111,7 @@ func loadNetIO() {
itemNet.Name = net1.Name itemNet.Name = net1.Name
itemNet.Up = float64(net2.BytesSent-net1.BytesSent) / 1024 / 60 itemNet.Up = float64(net2.BytesSent-net1.BytesSent) / 1024 / 60
itemNet.Down = float64(net2.BytesRecv-net1.BytesRecv) / 1024 / 60 itemNet.Down = float64(net2.BytesRecv-net1.BytesRecv) / 1024 / 60
if err := global.DB.Create(&itemNet).Error; err != nil { netList = append(netList, itemNet)
global.LOG.Errorf("Insert network monitoring data failed, err: %v", err)
}
break break
} }
} }
@ -126,11 +127,13 @@ func loadNetIO() {
itemNet.Name = net1.Name itemNet.Name = net1.Name
itemNet.Up = float64(net2.BytesSent-net1.BytesSent) / 1024 / 60 itemNet.Up = float64(net2.BytesSent-net1.BytesSent) / 1024 / 60
itemNet.Down = float64(net2.BytesRecv-net1.BytesRecv) / 1024 / 60 itemNet.Down = float64(net2.BytesRecv-net1.BytesRecv) / 1024 / 60
if err := global.DB.Create(&itemNet).Error; err != nil { netList = append(netList, itemNet)
global.LOG.Errorf("Insert network all monitoring data failed, err: %v", err)
}
break break
} }
} }
} }
if err := global.DB.CreateInBatches(netList, len(netList)).Error; err != nil {
global.LOG.Errorf("Insert network monitoring data failed, err: %v", err)
}
} }