Skip to content

Commit

Permalink
code review
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Aug 3, 2023
1 parent f0936cc commit 8ef36d2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
3 changes: 3 additions & 0 deletions cmd/otelcol/config/collector/agent_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ exporters:
verbosity: detailed

service:
telemetry:
metrics:
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
extensions: [health_check, http_forwarder, zpages, memory_ballast, smartagent]
pipelines:
traces:
Expand Down
3 changes: 3 additions & 0 deletions cmd/otelcol/config/collector/gateway_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ exporters:
log_data_enabled: false

service:
telemetry:
metrics:
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
extensions: [health_check, http_forwarder, zpages, memory_ballast]
pipelines:
traces:
Expand Down
10 changes: 4 additions & 6 deletions tests/general/default_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ func TestDefaultGatewayConfig(t *testing.T) {
"",
func(collector testutils.Collector) testutils.Collector {
return collector.WithArgs().WithEnv(map[string]string{
"SPLUNK_LISTEN_INTERFACE": "0.0.0.0",
"SPLUNK_ACCESS_TOKEN": "not.real",
"SPLUNK_REALM": "not.real",
"SPLUNK_ACCESS_TOKEN": "not.real",
"SPLUNK_REALM": "not.real",
})
},
)
Expand Down Expand Up @@ -198,9 +197,8 @@ func TestDefaultAgentConfig(t *testing.T) {
return collector.WithArgs(
"--config", "/etc/otel/collector/agent_config.yaml",
).WithEnv(map[string]string{
"SPLUNK_LISTEN_INTERFACE": "0.0.0.0",
"SPLUNK_ACCESS_TOKEN": "not.real",
"SPLUNK_REALM": "not.real",
"SPLUNK_ACCESS_TOKEN": "not.real",
"SPLUNK_REALM": "not.real",
})
},
)
Expand Down

0 comments on commit 8ef36d2

Please sign in to comment.