Don't emit empty tags and fields when pattern doesn't match and resul…

…t_key specified
influxdata · Jul 6, 2018 · 1d03159 · 1d03159
1 parent a0ece79
commit 1d03159
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/plugins/processors/regex/regex.go b/plugins/processors/regex/regex.go
@@ -67,15 +67,19 @@ func (r *Regex) Apply(in ...telegraf.Metric) []telegraf.Metric {
 	for _, metric := range in {
 		for _, converter := range r.Tags {
 			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)
+				}
 			}
 		}
 
 		for _, converter := range r.Fields {
 			if value, ok := metric.GetField(converter.Key); ok {
 				switch value := value.(type) {
 				case string:
-					metric.AddField(r.convert(converter, value))
+					if key, newValue := r.convert(converter, value); newValue != "" {
+						metric.AddField(key, newValue)
+					}
 				}
 			}
 		}

diff --git a/plugins/processors/regex/regex_test.go b/plugins/processors/regex/regex_test.go
@@ -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{
 				Key:         "request",
 				Pattern:     "not_match",
@@ -231,7 +231,6 @@ func TestNoMatches(t *testing.T) {
 			},
 			expectedFields: map[string]interface{}{
 				"request":   "/users/42/",
-				"new_field": "",
 			},
 		},
 	}