dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify time parsing in json/csv parsers (#5382)

Browse Source
This commit is contained in:
Greg
2019-02-05 18:43:35 -07:00
committed by Daniel Nelson
parent 7887e15446
commit 10ac030502
3 changed files with 63 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/parsers/csv/parser.go
View File

@@ -9,6 +9,7 @@ import (
"time"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/metric"
)
@@ -239,22 +240,8 @@ func parseTimestamp(timeFunc func() time.Time, recordFields map[string]interface
case "":
err = fmt.Errorf("timestamp format must be specified")
return
case "unix":
var unixTime int64
unixTime, err = strconv.ParseInt(tStr, 10, 64)
if err != nil {
return
}
metricTime = time.Unix(unixTime, 0)
case "unix_ms":
var unixTime int64
unixTime, err = strconv.ParseInt(tStr, 10, 64)
if err != nil {
return
}
metricTime = time.Unix(unixTime/1000, (unixTime%1000)*1e6)
default:
metricTime, err = time.Parse(timestampFormat, tStr)
metricTime, err = internal.ParseTimestamp(tStr, timestampFormat)
if err != nil {
return
}