Remove the injectPreferV2Template decorator.

elastic · May 11, 2020 · 962bb80 · 962bb80
1 parent 23e9865
commit 962bb80
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 251 deletions.
diff --git a/x-pack/elastic-agent/pkg/agent/application/decorators.go b/x-pack/elastic-agent/pkg/agent/application/decorators.go
diff --git a/x-pack/elastic-agent/pkg/agent/application/decorators_test.go b/x-pack/elastic-agent/pkg/agent/application/decorators_test.go
diff --git a/x-pack/elastic-agent/pkg/agent/application/introspect_output_cmd.go b/x-pack/elastic-agent/pkg/agent/application/introspect_output_cmd.go
@@ -181,7 +181,7 @@ func getProgramsFromConfig(log *logger.Logger, cfg *config.Config) (map[string][
 		log,
 		router,
 		&configModifiers{
-			Decorators: []decoratorFunc{injectMonitoring, injectPreferV2Template},
+			Decorators: []decoratorFunc{injectMonitoring},
 			Filters:    []filterFunc{filters.ConstraintFilter},
 		},
 		monitor,

diff --git a/x-pack/elastic-agent/pkg/agent/application/local_mode.go b/x-pack/elastic-agent/pkg/agent/application/local_mode.go
@@ -96,7 +96,7 @@ func newLocal(
 		log,
 		router,
 		&configModifiers{
-			Decorators: []decoratorFunc{injectMonitoring, injectPreferV2Template},
+			Decorators: []decoratorFunc{injectMonitoring},
 			Filters:    []filterFunc{filters.ConstraintFilter},
 		},
 		monitor,

diff --git a/x-pack/elastic-agent/pkg/agent/application/managed_mode.go b/x-pack/elastic-agent/pkg/agent/application/managed_mode.go
@@ -136,7 +136,7 @@ func newManaged(
 		log,
 		router,
 		&configModifiers{
-			Decorators: []decoratorFunc{injectMonitoring, injectPreferV2Template},
+			Decorators: []decoratorFunc{injectMonitoring},
 			Filters:    []filterFunc{filters.ConstraintFilter},
 		},
 		monitor,