From 92e57ee06ca1dcd050572d3cfc195f8c3166a8ad Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 18 Apr 2016 19:13:45 -0600
Subject: [PATCH] Set default tags in test accumulator

closes #1012
---
 CHANGELOG.md   | 1 +
 agent/agent.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30257749b..4945a3bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ based on _prefix_ in addition to globs. This means that a filter like
 ### Bugfixes
 - [#921](https://github.com/influxdata/telegraf/pull/921): mqtt_consumer stops gathering metrics. Thanks @chaton78!
 - [#1013](https://github.com/influxdata/telegraf/pull/1013): Close dead riemann output connections. Thanks @echupriyanov!
+- [#1012](https://github.com/influxdata/telegraf/pull/1012): Set default tags in test accumulator.
 
 ## v0.12.1 [2016-04-14]
 
diff --git a/agent/agent.go b/agent/agent.go
index fdd17a267..60f2d63c6 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -221,6 +221,7 @@ func (a *Agent) Test() error {
 	for _, input := range a.Config.Inputs {
 		acc := NewAccumulator(input.Config, metricC)
 		acc.SetDebug(true)
+		acc.setDefaultTags(a.Config.Tags)
 
 		fmt.Printf("* Plugin: %s, Collection 1\n", input.Name)
 		if input.Config.Interval != 0 {