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

Fix detection of layout timestamps (#6390)

Browse Source
This commit is contained in:
Daniel Nelson
2019-09-16 16:32:14 -07:00
committed by GitHub
parent 7167a23c52
commit 6dc61be6eb
4 changed files with 215 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,7 @@ func parseTimestamp(timeFunc func() time.Time, recordFields map[string]interface
case "":
return time.Time{}, fmt.Errorf("timestamp format must be specified")
default:
metricTime, err := internal.ParseTimestamp(recordFields[timestampColumn], timestampFormat)
metricTime, err := internal.ParseTimestamp(timestampFormat, recordFields[timestampColumn], "UTC")
if err != nil {
return time.Time{}, err
}

2
plugins/parsers/json/parser.go
View File

@@ -120,7 +120,7 @@ func (p *Parser) parseObject(data map[string]interface{}) ([]telegraf.Metric, er
return nil, err
}
nTime, err = internal.ParseTimestampWithLocation(f.Fields[p.timeKey], p.timeFormat, p.timezone)
nTime, err = internal.ParseTimestamp(p.timeFormat, f.Fields[p.timeKey], p.timezone)
if err != nil {
return nil, err
}