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

Fix divide by zero in logparser input (#4338)

This commit is contained in:
Ayrdrie 2018-08-29 19:11:13 -07:00 committed by Daniel Nelson
parent f6b08df163
commit 5420e13f14
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/parsers/grok/parser.go
View File

@ -344,6 +344,9 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
v = strings.Replace(v, ",", ".", -1) v = strings.Replace(v, ",", ".", -1)
ts, err := time.ParseInLocation(t, v, p.loc) ts, err := time.ParseInLocation(t, v, p.loc)
if err == nil { if err == nil {
if ts.Year() == 0 {
ts = ts.AddDate(timestamp.Year(), 0, 0)
}
timestamp = ts timestamp = ts
} else { } else {
log.Printf("E! Error parsing %s to time layout [%s]: %s", v, t, err) log.Printf("E! Error parsing %s to time layout [%s]: %s", v, t, err)
@ -485,6 +488,9 @@ type tsModder struct {
// most significant time unit of ts. // most significant time unit of ts.
// ie, if the input is at ms precision, it will increment it 1µs. // ie, if the input is at ms precision, it will increment it 1µs.
func (t *tsModder) tsMod(ts time.Time) time.Time { func (t *tsModder) tsMod(ts time.Time) time.Time {
if ts.IsZero() {
return ts
}
defer func() { t.last = ts }() defer func() { t.last = ts }()
// don't mod the time if we don't need to // don't mod the time if we don't need to
if t.last.IsZero() || ts.IsZero() { if t.last.IsZero() || ts.IsZero() {
@ -498,7 +504,6 @@ func (t *tsModder) tsMod(ts time.Time) time.Time {
t.rollover = 0 t.rollover = 0
return ts return ts
} }
if ts.Equal(t.last) { if ts.Equal(t.last) {
t.dupe = ts t.dupe = ts
} }

16
plugins/parsers/grok/parser_test.go
View File

@ -1009,3 +1009,19 @@ func TestMeasurementModifierNoName(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, m.Name(), "hello") require.Equal(t, m.Name(), "hello")
} }
func TestEmptyYearInTimestamp(t *testing.T) {
p := &Parser{
Patterns: []string{`%{APPLE_SYSLOG_TIME_SHORT:timestamp:ts-"Jan 2 15:04:05"} %{HOSTNAME} %{APP_NAME:app_name}\[%{NUMBER:pid:int}\]%{GREEDYDATA:message}`},
CustomPatterns: `
APPLE_SYSLOG_TIME_SHORT %{MONTH} +%{MONTHDAY} %{TIME}
APP_NAME [a-zA-Z0-9\.]+
`,
}
require.NoError(t, p.Compile())
p.ParseLine("Nov 6 13:57:03 generic iTunes[6504]: info> Scale factor of main display = 2.0")
m, err := p.ParseLine("Nov 6 13:57:03 generic iTunes[6504]: objc[6504]: Object descriptor was null.")
require.NoError(t, err)
require.NotNil(t, m)
require.Equal(t, 2018, m.Time().Year())
}