Fixed formatting and conflicts due to Docker: optionally add labels a…

…s tags (#2425)
influxdata · Apr 3, 2017 · fe479cc · fe479cc
1 parent d9e36bc
commit fe479cc
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
@@ -27,14 +27,14 @@ type DockerLabelFilter struct {
 
 // Docker object
 type Docker struct {
-	Endpoint       string
-	ContainerNames []string
-	Timeout        internal.Duration
-	PerDevice      bool     `toml:"perdevice"`
-	Total          bool     `toml:"total"`
-  	GatherEnvironment []string `toml:"gather_environment"`
-	LabelInclude   []string `toml:"docker_label_include"`
-	LabelExclude   []string `toml:"docker_label_exclude"`
+	Endpoint          string
+	ContainerNames    []string
+	Timeout           internal.Duration
+	PerDevice         bool     `toml:"perdevice"`
+	Total             bool     `toml:"total"`
+	GatherEnvironment []string `toml:"gather_environment"`
+	LabelInclude      []string `toml:"docker_label_include"`
+	LabelExclude      []string `toml:"docker_label_exclude"`
 
 	LabelFilter DockerLabelFilter