Pass down managed/standalone info

Signed-off-by: ChrsMark <[email protected]>
elastic · Aug 31, 2022 · 3761e5b · 3761e5b
1 parent 9d3e2f8
commit 3761e5b
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 42 deletions.
diff --git a/internal/pkg/agent/application/local_mode.go b/internal/pkg/agent/application/local_mode.go
@@ -114,7 +114,7 @@ func newLocal(
 	}
 	localApplication.router = router
 
-	composableCtrl, err := composable.New(log, rawConfig)
+	composableCtrl, err := composable.New(log, rawConfig, false)
 	if err != nil {
 		return nil, errors.New(err, "failed to initialize composable controller")
 	}

diff --git a/internal/pkg/agent/application/managed_mode.go b/internal/pkg/agent/application/managed_mode.go
@@ -141,7 +141,7 @@ func newManaged(
 	}
 	managedApplication.router = router
 
-	composableCtrl, err := composable.New(log, rawConfig)
+	composableCtrl, err := composable.New(log, rawConfig, true)
 	if err != nil {
 		return nil, errors.New(err, "failed to initialize composable controller")
 	}

diff --git a/internal/pkg/agent/application/managed_mode_test.go b/internal/pkg/agent/application/managed_mode_test.go
@@ -45,7 +45,7 @@ func TestManagedModeRouting(t *testing.T) {
 	router, _ := router.New(log, streamFn)
 	agentInfo, _ := info.NewAgentInfo(true)
 	nullStore := &storage.NullStore{}
-	composableCtrl, _ := composable.New(log, nil)
+	composableCtrl, _ := composable.New(log, nil, true)
 	emit, err := emitter.New(ctx, log, agentInfo, composableCtrl, router, &pipeline.ConfigModifiers{Decorators: []pipeline.DecoratorFunc{modifiers.InjectMonitoring}}, nil)
 	require.NoError(t, err)
 

diff --git a/internal/pkg/agent/cmd/inspect.go b/internal/pkg/agent/cmd/inspect.go
@@ -258,7 +258,7 @@ func getProgramsFromConfig(log *logger.Logger, agentInfo *info.AgentInfo, cfg *c
 	router := &inmemRouter{}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	composableCtrl, err := composable.New(log, cfg)
+	composableCtrl, err := composable.New(log, cfg, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/pkg/agent/install/uninstall.go b/internal/pkg/agent/install/uninstall.go
@@ -250,7 +250,7 @@ func applyDynamics(ctx context.Context, log *logger.Logger, cfg *config.Config)
 			})
 		}
 
-		ctrl, err := composable.New(log, cfg)
+		ctrl, err := composable.New(log, cfg, false)
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/pkg/composable/context.go b/internal/pkg/composable/context.go
@@ -14,7 +14,7 @@ import (
 )
 
 // ContextProviderBuilder creates a new context provider based on the given config and returns it.
-type ContextProviderBuilder func(log *logger.Logger, config *config.Config) (corecomp.ContextProvider, error)
+type ContextProviderBuilder func(log *logger.Logger, config *config.Config, managed bool) (corecomp.ContextProvider, error)
 
 // AddContextProvider adds a new ContextProviderBuilder
 func (r *providerRegistry) AddContextProvider(name string, builder ContextProviderBuilder) error {

diff --git a/internal/pkg/composable/controller.go b/internal/pkg/composable/controller.go
@@ -40,7 +40,7 @@ type controller struct {
 }
 
 // New creates a new controller.
-func New(log *logger.Logger, c *config.Config) (Controller, error) {
+func New(log *logger.Logger, c *config.Config, managed bool) (Controller, error) {
 	l := log.Named("composable")
 
 	var providersCfg Config
@@ -59,7 +59,7 @@ func New(log *logger.Logger, c *config.Config) (Controller, error) {
 			// explicitly disabled; skipping
 			continue
 		}
-		provider, err := builder(l, pCfg)
+		provider, err := builder(l, pCfg, managed)
 		if err != nil {
 			return nil, errors.New(err, fmt.Sprintf("failed to build provider '%s'", name), errors.TypeConfig, errors.M("provider", name))
 		}
@@ -76,7 +76,7 @@ func New(log *logger.Logger, c *config.Config) (Controller, error) {
 			// explicitly disabled; skipping
 			continue
 		}
-		provider, err := builder(l.Named(strings.Join([]string{"providers", name}, ".")), pCfg)
+		provider, err := builder(l.Named(strings.Join([]string{"providers", name}, ".")), pCfg, managed)
 		if err != nil {
 			return nil, errors.New(err, fmt.Sprintf("failed to build provider '%s'", name), errors.TypeConfig, errors.M("provider", name))
 		}

diff --git a/internal/pkg/composable/controller_test.go b/internal/pkg/composable/controller_test.go
@@ -77,7 +77,7 @@ func TestController(t *testing.T) {
 
 	log, err := logger.New("", false)
 	require.NoError(t, err)
-	c, err := composable.New(log, cfg)
+	c, err := composable.New(log, cfg, false)
 	require.NoError(t, err)
 
 	var wg sync.WaitGroup

diff --git a/internal/pkg/composable/dynamic.go b/internal/pkg/composable/dynamic.go
@@ -34,7 +34,7 @@ type DynamicProvider interface {
 }
 
 // DynamicProviderBuilder creates a new dynamic provider based on the given config and returns it.
-type DynamicProviderBuilder func(log *logger.Logger, config *config.Config) (DynamicProvider, error)
+type DynamicProviderBuilder func(log *logger.Logger, config *config.Config, managed bool) (DynamicProvider, error)
 
 // AddDynamicProvider adds a new DynamicProviderBuilder
 func (r *providerRegistry) AddDynamicProvider(name string, builder DynamicProviderBuilder) error {

diff --git a/internal/pkg/composable/providers/agent/agent.go b/internal/pkg/composable/providers/agent/agent.go
@@ -42,6 +42,6 @@ func (*contextProvider) Run(comm corecomp.ContextProviderComm) error {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(_ *logger.Logger, _ *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(_ *logger.Logger, _ *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	return &contextProvider{}, nil
 }
diff --git a/internal/pkg/composable/providers/docker/docker.go b/internal/pkg/composable/providers/docker/docker.go
@@ -105,7 +105,7 @@ func (c *dynamicProvider) Run(comm composable.DynamicProviderComm) error {
 }
 
 // DynamicProviderBuilder builds the dynamic provider.
-func DynamicProviderBuilder(logger *logger.Logger, c *config.Config) (composable.DynamicProvider, error) {
+func DynamicProviderBuilder(logger *logger.Logger, c *config.Config, managed bool) (composable.DynamicProvider, error) {
 	var cfg Config
 	if c == nil {
 		c = config.New()

diff --git a/internal/pkg/composable/providers/env/env.go b/internal/pkg/composable/providers/env/env.go
@@ -31,7 +31,7 @@ func (*contextProvider) Run(comm corecomp.ContextProviderComm) error {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(_ *logger.Logger, _ *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(_ *logger.Logger, _ *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	return &contextProvider{}, nil
 }
 

diff --git a/internal/pkg/composable/providers/host/host.go b/internal/pkg/composable/providers/host/host.go
@@ -81,7 +81,7 @@ func (c *contextProvider) Run(comm corecomp.ContextProviderComm) error {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(log *logger.Logger, c *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(log *logger.Logger, c *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	p := &contextProvider{
 		logger:  log,
 		fetcher: getHostInfo,

diff --git a/internal/pkg/composable/providers/kubernetes/kubernetes.go b/internal/pkg/composable/providers/kubernetes/kubernetes.go
@@ -34,12 +34,13 @@ func init() {
 }
 
 type dynamicProvider struct {
-	logger *logger.Logger
-	config *Config
+	logger  *logger.Logger
+	config  *Config
+	managed bool
 }
 
 // DynamicProviderBuilder builds the dynamic provider.
-func DynamicProviderBuilder(logger *logger.Logger, c *config.Config) (composable.DynamicProvider, error) {
+func DynamicProviderBuilder(logger *logger.Logger, c *config.Config, managed bool) (composable.DynamicProvider, error) {
 	var cfg Config
 	if c == nil {
 		c = config.New()
@@ -49,7 +50,7 @@ func DynamicProviderBuilder(logger *logger.Logger, c *config.Config) (composable
 		return nil, errors.New(err, "failed to unpack configuration")
 	}
 
-	return &dynamicProvider{logger, &cfg}, nil
+	return &dynamicProvider{logger, &cfg, managed}, nil
 }
 
 // Run runs the kubernetes context provider.
@@ -139,19 +140,19 @@ func (p *dynamicProvider) newEventer(
 	client k8s.Interface) (Eventer, error) {
 	switch resourceType {
 	case "pod":
-		eventer, err := NewPodEventer(comm, p.config, p.logger, client, p.config.Scope)
+		eventer, err := NewPodEventer(comm, p.config, p.logger, client, p.config.Scope, p.managed)
 		if err != nil {
 			return nil, err
 		}
 		return eventer, nil
 	case nodeScope:
-		eventer, err := NewNodeEventer(comm, p.config, p.logger, client, p.config.Scope)
+		eventer, err := NewNodeEventer(comm, p.config, p.logger, client, p.config.Scope, p.managed)
 		if err != nil {
 			return nil, err
 		}
 		return eventer, nil
 	case "service":
-		eventer, err := NewServiceEventer(comm, p.config, p.logger, client, p.config.Scope)
+		eventer, err := NewServiceEventer(comm, p.config, p.logger, client, p.config.Scope, p.managed)
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/pkg/composable/providers/kubernetes/pod.go b/internal/pkg/composable/providers/kubernetes/pod.go
@@ -6,12 +6,12 @@ package kubernetes
 
 import (
 	"fmt"
+	"github.com/elastic/elastic-agent-autodiscover/utils"
 	"sync"
 	"time"
 
 	"github.com/elastic/elastic-agent-autodiscover/kubernetes"
 	"github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata"
-	"github.com/elastic/elastic-agent-autodiscover/utils"
 	c "github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
@@ -32,6 +32,7 @@ type pod struct {
 	config           *Config
 	logger           *logp.Logger
 	scope            string
+	managed          bool
 	cleanupTimeout   time.Duration
 
 	// Mutex used by configuration updates not triggered by the main watcher,
@@ -52,7 +53,8 @@ func NewPodEventer(
 	cfg *Config,
 	logger *logp.Logger,
 	client k8s.Interface,
-	scope string) (Eventer, error) {
+	scope string,
+	managed bool) (Eventer, error) {
 	watcher, err := kubernetes.NewNamedWatcher("agent-pod", client, &kubernetes.Pod{}, kubernetes.WatchOptions{
 		SyncTimeout:  cfg.SyncPeriod,
 		Node:         cfg.Node,
@@ -96,6 +98,7 @@ func NewPodEventer(
 		watcher:          watcher,
 		nodeWatcher:      nodeWatcher,
 		namespaceWatcher: namespaceWatcher,
+		managed:          managed,
 	}
 
 	watcher.AddEventHandler(p)
@@ -152,19 +155,21 @@ func (p *pod) emitRunning(pod *kubernetes.Pod) {
 	data.mapping["scope"] = p.scope
 
 	if p.config.Hints.Enabled() { // This is "hints based autodiscovery flow"
-		if ann, ok := data.mapping["annotations"]; ok {
-			annotations := ann.(mapstr.M)
-			hints := utils.GenerateHints(annotations, "", p.config.Prefix)
-			if len(hints) > 0 {
-				p.logger.Errorf("Extracted hints are :%v", hints)
-				hintsMapping := GenerateHintsMapping(hints, data.mapping, p.logger)
-				p.logger.Errorf("Generated hints mappings are :%v", hintsMapping)
-				_ = p.comm.AddOrUpdate(
-					data.uid,
-					PodPriority,
-					map[string]interface{}{"hints": hintsMapping},
-					data.processors, // TODO: add processors here explicitely ->>> NOOOO
-				)
+		if !p.managed {
+			if ann, ok := data.mapping["annotations"]; ok {
+				annotations := ann.(mapstr.M)
+				hints := utils.GenerateHints(annotations, "", p.config.Prefix)
+				if len(hints) > 0 {
+					p.logger.Errorf("Extracted hints are :%v", hints)
+					hintsMapping := GenerateHintsMapping(hints, data.mapping, p.logger)
+					p.logger.Errorf("Generated hints mappings are :%v", hintsMapping)
+					_ = p.comm.AddOrUpdate(
+						data.uid,
+						PodPriority,
+						map[string]interface{}{"hints": hintsMapping},
+						data.processors, // TODO: add processors here explicitely ->>> NOOOO
+					)
+				}
 			}
 		}
 	} else { // This is the "template-based autodiscovery" flow

diff --git a/internal/pkg/composable/providers/kubernetesleaderelection/kubernetes_leaderelection.go b/internal/pkg/composable/providers/kubernetesleaderelection/kubernetes_leaderelection.go
@@ -35,7 +35,7 @@ type contextProvider struct {
 }
 
 // ContextProviderBuilder builds the provider.
-func ContextProviderBuilder(logger *logger.Logger, c *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(logger *logger.Logger, c *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	var cfg Config
 	if c == nil {
 		c = config.New()

diff --git a/internal/pkg/composable/providers/kubernetessecrets/kubernetes_secrets.go b/internal/pkg/composable/providers/kubernetessecrets/kubernetes_secrets.go
@@ -34,7 +34,7 @@ type contextProviderK8sSecrets struct {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(logger *logger.Logger, c *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(logger *logger.Logger, c *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	var cfg Config
 	if c == nil {
 		c = config.New()

diff --git a/internal/pkg/composable/providers/local/local.go b/internal/pkg/composable/providers/local/local.go
@@ -32,7 +32,7 @@ func (c *contextProvider) Run(comm corecomp.ContextProviderComm) error {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(_ *logger.Logger, c *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(_ *logger.Logger, c *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	p := &contextProvider{}
 	if c != nil {
 		err := c.Unpack(p)

diff --git a/internal/pkg/composable/providers/localdynamic/localdynamic.go b/internal/pkg/composable/providers/localdynamic/localdynamic.go
@@ -41,7 +41,7 @@ func (c *dynamicProvider) Run(comm composable.DynamicProviderComm) error {
 }
 
 // DynamicProviderBuilder builds the dynamic provider.
-func DynamicProviderBuilder(_ *logger.Logger, c *config.Config) (composable.DynamicProvider, error) {
+func DynamicProviderBuilder(_ *logger.Logger, c *config.Config, managed bool) (composable.DynamicProvider, error) {
 	p := &dynamicProvider{}
 	if c != nil {
 		err := c.Unpack(p)

diff --git a/internal/pkg/composable/providers/path/path.go b/internal/pkg/composable/providers/path/path.go
@@ -34,6 +34,6 @@ func (*contextProvider) Run(comm corecomp.ContextProviderComm) error {
 }
 
 // ContextProviderBuilder builds the context provider.
-func ContextProviderBuilder(_ *logger.Logger, _ *config.Config) (corecomp.ContextProvider, error) {
+func ContextProviderBuilder(_ *logger.Logger, _ *config.Config, managed bool) (corecomp.ContextProvider, error) {
 	return &contextProvider{}, nil
 }