added agent config var

Author: aphralG

internal/config/config.go

@@ -755,6 +755,14 @@ func registerCollectorFlags(fs *flag.FlagSet) {
 		"The path to the Opentelemetry Collector configuration file.",
 	)
 
+	fs.StringSlice(
+		CollectorAdditionalConfigPathsKey,
+		[]string{},
+		"Paths to additional OpenTelemetry Collector configuration files. The order of the configuration files"+
+			" determines which config file takes priority. The last config file will take precedent over other files "+
+			"if they have the same setting. Paths to configuration files must be absolute",
+	)
+
 	fs.String(
 		CollectorLogLevelKey,
 		DefCollectorLogLevel,
@@ -1054,6 +1062,7 @@ func resolveCollector(allowedDirs []string) (*Collector, error) {
 
 	col := &Collector{
 		ConfigPath: viperInstance.GetString(CollectorConfigPathKey),
+		AdditionalPaths: viperInstance.GetStringSlice(CollectorAdditionalConfigPathsKey),
 		Exporters:  exporters,
 		Processors: resolveProcessors(),
 		Receivers:  receivers,

internal/config/config_test.go

@@ -1112,6 +1112,7 @@ func createConfig() *Config {
 		},
 		Collector: &Collector{
 			ConfigPath: "/etc/nginx-agent/nginx-agent-otelcol.yaml",
+			AdditionalPaths: []string{"/configs/my_config.yaml", "/etc/nginx-agent/nginx-agent-otelcol.yaml"},
 			Exporters: Exporters{
 				OtlpExporters: map[string]*OtlpExporter{
 					"default": {

internal/config/defaults.go

@@ -85,13 +85,13 @@ const (
 	DefFileWatcherMonitoringFrequency           = 5 * time.Second
 
 	// Collector defaults
-	DefCollectorConfigPath  = "/etc/nginx-agent/opentelemetry-collector-agent.yaml"
-	DefCollectorLogLevel    = "INFO"
-	DefCollectorLogPath     = "/var/log/nginx-agent/opentelemetry-collector-agent.log"
-	DefCollectorTLSCertPath = "/var/lib/nginx-agent/cert.pem"
-	DefCollectorTLSKeyPath  = "/var/lib/nginx-agent/key.pem"
-	DefCollectorTLSCAPath   = "/var/lib/nginx-agent/ca.pem"
-	DefCollectorTLSSANNames = "127.0.0.1,::1,localhost"
+	DefCollectorConfigPath            = "/etc/nginx-agent/opentelemetry-collector-agent.yaml"
+	DefCollectorLogLevel              = "INFO"
+	DefCollectorLogPath               = "/var/log/nginx-agent/opentelemetry-collector-agent.log"
+	DefCollectorTLSCertPath           = "/var/lib/nginx-agent/cert.pem"
+	DefCollectorTLSKeyPath            = "/var/lib/nginx-agent/key.pem"
+	DefCollectorTLSCAPath             = "/var/lib/nginx-agent/ca.pem"
+	DefCollectorTLSSANNames           = "127.0.0.1,::1,localhost"
 
 	DefCollectorMetricsBatchProcessorSendBatchSize    = 1000
 	DefCollectorMetricsBatchProcessorSendBatchMaxSize = 1000

internal/config/flags.go

@@ -48,6 +48,7 @@ var (
 	ClientBackoffMultiplierKey          = pre(ClientRootKey) + "backoff_multiplier"
 
 	CollectorConfigPathKey                      = pre(CollectorRootKey) + "config_path"
+	CollectorAdditionalConfigPathsKey           = pre(CollectorRootKey) + "additional_config_paths"
 	CollectorExportersKey                       = pre(CollectorRootKey) + "exporters"
 	CollectorDebugExporterKey                   = pre(CollectorExportersKey) + "debug"
 	CollectorPrometheusExporterKey              = pre(CollectorExportersKey) + "prometheus"

internal/config/testdata/nginx-agent.conf

@@ -94,6 +94,9 @@ auxiliary_command:
 
 collector:
   config_path: "/etc/nginx-agent/nginx-agent-otelcol.yaml"
+  additional_config_paths:
+    - "/configs/my_config.yaml"
+    - /etc/nginx-agent/nginx-agent-otelcol.yaml
   receivers:
     otlp:
       "default":

internal/config/types.go

@@ -106,6 +106,7 @@ type (
 
 	Collector struct {
 		ConfigPath string     `yaml:"config_path" mapstructure:"config_path"`
+		AdditionalPaths []string `yaml:"additional_config_paths" mapstructure:"additional_config_paths"`
 		Log        *Log       `yaml:"log"         mapstructure:"log"`
 		Exporters  Exporters  `yaml:"exporters"   mapstructure:"exporters"`
 		Extensions Extensions `yaml:"extensions"  mapstructure:"extensions"`