Chane fleetmode detection to ony use management.enabled

michel-laterman · michel-laterman · commit b333c14b9133 · 2021-06-07T09:26:01.000-07:00
Fleetmode detection has been changed ton only use the enabled flag as
fleet is now the only management mode available.
diff --git a/libbeat/common/fleetmode/fleet_mode.go b/libbeat/common/fleetmode/fleet_mode.go
@@ -25,11 +25,10 @@ import (
 
 // Enabled checks to see if filebeat/metricbeat is running under Agent
 // The management setting is stored in the main Beat runtime object, but we can't see that from a module
-// So instead we check the CLI flags, since Agent starts filebeat/metricbeat with "-E", "management.mode=x-pack-fleet", "-E", "management.enabled=true"
+// So instead we check the CLI flags, since Agent starts filebeat/metricbeat with "-E", "management.enabled=true"
 func Enabled() bool {
 	type management struct {
-		Mode    string `config:"management.mode"`
-		Enabled bool   `config:"management.enabled"`
+		Enabled bool `config:"management.enabled"`
 	}
 	var managementSettings management
 
@@ -46,8 +45,5 @@ func Enabled() bool {
 		return false
 	}
 
-	if managementSettings.Enabled == true && managementSettings.Mode == "x-pack-fleet" {
-		return true
-	}
-	return false
+	return managementSettings.Enabled
 }
