fix direct agent configuration

agentcfg/fetch.go

@@ -65,7 +65,7 @@ type Fetcher interface {
 
 // NewFetcher returns a new Fetcher based on the provided config.
 func NewFetcher(cfg *config.Config) Fetcher {
-	if cfg.AgentConfigs != nil {
+	if cfg.AgentConfigs != nil || !cfg.Kibana.Enabled {
 		// Direct agent configuration is present, disable communication
 		// with kibana.
 		return NewDirectFetcher(cfg.AgentConfigs)

beater/beater.go

@@ -308,6 +308,11 @@ func newServerRunner(ctx context.Context, args serverRunnerParams) (*serverRunne
 	if cfg.DataStreams.Enabled && args.KibanaConfig != nil {
 		cfg.Kibana.ClientConfig = *args.KibanaConfig
 	}
+	if args.Beat.Manager != nil && args.Beat.Manager.Enabled() {
+		// If we're running in managed mode we do not want to
+		// communicate with kibana.
+		cfg.Kibana.Enabled = false
+	}
 
 	runServerContext, cancel := context.WithCancel(ctx)
 	return &serverRunner{

beater/config/config.go

@@ -43,7 +43,6 @@ const (
 )
 
 var (
-	errInvalidAgentConfigServiceName   = errors.New("agent_config: either service.name or service.environment must be set")
 	errInvalidAgentConfigMissingConfig = errors.New("agent_config: no config set")
 )
 
@@ -113,9 +112,6 @@ type AgentConfig struct {
 }
 
 func (s *AgentConfig) setup() error {
-	if !s.Service.isValid() {
-		return errInvalidAgentConfigServiceName
-	}
 	if s.Config == nil {
 		return errInvalidAgentConfigMissingConfig
 	}
@@ -148,10 +144,6 @@ func (s *Service) String() string {
 	return strings.Join([]string{name, env}, " ")
 }
 
-func (s *Service) isValid() bool {
-	return s.Name != "" || s.Environment != ""
-}
-
 // ExpvarConfig holds config information about exposing expvar
 type ExpvarConfig struct {
 	Enabled *bool  `config:"enabled"`