host info processor merge in user configurable overrides

modules/overrides/runtime_config_overrides.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/drone/envsubst"
 	"github.com/go-kit/log/level"
-
 	"github.com/grafana/dskit/runtimeconfig"
 	"github.com/grafana/dskit/services"
 	"github.com/prometheus/client_golang/prometheus"

modules/overrides/user_configurable_overrides.go

@@ -322,6 +322,20 @@ func (o *userConfigurableOverridesManager) MetricsGeneratorProcessorSpanMetricsT
 	return o.Interface.MetricsGeneratorProcessorSpanMetricsTargetInfoExcludedDimensions(userID)
 }
 
+func (o *userConfigurableOverridesManager) MetricsGeneratorProcessorHostInfoHostIdentifiers(userID string) []string {
+	if hostIdentifiers, ok := o.getTenantLimits(userID).GetMetricsGenerator().GetProcessor().GetHostInfo().GetHostIdentifiers(); ok {
+		return hostIdentifiers
+	}
+	return o.Interface.MetricsGeneratorProcessorHostInfoHostIdentifiers(userID)
+}
+
+func (o *userConfigurableOverridesManager) MetricsGeneratorProcessorHostInfoMetricName(userID string) string {
+	if metricName, ok := o.getTenantLimits(userID).GetMetricsGenerator().GetProcessor().GetHostInfo().GetMetricName(); ok {
+		return metricName
+	}
+	return o.Interface.MetricsGeneratorProcessorHostInfoMetricName(userID)
+}
+
 // statusUserConfigurableOverrides used to marshal userconfigurableoverrides.Limits for tenants
 type statusUserConfigurableOverrides struct {
 	TenantLimits tenantLimits `yaml:"user_configurable_overrides" json:"user_configurable_overrides"`

modules/overrides/user_configurable_overrides_test.go

@@ -397,7 +397,7 @@ func TestUserConfigOverridesManager_MergeRuntimeConfig(t *testing.T) {
 	assert.NotEqual(t, mgr.Forwarders(tenantID), baseMgr.Forwarders(tenantID))
 
 	// Processors will be the merged result between runtime and user-configurable overrides
-	assert.Equal(t, mgr.MetricsGeneratorProcessors(tenantID), map[string]struct{}{"local-blocks": {}, "service-graphs": {}, "span-metrics": {}})
+	assert.Equal(t, mgr.MetricsGeneratorProcessors(tenantID), map[string]struct{}{"local-blocks": {}, "service-graphs": {}, "span-metrics": {}, "host-info": {}})
 
 	// For the remaining settings runtime overrides will bubble up
 	assert.Equal(t, mgr.IngestionRateStrategy(), baseMgr.IngestionRateStrategy())
@@ -436,6 +436,8 @@ func TestUserConfigOverridesManager_MergeRuntimeConfig(t *testing.T) {
 	assert.Equal(t, mgr.MetricsGeneratorProcessorSpanMetricsEnableTargetInfo(tenantID), baseMgr.MetricsGeneratorProcessorSpanMetricsEnableTargetInfo(tenantID))
 	assert.Equal(t, mgr.MetricsGeneratorProcessorServiceGraphsEnableClientServerPrefix(tenantID), baseMgr.MetricsGeneratorProcessorServiceGraphsEnableClientServerPrefix(tenantID))
 	assert.Equal(t, mgr.MetricsGeneratorProcessorSpanMetricsTargetInfoExcludedDimensions(tenantID), baseMgr.MetricsGeneratorProcessorSpanMetricsTargetInfoExcludedDimensions(tenantID))
+	assert.Equal(t, mgr.MetricsGeneratorProcessorHostInfoHostIdentifiers(tenantID), baseMgr.MetricsGeneratorProcessorHostInfoHostIdentifiers(tenantID))
+	assert.Equal(t, mgr.MetricsGeneratorProcessorHostInfoMetricName(tenantID), baseMgr.MetricsGeneratorProcessorHostInfoMetricName(tenantID))
 	assert.Equal(t, mgr.BlockRetention(tenantID), baseMgr.BlockRetention(tenantID))
 	assert.Equal(t, mgr.MaxSearchDuration(tenantID), baseMgr.MaxSearchDuration(tenantID))
 	assert.Equal(t, mgr.DedicatedColumns(tenantID), baseMgr.DedicatedColumns(tenantID))
@@ -462,7 +464,7 @@ func perTenantRuntimeOverrides(tenantID string) *perTenantOverrides {
 				},
 				MetricsGenerator: MetricsGeneratorOverrides{
 					RingSize:           2,
-					Processors:         listtomap.ListToMap{"span-metrics": {}, "service-graphs": {}},
+					Processors:         listtomap.ListToMap{"span-metrics": {}, "service-graphs": {}, "host-info": {}},
 					MaxActiveSeries:    60000,
 					CollectionInterval: 15 * time.Second,
 					DisableCollection:  false,
@@ -494,6 +496,10 @@ func perTenantRuntimeOverrides(tenantID string) *perTenantOverrides {
 							TraceIdlePeriod:      20 * time.Second,
 							CompleteBlockTimeout: 30 * time.Second,
 						},
+						HostInfo: HostInfoOverrides{
+							HostIdentifiers: []string{"host.name"},
+							MetricName:      "override_host_info",
+						},
 					},
 					IngestionSlack: 0,
 				},

modules/overrides/userconfigurable/client/limits.go

@@ -90,6 +90,13 @@ func (l *LimitsMetricsGeneratorProcessor) GetSpanMetrics() *LimitsMetricsGenerat
 	return nil
 }
 
+func (l *LimitsMetricsGeneratorProcessor) GetHostInfo() *LimitsMetricGeneratorProcessorHostInfo {
+	if l != nil {
+		return &l.HostInfo
+	}
+	return nil
+}
+
 type LimitsMetricsGeneratorProcessorServiceGraphs struct {
 	Dimensions                            *[]string  `yaml:"dimensions,omitempty" json:"dimensions,omitempty"`
 	EnableClientServerPrefix              *bool      `yaml:"enable_client_server_prefix,omitempty" json:"enable_client_server_prefix,omitempty"`