feat(fleet): Support integrations configuration in the Fleet Policies…

… dir (#31263)

cmd/agent/common/autodiscovery.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"path/filepath"
 	"time"
 
 	"go.uber.org/atomic"
@@ -41,6 +42,10 @@ var (
 )
 
 func setupAutoDiscovery(confSearchPaths []string, wmeta workloadmeta.Component, ac autodiscovery.Component) {
+	if pkgconfigsetup.Datadog().GetString("fleet_policies_dir") != "" {
+		confSearchPaths = append(confSearchPaths, filepath.Join(pkgconfigsetup.Datadog().GetString("fleet_policies_dir"), "conf.d"))
+	}
+
 	providers.InitConfigFilesReader(confSearchPaths)
 
 	acTelemetryStore := ac.GetTelemetryStore()

comp/core/flare/providers.go

@@ -53,6 +53,7 @@ func (f *flare) collectLogsFiles(fb types.FlareBuilder) error {
 func (f *flare) collectConfigFiles(fb types.FlareBuilder) error {
 	confSearchPaths := map[string]string{
 		"":        f.config.GetString("confd_path"),
+		"fleet":   filepath.Join(f.config.GetString("fleet_policies_dir"), "conf.d"),
 		"dist":    filepath.Join(f.params.distPath, "conf.d"),
 		"checksd": f.params.pythonChecksPath,
 	}

comp/core/gui/guiimpl/checks.go

@@ -42,9 +42,19 @@ var (
 		filepath.Join(defaultpaths.GetDistPath(), "checks.d"),    // Custom checks
 		pkgconfigsetup.Datadog().GetString("additional_checksd"), // Custom checks
 		defaultpaths.PyChecksPath,                                // Integrations-core checks
+		getFleetPoliciesPath(),                                   // Fleet Policies
 	}
 )
 
+// getFleetPoliciesPath returns the path to the fleet policies directory if it is set in the configuration
+// otherwise it returns an empty string
+func getFleetPoliciesPath() string {
+	if len(pkgconfigsetup.Datadog().GetString("fleet_policies_dir")) > 0 {
+		return filepath.Join(pkgconfigsetup.Datadog().GetString("fleet_policies_dir"), "conf.d")
+	}
+	return ""
+}
+
 // Adds the specific handlers for /checks/ endpoints
 func checkHandler(r *mux.Router, collector collector.Component, ac autodiscovery.Component) {
 	r.HandleFunc("/running", http.HandlerFunc(sendRunningChecks)).Methods("POST")
@@ -208,6 +218,9 @@ func getCheckConfigFile(w http.ResponseWriter, r *http.Request) {
 	var file []byte
 	var e error
 	for _, path := range configPaths {
+		if len(path) == 0 {
+			continue
+		}
 		filePath, err := securejoin.SecureJoin(path, fileName)
 		if err != nil {
 			log.Errorf("Error: Unable to join config path with the file name: %s", fileName)
@@ -443,7 +456,9 @@ func getConfigsInPath(path string) ([]string, error) {
 func listConfigs(w http.ResponseWriter, _ *http.Request) {
 	filenames := []string{}
 	for _, path := range configPaths {
-
+		if len(path) == 0 {
+			continue
+		}
 		configs, e := getConfigsInPath(path)
 		if e != nil {
 			log.Errorf("Unable to list configurations from %s: %v", path, e)