diff --git a/Gopkg.lock b/Gopkg.lock index c6b5483..ebdc7a7 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -52,13 +52,14 @@ name = "git.loafle.net/commons/util-go" packages = [ "context", + "encoding/json", "reflect", "service", "time/scheduler", "time/scheduler/storage", "time/scheduler/task" ] - revision = "4d4017d214d2a8fdde59d774254f421991fabe7e" + revision = "dd4f956c587b1947f84ad5eebd64722b3d6c5224" [[projects]] branch = "master" @@ -76,7 +77,7 @@ "model/sensorconfig", "service/probe" ] - revision = "904de1632643ddb9c8862cd5bf147570c1a59878" + revision = "2b132edc0887553bf69387a83cbaf8870ca5f710" [[projects]] branch = "master" @@ -155,6 +156,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "cb81ec9eec96b324c50549946ad21270e3196894729af8f88a8b2e6150661aad" + inputs-digest = "7134310cbedd1c5f05b7f9e9dd44b28960d9e326e362804dd783132ba331e36f" solver-name = "gps-cdcl" solver-version = 1 diff --git a/service/CollectorService.go b/service/CollectorService.go index 504a349..df37397 100644 --- a/service/CollectorService.go +++ b/service/CollectorService.go @@ -119,9 +119,9 @@ func (s *CollectorService) collectTask(sensorConfig *ocmsc.SensorConfig) { } m := &ocmd.Metric{ - SensorConfigID: sensorConfig.SensorID.String(), + SensorID: sensorConfig.SensorID.String(), Data: result, - CollectDate: occu.NowPtr(), + StartDate: occu.NowPtr(), } if err := s.ProbeService.Send("MetricService.Send", m); nil != err {