Skip to content

Commit 8a590f7

Browse files
obs-gh-mattcotterobs-gh-mattcotter
committed
feat: improve internal_telemetry agent configuration
1 parent f3f56e7 commit 8a590f7

File tree

7 files changed

+54
-24
lines changed

7 files changed

+54
-24
lines changed

‎internal/commands/status/statusretriever.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ func getMetricsSum(metrics []*io_prometheus_client.Metric) float64 {
109109
}
110110

111111
func GetAgentMetrics(conf *config.AgentConfig) (*AgentMetrics, error) {
112-
host := util.ReplaceEnvString(conf.InternalTelemetry.Host)
112+
host := util.ReplaceEnvString(conf.InternalTelemetry.Metrics.Host)
113113
if !strings.Contains(host, "://") {
114114
host = "http://" + host
115115
}
116116
host = strings.TrimRight(host, ":/")
117-
port := conf.InternalTelemetry.Port
117+
port := conf.InternalTelemetry.Metrics.Port
118118
baseURL := fmt.Sprintf("%s:%d", host, port)
119119
return GetAgentMetricsFromEndpoint(baseURL)
120120
}

‎internal/config/configschema.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,22 @@ type ForwardingConfig struct {
4949
Enabled bool `yaml:"enabled" mapstructure:"enabled" default:"true"`
5050
}
5151

52-
type InternalTelemetryConfig struct {
52+
type InternalTelemetryMetricsConfig struct {
5353
Enabled bool `yaml:"enabled" mapstructure:"enabled" default:"true"`
5454
Host string `yaml:"host" mapstructure:"host" default:"localhost"`
5555
Port int `yaml:"port" mapstructure:"port" default:"8888"`
56+
Level string `yaml:"level" mapstructure:"level" default:"detailed"`
57+
}
58+
59+
type InternalTelemetryLogsConfig struct {
60+
Enabled bool `yaml:"enabled" mapstructure:"enabled" default:"true"`
61+
Level string `yaml:"level" mapstructure:"level" default:"${env:OTEL_LOG_LEVEL}"`
62+
}
63+
64+
type InternalTelemetryConfig struct {
65+
Enabled bool `yaml:"enabled" mapstructure:"enabled" default:"true"`
66+
Metrics InternalTelemetryMetricsConfig `yaml:"metrics" mapstructure:"metrics"`
67+
Logs InternalTelemetryLogsConfig `yaml:"logs" mapstructure:"logs"`
5668
}
5769

5870
type AgentConfig struct {
@@ -62,7 +74,7 @@ type AgentConfig struct {
6274
Debug bool `yaml:"debug,omitempty" mapstructure:"debug"`
6375
HealthCheck HealthCheckConfig `yaml:"health_check" mapstructure:"health_check"`
6476
Forwarding ForwardingConfig `yaml:"forwarding" mapstructure:"forwarding"`
65-
InternalTelemetry InternalTelemetryConfig `yaml:"internal_telemetry,omitempty" mapstructure:"internal_telemetry"`
77+
InternalTelemetry InternalTelemetryConfig `yaml:"internal_telemetry" mapstructure:"internal_telemetry"`
6678
SelfMonitoring SelfMonitoringConfig `yaml:"self_monitoring,omitempty" mapstructure:"self_monitoring"`
6779
HostMonitoring HostMonitoringConfig `yaml:"host_monitoring,omitempty" mapstructure:"host_monitoring"`
6880
OtelConfigOverrides map[string]any `yaml:"otel_config_overrides,omitempty" mapstructure:"otel_config_overrides"`

‎internal/connections/confighandler.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ func SetEnvVars() error {
7777
os.Setenv("OBSERVE_AUTHORIZATION_HEADER", "Bearer "+token)
7878
os.Setenv("FILESTORAGE_PATH", GetDefaultFilestoragePath())
7979

80-
if debug {
81-
os.Setenv("OTEL_LOG_LEVEL", "DEBUG")
82-
} else {
83-
os.Setenv("OTEL_LOG_LEVEL", "INFO")
80+
if os.Getenv("OTEL_LOG_LEVEL") == "" {
81+
if debug {
82+
os.Setenv("OTEL_LOG_LEVEL", "DEBUG")
83+
} else {
84+
os.Setenv("OTEL_LOG_LEVEL", "INFO")
85+
}
8486
}
8587
return nil
8688
}

‎packaging/docker/observe-agent/connections/common/internal_telemetry.yaml.tmpl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
service:
22
telemetry:
3+
{{- if .InternalTelemetry.Metrics.Enabled }}
34
metrics:
4-
level: detailed
5+
level: {{ .InternalTelemetry.Metrics.Level }}
56
readers:
67
- pull:
78
exporter:
89
prometheus:
9-
host: {{ .InternalTelemetry.Host }}
10-
port: {{ .InternalTelemetry.Port }}
10+
host: {{ .InternalTelemetry.Metrics.Host }}
11+
port: {{ .InternalTelemetry.Metrics.Port }}
12+
{{- end }}
13+
{{- if .InternalTelemetry.Logs.Enabled }}
1114
logs:
12-
level: ${env:OTEL_LOG_LEVEL}
15+
level: {{ .InternalTelemetry.Logs.Level }}
16+
{{- end }}

‎packaging/linux/connections/common/internal_telemetry.yaml.tmpl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
service:
22
telemetry:
3+
{{- if .InternalTelemetry.Metrics.Enabled }}
34
metrics:
4-
level: detailed
5+
level: {{ .InternalTelemetry.Metrics.Level }}
56
readers:
67
- pull:
78
exporter:
89
prometheus:
9-
host: {{ .InternalTelemetry.Host }}
10-
port: {{ .InternalTelemetry.Port }}
10+
host: {{ .InternalTelemetry.Metrics.Host }}
11+
port: {{ .InternalTelemetry.Metrics.Port }}
12+
{{- end }}
13+
{{- if .InternalTelemetry.Logs.Enabled }}
1114
logs:
12-
level: ${env:OTEL_LOG_LEVEL}
15+
level: {{ .InternalTelemetry.Logs.Level }}
16+
{{- end }}

‎packaging/macos/connections/common/internal_telemetry.yaml.tmpl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
service:
22
telemetry:
3+
{{- if .InternalTelemetry.Metrics.Enabled }}
34
metrics:
4-
level: detailed
5+
level: {{ .InternalTelemetry.Metrics.Level }}
56
readers:
67
- pull:
78
exporter:
89
prometheus:
9-
host: {{ .InternalTelemetry.Host }}
10-
port: {{ .InternalTelemetry.Port }}
10+
host: {{ .InternalTelemetry.Metrics.Host }}
11+
port: {{ .InternalTelemetry.Metrics.Port }}
12+
{{- end }}
13+
{{- if .InternalTelemetry.Logs.Enabled }}
1114
logs:
12-
level: ${env:OTEL_LOG_LEVEL}
15+
level: {{ .InternalTelemetry.Logs.Level }}
16+
{{- end }}

‎packaging/windows/connections/common/internal_telemetry.yaml.tmpl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
service:
22
telemetry:
3+
{{- if .InternalTelemetry.Metrics.Enabled }}
34
metrics:
4-
level: detailed
5+
level: {{ .InternalTelemetry.Metrics.Level }}
56
readers:
67
- pull:
78
exporter:
89
prometheus:
9-
host: {{ .InternalTelemetry.Host }}
10-
port: {{ .InternalTelemetry.Port }}
10+
host: {{ .InternalTelemetry.Metrics.Host }}
11+
port: {{ .InternalTelemetry.Metrics.Port }}
12+
{{- end }}
13+
{{- if .InternalTelemetry.Logs.Enabled }}
1114
logs:
12-
level: ${env:OTEL_LOG_LEVEL}
15+
level: {{ .InternalTelemetry.Logs.Level }}
16+
{{- end }}

0 commit comments

Comments
 (0)