[Ingest Manager] Change monitoring defaults for agent (elastic#18927) (…

…elastic#18968)

[Ingest Manager] Change monitoring defaults for agent (elastic#18927)

x-pack/elastic-agent/CHANGELOG.asciidoc

@@ -68,4 +68,5 @@
 - Pick up version from libbeat {pull}18350[18350]
 - Use shorter hash for application differentiator {pull}18770[18770]
 - When not port are specified and the https is used fallback to 443 {pull}18844[18844]
+- Change monitoring defaults for agent {pull}18927[18927]
 - Agent verifies packages before using them {pull}18876[18876]

x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl

@@ -23,13 +23,13 @@ datasources:
           - metricset: filesystem
             dataset: system.filesystem
 
-settings.monitoring:
-  # enabled turns on monitoring of running processes
-  enabled: true
-  # enables log monitoring
-  logs: true
-  # enables metrics monitoring
-  metrics: true
+# settings.monitoring:
+#   # enabled turns on monitoring of running processes
+#   enabled: true
+#   # enables log monitoring
+#   logs: true
+#   # enables metrics monitoring
+#   metrics: true
 
 # management:
 #   # Mode of management, the Elastic Agent support two modes of operation:

x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml

@@ -23,7 +23,12 @@ outputs:
     ca_sha256: "7lHLiyp4J8m9kw38SJ7SURJP4bXRZv/BNxyyXkCcE/M="
 
 settings.monitoring:
-  use_output: monitoring
+  # enabled turns on monitoring of running processes
+  enabled: true
+  # enables log monitoring
+  logs: true
+  # enables metrics monitoring
+  metrics: true
 
 # Sets log level. The default log level is info.
 # Available log levels are: error, warning, info, debug

x-pack/elastic-agent/elastic-agent.yml

@@ -29,13 +29,13 @@ datasources:
           - metricset: filesystem
             dataset: system.filesystem
 
-settings.monitoring:
-  # enabled turns on monitoring of running processes
-  enabled: true
-  # enables log monitoring
-  logs: true
-  # enables metrics monitoring
-  metrics: true
+# settings.monitoring:
+#   # enabled turns on monitoring of running processes
+#   enabled: true
+#   # enables log monitoring
+#   logs: true
+#   # enables metrics monitoring
+#   metrics: true
 
 # management:
 #   # Mode of management, the Elastic Agent support two modes of operation:

x-pack/elastic-agent/pkg/agent/application/monitoring_decorator.go

@@ -20,6 +20,8 @@ const (
 	outputKey                 = "output"
 
 	enabledKey        = "settings.monitoring.enabled"
+	logsKey           = "settings.monitoring.logs"
+	metricsKey        = "settings.monitoring.metrics"
 	outputsKey        = "outputs"
 	elasticsearchKey  = "elasticsearch"
 	typeKey           = "type"
@@ -35,42 +37,48 @@ func injectMonitoring(outputGroup string, rootAst *transpiler.AST, programsToRun
 		},
 	}
 
-	var config map[string]interface{}
+	config := make(map[string]interface{})
+	// if monitoring is not specified use default one where everything is enabled
 	if _, found := transpiler.Lookup(rootAst, monitoringKey); !found {
-		config = make(map[string]interface{})
-		config[enabledKey] = false
-	} else {
-		// get monitoring output name to be used
-		monitoringOutputName := defaultOutputName
-		useOutputNode, found := transpiler.Lookup(rootAst, monitoringUseOutputKey)
-		if found {
-
-			monitoringOutputNameKey, ok := useOutputNode.Value().(*transpiler.StrVal)
-			if !ok {
-				return programsToRun, nil
-			}
-
-			monitoringOutputName = monitoringOutputNameKey.String()
-		}
+		monitoringNode := transpiler.NewDict([]transpiler.Node{
+			transpiler.NewKey("enabled", transpiler.NewBoolVal(true)),
+			transpiler.NewKey("logs", transpiler.NewBoolVal(true)),
+			transpiler.NewKey("metrics", transpiler.NewBoolVal(true)),
+			transpiler.NewKey("use_output", transpiler.NewStrVal("default")),
+		})
 
-		ast := rootAst.Clone()
-		if err := getMonitoringRule(monitoringOutputName).Apply(ast); err != nil {
-			return programsToRun, err
-		}
+		transpiler.Insert(rootAst, transpiler.NewKey("monitoring", monitoringNode), "settings")
+	}
 
-		config, err = ast.Map()
-		if err != nil {
-			return programsToRun, err
+	// get monitoring output name to be used
+	monitoringOutputName := defaultOutputName
+	useOutputNode, found := transpiler.Lookup(rootAst, monitoringUseOutputKey)
+	if found {
+		monitoringOutputNameKey, ok := useOutputNode.Value().(*transpiler.StrVal)
+		if !ok {
+			return programsToRun, nil
 		}
 
-		programList := make([]string, 0, len(programsToRun))
-		for _, p := range programsToRun {
-			programList = append(programList, p.Spec.Cmd)
-		}
-		// making program list part of the config
-		// so it will get regenerated with every change
-		config[programsKey] = programList
+		monitoringOutputName = monitoringOutputNameKey.String()
+	}
+
+	ast := rootAst.Clone()
+	if err := getMonitoringRule(monitoringOutputName).Apply(ast); err != nil {
+		return programsToRun, err
+	}
+
+	config, err = ast.Map()
+	if err != nil {
+		return programsToRun, err
+	}
+
+	programList := make([]string, 0, len(programsToRun))
+	for _, p := range programsToRun {
+		programList = append(programList, p.Spec.Cmd)
 	}
+	// making program list part of the config
+	// so it will get regenerated with every change
+	config[programsKey] = programList
 
 	monitoringProgram.Config, err = transpiler.NewAST(config)
 	if err != nil {