fix(outputs.Wavefront): If no "host" tag is provided, do not add "tel…

…egraf.host" tag (#11078) Co-authored-by: ffaroo1 <svc-registry-github@intuit.com>
influxdata · May 12, 2022 · 906b24e · 906b24e
1 parent 3c79acb
commit 906b24e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/plugins/outputs/wavefront/wavefront.go b/plugins/outputs/wavefront/wavefront.go
@@ -190,7 +190,10 @@ func (w *Wavefront) buildTags(mTags map[string]string) (string, map[string]strin
 			for k, v := range mTags {
 				if k == s {
 					source = v
-					mTags["telegraf_host"] = mTags["host"]
+					if mTags["host"] != "" {
+						mTags["telegraf_host"] = mTags["host"]
+					}
+
 					sourceTagFound = true
 					delete(mTags, k)
 					break

diff --git a/plugins/outputs/wavefront/wavefront_test.go b/plugins/outputs/wavefront/wavefront_test.go
@@ -243,6 +243,11 @@ func TestBuildTagsWithSource(t *testing.T) {
 			"r-@l\"Ho/st",
 			map[string]string{"something": "abc"},
 		},
+		{
+			map[string]string{"hostagent": "realHost", "env": "qa", "tag": "val"},
+			"realHost",
+			map[string]string{"env": "qa", "tag": "val"},
+		},
 	}
 
 	for _, tt := range tagtests {