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

Don't set values when pattern doesn't match in regex processor (#4396) 

(cherry picked from commit 35d2f90d6c)
This commit is contained in:
Alexander Shepelin 2018-07-07 02:13:46 +03:00 committed by Daniel Nelson
parent 858335b1c4
commit 63d07f4272
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/processors/regex/regex.go
View File

@ -67,7 +67,9 @@ func (r *Regex) Apply(in ...telegraf.Metric) []telegraf.Metric {
for _, metric := range in { for _, metric := range in {
for _, converter := range r.Tags { for _, converter := range r.Tags {
if value, ok := metric.GetTag(converter.Key); ok { if value, ok := metric.GetTag(converter.Key); ok {
metric.AddTag(r.convert(converter, value)) if key, newValue := r.convert(converter, value); newValue != "" {
metric.AddTag(key, newValue)
}
} }
} }
@ -75,7 +77,9 @@ func (r *Regex) Apply(in ...telegraf.Metric) []telegraf.Metric {
if value, ok := metric.GetField(converter.Key); ok { if value, ok := metric.GetField(converter.Key); ok {
switch value := value.(type) { switch value := value.(type) {
case string: case string:
metric.AddField(r.convert(converter, value)) if key, newValue := r.convert(converter, value); newValue != "" {
metric.AddField(key, newValue)
}
} }
} }
} }

5
plugins/processors/regex/regex_test.go
View File

@ -222,7 +222,7 @@ func TestNoMatches(t *testing.T) {
}, },
}, },
{ {
message: "Should emit empty string when result_key given but regex doesn't match", message: "Should not emit new tag/field when result_key given but regex doesn't match",
converter: converter{ converter: converter{
Key: "request", Key: "request",
Pattern: "not_match", Pattern: "not_match",
@ -230,8 +230,7 @@ func TestNoMatches(t *testing.T) {
ResultKey: "new_field", ResultKey: "new_field",
}, },
expectedFields: map[string]interface{}{ expectedFields: map[string]interface{}{
"request": "/users/42/", "request": "/users/42/",
"new_field": "",
}, },
}, },
} }