Skip to content

fix: monitor time-based search timezone offset #12275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakub961241 wants to merge 1 commit into
base: dev-v2
Choose a base branch
from
+16 −4
Open

fix: monitor time-based search timezone offset #12275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions agent/app/service/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ func NewIMonitorService() IMonitorService {

func (m *MonitorService) LoadMonitorData(req dto.MonitorSearch) ([]dto.MonitorData, error) {
loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
req.StartTime = req.StartTime.In(loc)
req.EndTime = req.EndTime.In(loc)
if req.StartTime.Location() == time.UTC && loc != time.UTC {
req.StartTime = time.Date(req.StartTime.Year(), req.StartTime.Month(), req.StartTime.Day(),
req.StartTime.Hour(), req.StartTime.Minute(), req.StartTime.Second(), req.StartTime.Nanosecond(), loc)
}
if req.EndTime.Location() == time.UTC && loc != time.UTC {
req.EndTime = time.Date(req.EndTime.Year(), req.EndTime.Month(), req.EndTime.Day(),
req.EndTime.Hour(), req.EndTime.Minute(), req.EndTime.Second(), req.EndTime.Nanosecond(), loc)
}

var data []dto.MonitorData
if req.Param == "all" || req.Param == "cpu" || req.Param == "memory" || req.Param == "load" {
Expand Down Expand Up @@ -182,8 +188,14 @@ func (m *MonitorService) LoadGPUOptions() dto.MonitorGPUOptions {

func (m *MonitorService) LoadGPUMonitorData(req dto.MonitorGPUSearch) (dto.MonitorGPUData, error) {
loc, _ := time.LoadLocation(common.LoadTimeZoneByCmd())
req.StartTime = req.StartTime.In(loc)
req.EndTime = req.EndTime.In(loc)
if req.StartTime.Location() == time.UTC && loc != time.UTC {
req.StartTime = time.Date(req.StartTime.Year(), req.StartTime.Month(), req.StartTime.Day(),
req.StartTime.Hour(), req.StartTime.Minute(), req.StartTime.Second(), req.StartTime.Nanosecond(), loc)
}
if req.EndTime.Location() == time.UTC && loc != time.UTC {
req.EndTime = time.Date(req.EndTime.Year(), req.EndTime.Month(), req.EndTime.Day(),
req.EndTime.Hour(), req.EndTime.Minute(), req.EndTime.Second(), req.EndTime.Nanosecond(), loc)
}
var data dto.MonitorGPUData
gpuList, err := monitorRepo.GetGPU(repo.WithByCreatedAt(req.StartTime, req.EndTime), monitorRepo.WithByProductName(req.ProductName))
if err != nil {
Expand Down