added labels to the config and cli

internal/config/config.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
+	"strconv"
 	"strings"
 	"time"
 
@@ -104,6 +105,7 @@ func ResolveConfig() (*Config, error) {
 		Common:             resolveCommon(),
 		Watchers:           resolveWatchers(),
 		Features:           viperInstance.GetStringSlice(FeaturesKey),
+		Labels:             resolveLabels(),
 	}
 
 	slog.Debug("Agent config", "config", config)
@@ -202,6 +204,7 @@ func registerFlags() {
 		"A comma-separated list of features enabled for the agent.",
 	)
 
+	registerCommonFlags(fs)
 	registerCommandFlags(fs)
 	registerCollectorFlags(fs)
 
@@ -218,6 +221,14 @@ func registerFlags() {
 	})
 }
 
+func registerCommonFlags(fs *flag.FlagSet) {
+	fs.StringToString(
+		LabelsRootKey,
+		DefaultLabels(),
+		"A list of labels associated with these instances",
+	)
+}
+
 func registerCommandFlags(fs *flag.FlagSet) {
 	fs.String(
 		CommandServerHostKey,
@@ -406,6 +417,36 @@ func resolveLog() *Log {
 	}
 }
 
+func resolveLabels() map[string]interface{} {
+	input := viperInstance.GetStringMapString(LabelsRootKey)
+	result := make(map[string]interface{})
+
+	for key, value := range input {
+		// Try to parse as an integer
+		if intValue, err := strconv.Atoi(value); err == nil {
+			result[key] = intValue
+			continue
+		}
+
+		// Try to parse as a float
+		if floatValue, err := strconv.ParseFloat(value, 64); err == nil {
+			result[key] = floatValue
+			continue
+		}
+
+		// Try to parse as a boolean
+		if boolValue, err := strconv.ParseBool(value); err == nil {
+			result[key] = boolValue
+			continue
+		}
+
+		// If no conversion was possible, keep it as a string
+		result[key] = value
+	}
+
+	return result
+}
+
 func resolveDataPlaneConfig() *DataPlaneConfig {
 	return &DataPlaneConfig{
 		Nginx: &NginxDataPlaneConfig{

internal/config/config_test.go

@@ -107,6 +107,7 @@ func TestRegisterFlags(t *testing.T) {
 	assert.Equal(t, "warn", viperInstance.GetString(LogLevelKey))
 	assert.Equal(t, "/var/log/test/agent.log", viperInstance.GetString(LogPathKey))
 	assert.Equal(t, 10*time.Second, viperInstance.GetDuration(ClientTimeoutKey))
+	assert.Equal(t, map[string]string{}, viperInstance.GetStringMapString(LabelsRootKey))
 }
 
 func TestSeekFileInPaths(t *testing.T) {

internal/config/defaults.go

@@ -91,3 +91,7 @@ func DefaultAllowedDirectories() []string {
 		"/var/log/nginx",
 	}
 }
+
+func DefaultLabels() map[string]string {
+	return map[string]string{}
+}

internal/config/flags.go

@@ -14,6 +14,7 @@ const (
 	ConfigPathKey                               = "path"
 	CommandRootKey                              = "command"
 	DataPlaneConfigRootKey                      = "data_plane_config"
+	LabelsRootKey                               = "labels"
 	LogLevelRootKey                             = "log"
 	CollectorRootKey                            = "collector"
 	VersionKey                                  = "version"

internal/config/types.go

@@ -45,6 +45,7 @@ type (
 		UUID               string           `yaml:"-"`
 		AllowedDirectories []string         `yaml:"-" mapstructure:"allowed_directories"`
 		Features           []string         `yaml:"-"`
+		Labels             map[string]any   `yaml:"-" mapstructure:"labels"`
 	}
 
 	Log struct {