-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor SBOM configuration parameters (#16847)
- Loading branch information
Showing
22 changed files
with
340 additions
and
48 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ad_identifiers: | ||
| - _container_image | ||
| init_config: | ||
| instances: | ||
| - |
5 changes: 5 additions & 0 deletions
5
cmd/agent/dist/conf.d/container_lifecycle.d/conf.yaml.default
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ad_identifiers: | ||
| - _container_lifecycle | ||
| init_config: | ||
| instances: | ||
| - |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ad_identifiers: | ||
| - _sbom | ||
| init_config: | ||
| instances: | ||
| - |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // Unless explicitly stated otherwise all files in this repository are licensed | ||
| // under the Apache License Version 2.0. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| // Copyright 2023-present Datadog, Inc. | ||
|
|
||
| package listeners | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/DataDog/datadog-agent/pkg/autodiscovery/integration" | ||
| "github.com/DataDog/datadog-agent/pkg/config" | ||
| "github.com/DataDog/datadog-agent/pkg/util/containers" | ||
| ) | ||
|
|
||
| // StaticConfigListener implements a ServiceListener based on static configuration parameters | ||
| type StaticConfigListener struct { | ||
| newService chan<- Service | ||
| } | ||
|
|
||
| // StaticConfigService represents services generated from StaticConfigListener | ||
| type StaticConfigService struct { | ||
| adIdentifier string | ||
| } | ||
|
|
||
| // Make sure StaticConfigService implements the Service interface | ||
| var _ Service = &StaticConfigService{} | ||
|
|
||
| func init() { | ||
| Register("static config", NewStaticConfigListener) | ||
| } | ||
|
|
||
| // NewStaticConfigListener creates a StaticConfigListener | ||
| func NewStaticConfigListener(Config) (ServiceListener, error) { | ||
| return &StaticConfigListener{}, nil | ||
| } | ||
|
|
||
| // Listen starts the goroutine to detect checks based on the config | ||
| func (l *StaticConfigListener) Listen(newSvc chan<- Service, delSvc chan<- Service) { | ||
| l.newService = newSvc | ||
|
|
||
| go l.createServices() | ||
| } | ||
|
|
||
| // Stop has nothing to do in this case | ||
| func (l *StaticConfigListener) Stop() { | ||
| } | ||
|
|
||
| func (l *StaticConfigListener) createServices() { | ||
| for _, staticCheck := range []string{ | ||
| "container_image", | ||
| "container_lifecycle", | ||
| "sbom", | ||
| } { | ||
| if enabled := config.Datadog.GetBool(staticCheck + ".enabled"); enabled { | ||
| l.newService <- &StaticConfigService{adIdentifier: "_" + staticCheck} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // GetServiceID returns the unique entity name linked to that service | ||
| func (s *StaticConfigService) GetServiceID() string { | ||
| return s.adIdentifier | ||
| } | ||
|
|
||
| // GetTaggerEntity returns the tagger entity | ||
| func (s *StaticConfigService) GetTaggerEntity() string { | ||
| return "" | ||
| } | ||
|
|
||
| // GetADIdentifiers return the single AD identifier for a static config service | ||
| func (s *StaticConfigService) GetADIdentifiers(context.Context) ([]string, error) { | ||
| return []string{s.adIdentifier}, nil | ||
| } | ||
|
|
||
| // GetHosts is not supported | ||
| func (s *StaticConfigService) GetHosts(context.Context) (map[string]string, error) { | ||
| return nil, ErrNotSupported | ||
| } | ||
|
|
||
| // GetPorts returns nil and an error because port is not supported in this listener | ||
| func (s *StaticConfigService) GetPorts(context.Context) ([]ContainerPort, error) { | ||
| return nil, ErrNotSupported | ||
| } | ||
|
|
||
| // GetTags retrieves a container's tags | ||
| func (s *StaticConfigService) GetTags() ([]string, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| // GetPid inspect the container and return its pid | ||
| // Not relevant in this listener | ||
| func (s *StaticConfigService) GetPid(context.Context) (int, error) { | ||
| return -1, ErrNotSupported | ||
| } | ||
|
|
||
| // GetHostname returns nil and an error because port is not supported in this listener | ||
| func (s *StaticConfigService) GetHostname(context.Context) (string, error) { | ||
| return "", ErrNotSupported | ||
| } | ||
|
|
||
| // IsReady is always true | ||
| func (s *StaticConfigService) IsReady(context.Context) bool { | ||
| return true | ||
| } | ||
|
|
||
| // GetCheckNames is not supported | ||
| func (s *StaticConfigService) GetCheckNames(context.Context) []string { | ||
| return nil | ||
| } | ||
|
|
||
| // HasFilter is not supported | ||
| func (s *StaticConfigService) HasFilter(filter containers.FilterType) bool { | ||
| return false | ||
| } | ||
|
|
||
| // GetExtraConfig is not supported | ||
| func (s *StaticConfigService) GetExtraConfig(key string) (string, error) { | ||
| return "", ErrNotSupported | ||
| } | ||
|
|
||
| // FilterTemplates does nothing. | ||
| func (s *StaticConfigService) FilterTemplates(configs map[string]integration.Config) { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.