Skip to content

Commit e5160f1

Browse files
dmitryaxdmitryax
committed
Deprecate SPLUNK_TRACE_URL env var and don't use it in default configs
Deprecate `SPLUNK_TRACE_URL` environment variable and replace with `${SPLUNK_INGEST_URL}/v2/trace`in the default configs. `SPLUNK_TRACE_URL` is still automatically set in the binary computed from on `SPLUNK_REALM` or `SPLUNK_INGEST_URL` environment variables to not break existing configurations. However, it is recommended to update the configurations to use `${SPLUNK_INGEST_URL}/v2/trace` instead. Also, packaging and mass deployment solutions were update to not provide the option to set the Trace URL since it's not being used anymore in the default configs.
1 parent 7f963ba commit e5160f1

File tree

49 files changed

+190
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+190
-175
lines changed

‎.github/workflows/scripts/win-test-services.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ $expected_svc_env_vars = @{
4444
"SPLUNK_REALM" = "$realm";
4545
"SPLUNK_API_URL" = "$api_url";
4646
"SPLUNK_INGEST_URL" = "$ingest_url";
47-
"SPLUNK_TRACE_URL" = "${ingest_url}/v2/trace";
4847
"SPLUNK_HEC_URL" = "${ingest_url}/v1/log";
4948
"SPLUNK_HEC_TOKEN" = "$access_token";
5049
"SPLUNK_BUNDLE_DIR" = "${env:PROGRAMFILES}\Splunk\OpenTelemetry Collector\agent-bundle";

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
## Unreleased
44

5+
### 🚩Deprecations 🚩
6+
7+
- (Splunk) `SPLUNK_TRACE_URL` environment variable is deprecated. It's replaced with `${SPLUNK_INGEST_URL}/v2/trace`
8+
in the default configs. Default value for `SPLUNK_TRACE_URL` is still set in the binary from `SPLUNK_REALM` or
9+
`SPLUNK_INGEST_URL` environment variables to not break existing configurations. However, it is recommended to
10+
update the configurations to use `${SPLUNK_INGEST_URL}/v2/trace` instead. ([#5672](https://github.com/signalfx/splunk-otel-collector/pull/5672)).
11+
12+
### 🛑 Breaking changes 🛑
13+
14+
- (Splunk) Given that `SPLUNK_TRACE_URL` environment variable is deprecated and replaced with
15+
`${SPLUNK_INGEST_URL}/v2/trace` in the default configurations, the option to set the Trace URL has been removed from
16+
all packaging and mass deployment solutions to an avoid confusion. ([#5672](https://github.com/signalfx/splunk-otel-collector/pull/5672)).
17+
518
### 🧰 Bug fixes 🧰
619

720
- (Splunk) `receiver/journald`: Upgrade journald client libraries in the Collector docker image by taking them from latest Debian image.

‎cmd/otelcol/config/collector/agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
1111
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
1212
# - SPLUNK_LISTEN_INTERFACE: The network interface the agent receivers listen on.
13-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1413

1514
extensions:
1615
health_check:
@@ -129,7 +128,7 @@ exporters:
129128
# Traces
130129
sapm:
131130
access_token: "${SPLUNK_ACCESS_TOKEN}"
132-
endpoint: "${SPLUNK_TRACE_URL}"
131+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
133132
# Metrics + Events
134133
signalfx:
135134
access_token: "${SPLUNK_ACCESS_TOKEN}"

‎cmd/otelcol/config/collector/upstream_agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# - SPLUNK_HEC_TOKEN: The Splunk HEC authentication token
1313
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
1414
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
15-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1615

1716
extensions:
1817
health_check:
@@ -123,7 +122,7 @@ exporters:
123122
# Traces
124123
sapm:
125124
access_token: "${SPLUNK_ACCESS_TOKEN}"
126-
endpoint: "${SPLUNK_TRACE_URL}"
125+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
127126
# Metrics + Events
128127
signalfx:
129128
access_token: "${SPLUNK_ACCESS_TOKEN}"

‎cmd/otelcol/fips/config/agent_config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# - SPLUNK_HEC_URL: The Splunk HEC endpoint URL, e.g. https://ingest.us0.signalfx.com/v1/log
99
# - SPLUNK_INGEST_URL: The Splunk ingest URL, e.g. https://ingest.us0.signalfx.com
1010
# - SPLUNK_LISTEN_INTERFACE: The network interface the agent receivers listen on.
11-
# - SPLUNK_TRACE_URL: The Splunk trace endpoint URL, e.g. https://ingest.us0.signalfx.com/v2/trace
1211

1312
extensions:
1413
health_check:
@@ -119,7 +118,7 @@ exporters:
119118
# Traces
120119
sapm:
121120
access_token: "${SPLUNK_ACCESS_TOKEN}"
122-
endpoint: "${SPLUNK_TRACE_URL}"
121+
endpoint: "${SPLUNK_INGEST_URL}/v2/trace"
123122
# Metrics + Events
124123
signalfx:
125124
access_token: "${SPLUNK_ACCESS_TOKEN}"

‎deployments/ansible/molecule/custom_vars/verify.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@
3737
state: present
3838
check_mode: yes
3939

40-
- name: Assert SPLUNK_TRACE_URL env var is set
41-
ansible.builtin.lineinfile:
42-
line: SPLUNK_TRACE_URL=https://fake-splunk-ingest.com/v2/trace
43-
dest: /etc/otel/collector/splunk-otel-collector.conf
44-
state: present
45-
check_mode: yes
46-
4740
- name: Assert SPLUNK_HEC_URL env var is set
4841
ansible.builtin.lineinfile:
4942
line: SPLUNK_HEC_URL=https://fake-splunk-ingest.com/v1/log

‎deployments/ansible/molecule/custom_vars/windows-verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
SPLUNK_CONFIG: '{{ ansible_env.ProgramData }}\Splunk\OpenTelemetry Collector\custom_config.yml'
99
SPLUNK_INGEST_URL: https://fake-splunk-ingest.com
1010
SPLUNK_API_URL: https://fake-splunk-api.com
11-
SPLUNK_TRACE_URL: https://fake-splunk-ingest.com/v2/trace
1211
SPLUNK_HEC_URL: https://fake-splunk-hec.com
1312
SPLUNK_HEC_TOKEN: fake-hec-token
1413
SPLUNK_MEMORY_TOTAL_MIB: "256"

‎deployments/ansible/molecule/default/verify.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
state: present
4444
check_mode: yes
4545

46-
- name: Assert SPLUNK_TRACE_URL env var is set
47-
ansible.builtin.lineinfile:
48-
line: SPLUNK_TRACE_URL=https://ingest.fake-realm.signalfx.com/v2/trace
49-
dest: /etc/otel/collector/splunk-otel-collector.conf
50-
state: present
51-
check_mode: yes
52-
5346
- name: Assert SPLUNK_HEC_URL env var is set
5447
ansible.builtin.lineinfile:
5548
line: SPLUNK_HEC_URL=https://ingest.fake-realm.signalfx.com/v1/log

‎deployments/ansible/molecule/default/windows-verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
SPLUNK_HEC_TOKEN: fake-token
1313
SPLUNK_HEC_URL: https://ingest.fake-realm.signalfx.com/v1/log
1414
SPLUNK_INGEST_URL: https://ingest.fake-realm.signalfx.com
15-
SPLUNK_TRACE_URL: https://ingest.fake-realm.signalfx.com/v2/trace
1615
tasks:
1716
- name: Check splunk-otel-collector service
1817
ansible.windows.win_service:

‎deployments/ansible/molecule/with_instrumentation/windows-verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
SPLUNK_HEC_TOKEN: fake-token
1313
SPLUNK_HEC_URL: https://ingest.fake-realm.signalfx.com/v1/log
1414
SPLUNK_INGEST_URL: https://ingest.fake-realm.signalfx.com
15-
SPLUNK_TRACE_URL: https://ingest.fake-realm.signalfx.com/v2/trace
1615
iis_reg_values:
1716
COR_ENABLE_PROFILING: "1"
1817
COR_PROFILER: "{B4C89B0F-9908-4F73-9F59-0D77C5A06874}"

‎deployments/ansible/roles/collector/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ $> ansible-playbook playbook.yaml -e start_service=false
6464
The `SPLUNK_API_URL` environment variable will be set with this value for the
6565
collector service. (**default:** `https://api.{{ splunk_realm }}.signalfx.com`)
6666

67-
- `splunk_trace_url`: The Splunk trace endpoint URL, e.g.
68-
`https://ingest.us0.signalfx.com/v2/trace`. The `SPLUNK_TRACE_URL` environment
69-
variable will be set with this value for the collector service. (**default:**
70-
`{{ splunk_ingest_url }}/v2/trace`)
71-
7267
- `splunk_hec_url`: The Splunk HEC endpoint URL, e.g.
7368
`https://ingest.us0.signalfx.com/v1/log`. The `SPLUNK_HEC_URL` environment
7469
variable will be set with this value for the collector service. (**default:**

‎deployments/ansible/roles/collector/tasks/otel_win_install.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
- "{{ 'SPLUNK_MEMORY_TOTAL_MIB=' + (splunk_memory_total_mib | string)
5656
if (splunk_memory_total_mib | string) != '' else '' }}"
5757
- "{{ 'SPLUNK_REALM=' + splunk_realm if splunk_realm != '' else '' }}"
58-
- "{{ 'SPLUNK_TRACE_URL=' + splunk_trace_url if splunk_trace_url != '' else '' }}"
5958

6059
- name: Filter out undefined arguments
6160
when: splunk_collector_msi_is_configurable is defined

‎deployments/ansible/roles/collector/tasks/vars.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,5 @@
8787
SPLUNK_LISTEN_INTERFACE: "{{ splunk_listen_interface if splunk_listen_interface != '' else omit }}"
8888
SPLUNK_MEMORY_TOTAL_MIB: "{{ splunk_memory_total_mib }}"
8989
SPLUNK_REALM: "{{ splunk_realm }}"
90-
SPLUNK_TRACE_URL: "{{ splunk_trace_url }}"
9190
splunk_otel_collector_service_registry_key: HKLM:\SYSTEM\CurrentControlSet\Services\splunk-otel-collector
9291
when: ansible_os_family == "Windows"

‎deployments/ansible/roles/collector/tasks/win_configurable_vars.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
splunk_api_url: https://api.{{splunk_realm}}.signalfx.com
1010
when: splunk_api_url is not defined or (splunk_api_url | trim) == ""
1111

12-
- name: Set default trace url
13-
set_fact:
14-
splunk_trace_url: "{{splunk_ingest_url}}/v2/trace"
15-
when: splunk_trace_url is not defined or (splunk_trace_url | trim) == ""
16-
1712
- name: Set default hec url
1813
set_fact:
1914
splunk_hec_url: "{{splunk_ingest_url}}/v1/log"

‎deployments/ansible/roles/collector/templates/splunk-otel-collector.conf.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ SPLUNK_ACCESS_TOKEN={{ splunk_access_token }}
33
SPLUNK_REALM={{ splunk_realm }}
44
SPLUNK_API_URL={{ splunk_api_url | default("https://api." + splunk_realm + ".signalfx.com") }}
55
SPLUNK_INGEST_URL={{ splunk_ingest_url | default("https://ingest." + splunk_realm + ".signalfx.com") }}
6-
{% if splunk_trace_url is defined and splunk_trace_url %}
7-
SPLUNK_TRACE_URL={{ splunk_trace_url }}
8-
{% elif splunk_ingest_url is defined and splunk_ingest_url %}
9-
SPLUNK_TRACE_URL={{ splunk_ingest_url + "/v2/trace" }}
10-
{% else %}
11-
SPLUNK_TRACE_URL={{ "https://ingest." + splunk_realm + ".signalfx.com/v2/trace" }}
12-
{% endif %}
136
{% if splunk_hec_url is defined and splunk_hec_url %}
147
SPLUNK_HEC_URL={{ splunk_hec_url }}
158
{% elif splunk_ingest_url is defined and splunk_ingest_url %}

‎deployments/chef/attributes/default.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
default['splunk_otel_collector']['splunk_api_url'] = "https://api.#{node['splunk_otel_collector']['splunk_realm']}.signalfx.com"
1818
default['splunk_otel_collector']['splunk_ingest_url'] = "https://ingest.#{node['splunk_otel_collector']['splunk_realm']}.signalfx.com"
19-
default['splunk_otel_collector']['splunk_trace_url'] = "#{node['splunk_otel_collector']['splunk_ingest_url']}/v2/trace"
2019
default['splunk_otel_collector']['splunk_hec_url'] = "#{node['splunk_otel_collector']['splunk_ingest_url']}/v1/log"
2120
default['splunk_otel_collector']['splunk_hec_token'] = "#{node['splunk_otel_collector']['splunk_access_token']}"
2221
default['splunk_otel_collector']['splunk_memory_total_mib'] = '512'

‎deployments/chef/recipes/collector_win_config_options.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
{ name: 'SPLUNK_INGEST_URL', type: :string, data: node['splunk_otel_collector']['splunk_ingest_url'].to_s },
1313
{ name: 'SPLUNK_REALM', type: :string, data: node['splunk_otel_collector']['splunk_realm'].to_s },
1414
{ name: 'SPLUNK_MEMORY_TOTAL_MIB', type: :string, data: node['splunk_otel_collector']['splunk_memory_total_mib'].to_s },
15-
{ name: 'SPLUNK_TRACE_URL', type: :string, data: node['splunk_otel_collector']['splunk_trace_url'].to_s },
1615
]
1716

1817
unless node['splunk_otel_collector']['gomemlimit'].to_s.strip.empty?

‎deployments/chef/templates/splunk-otel-collector.conf.erb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ SPLUNK_API_URL=<%= node['splunk_otel_collector']['splunk_api_url'] %>
1313
# Splunk ingest endpoint URL.
1414
SPLUNK_INGEST_URL=<%= node['splunk_otel_collector']['splunk_ingest_url'] %>
1515

16-
# Splunk trace endpoint URL.
17-
SPLUNK_TRACE_URL=<%= node['splunk_otel_collector']['splunk_trace_url'] %>
18-
1916
# Splunk HEC endpoint URL.
2017
SPLUNK_HEC_URL=<%= node['splunk_otel_collector']['splunk_hec_url'] %>
2118

‎deployments/chef/test/integration/custom_vars/test.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
splunk_realm = 'test'
33
splunk_api_url = 'https://fake-splunk-api.com'
44
splunk_ingest_url = 'https://fake-splunk-ingest.com'
5-
splunk_trace_url = "#{splunk_ingest_url}/v2/trace"
65
splunk_hec_url = "#{splunk_ingest_url}/v1/log"
76
splunk_hec_token = 'fake-hec-token'
87
splunk_memory_total = '256'
@@ -29,7 +28,6 @@
2928
{ name: 'SPLUNK_LISTEN_INTERFACE', type: :string, data: splunk_listen_interface },
3029
{ name: 'SPLUNK_MEMORY_TOTAL_MIB', type: :string, data: splunk_memory_total },
3130
{ name: 'SPLUNK_REALM', type: :string, data: splunk_realm },
32-
{ name: 'SPLUNK_TRACE_URL', type: :string, data: splunk_trace_url },
3331
{ name: 'MY_CUSTOM_VAR1', type: :string, data: 'value1' },
3432
{ name: 'MY_CUSTOM_VAR2', type: :string, data: 'value2' },
3533
]
@@ -64,7 +62,6 @@
6462
its('content') { should match /^SPLUNK_LISTEN_INTERFACE=#{splunk_listen_interface}$/ }
6563
its('content') { should match /^SPLUNK_MEMORY_TOTAL_MIB=#{splunk_memory_total}$/ }
6664
its('content') { should match /^SPLUNK_REALM=test$/ }
67-
its('content') { should match /^SPLUNK_TRACE_URL=#{splunk_trace_url}$/ }
6865
its('content') { should match /^MY_CUSTOM_VAR1=value1$/ }
6966
its('content') { should match /^MY_CUSTOM_VAR2=value2$/ }
7067
end

‎deployments/chef/test/integration/default/test.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
splunk_realm = 'test'
33
splunk_api_url = "https://api.#{splunk_realm}.signalfx.com"
44
splunk_ingest_url = "https://ingest.#{splunk_realm}.signalfx.com"
5-
splunk_trace_url = "#{splunk_ingest_url}/v2/trace"
65
splunk_hec_url = "#{splunk_ingest_url}/v1/log"
76
splunk_hec_token = splunk_access_token
87
splunk_memory_total = '512'
@@ -27,7 +26,6 @@
2726
{ name: 'SPLUNK_INGEST_URL', type: :string, data: splunk_ingest_url },
2827
{ name: 'SPLUNK_MEMORY_TOTAL_MIB', type: :string, data: splunk_memory_total },
2928
{ name: 'SPLUNK_REALM', type: :string, data: splunk_realm },
30-
{ name: 'SPLUNK_TRACE_URL', type: :string, data: splunk_trace_url },
3129
]
3230

3331
collector_env_vars_strings = []
@@ -57,7 +55,6 @@
5755
its('content') { should match /^SPLUNK_INGEST_URL=#{splunk_ingest_url}$/ }
5856
its('content') { should match /^SPLUNK_MEMORY_TOTAL_MIB=#{splunk_memory_total}$/ }
5957
its('content') { should match /^SPLUNK_REALM=test$/ }
60-
its('content') { should match /^SPLUNK_TRACE_URL=#{splunk_trace_url}$/ }
6158
its('content') { should_not match /^SPLUNK_LISTEN_INTERFACE=.*$/ }
6259
end
6360
describe file('/etc/systemd/system/splunk-otel-collector.service.d/service-owner.conf') do

‎deployments/puppet/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ This class accepts the following parameters:
6060
| `splunk_realm` | **Required**: Which realm to send the data to, e.g. `us0`. The Splunk ingest and API URLs will be inferred by this value. The `SPLUNK_REALM` environment variable will be set with this value for the collector service. | None |
6161
| `splunk_ingest_url` | Set the Splunk ingest URL explicitly instead of the URL inferred by the `$splunk_realm` parameter. The `SPLUNK_INGEST_URL` environment variable will be set with this value for the collector service. | `https://ingest.${splunk_realm}.signalfx.com` |
6262
| `splunk_api_url` | Set the Splunk API URL explicitly instead of the URL inferred by the `$splunk_realm` parameter. The `SPLUNK_API_URL` environment variable will be set with this value for the collector service. | `https://api.${splunk_realm}.signalfx.com` |
63-
| `splunk_trace_url` | Set the Splunk trace endpoint URL explicitly instead of the URL inferred by the `$splunk_ingest_url` parameter. The `SPLUNK_TRACE_URL` environment variable will be set with this value for the collector service. | `${splunk_ingest_url}/v2/trace` |
6463
| `splunk_hec_url` | Set the Splunk HEC endpoint URL explicitly instead of the URL inferred by the `$splunk_ingest_url` parameter. The `SPLUNK_HEC_URL` environment variable will be set with this value for the collector service. | `${splunk_ingest_url}/v1/log` |
6564
| `splunk_hec_token` | Set the Splunk HEC authentication token if different than `$splunk_access_token`. The `SPLUNK_HEC_TOKEN` environment variable will be set with this value for the collector service. | `$splunk_access_token` |
6665
| `splunk_bundle_dir` | The path to the [Smart Agent bundle directory](https://github.com/signalfx/splunk-otel-collector/blob/main/pkg/extension/smartagentextension/README.md). The default path is provided by the collector package. If the specified path is changed from the default value, the path should be an existing directory on the node. The `SPLUNK_BUNDLE_DIR` environment variable will be set to this value for the collector service. | Linux: `/usr/lib/splunk-otel-collector/agent-bundle`<br>Windows: `%PROGRAMFILES%\Splunk\OpenTelemetry Collector\agent-bundle` |

‎deployments/puppet/manifests/collector_win_config_options.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
'SPLUNK_INGEST_URL' => $splunk_otel_collector::splunk_ingest_url,
1212
'SPLUNK_MEMORY_TOTAL_MIB' => $splunk_otel_collector::splunk_memory_total_mib,
1313
'SPLUNK_REALM' => $splunk_otel_collector::splunk_realm,
14-
'SPLUNK_TRACE_URL' => $splunk_otel_collector::splunk_trace_url,
1514
}
1615

1716
$gomemlimit = if ($splunk_otel_collector::collector_version == 'latest' or

‎deployments/puppet/manifests/init.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
$splunk_realm = '', # required
55
$splunk_ingest_url = "https://ingest.${splunk_realm}.signalfx.com",
66
$splunk_api_url = "https://api.${splunk_realm}.signalfx.com",
7-
$splunk_trace_url = "${splunk_ingest_url}/v2/trace",
87
$splunk_hec_url = "${splunk_ingest_url}/v1/log",
98
$splunk_hec_token = $splunk_access_token,
109
$splunk_bundle_dir = $splunk_otel_collector::params::splunk_bundle_dir,

‎deployments/puppet/templates/splunk-otel-collector.conf.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SPLUNK_MEMORY_TOTAL_MIB=<%= @splunk_memory_total_mib %>
1111
SPLUNK_LISTEN_INTERFACE=<%= @splunk_listen_interface %>
1212
<% end -%>
1313
SPLUNK_REALM=<%= @splunk_realm %>
14-
SPLUNK_TRACE_URL=<%= @splunk_trace_url %>
1514
<% unless @gomemlimit.to_s.strip.empty? -%>
1615
GOMEMLIMIT=<%= @gomemlimit %>
1716
<% end -%>

‎deployments/salt/splunk-otel-collector/collector_config.sls

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
{% set splunk_ingest_url = salt['pillar.get']('splunk-otel-collector:splunk_ingest_url', 'https://ingest.' + splunk_realm + '.signalfx.com') %}
1212

13-
{% set splunk_trace_url = salt['pillar.get']('splunk-otel-collector:splunk_trace_url', splunk_ingest_url + '/v2/trace') %}
14-
1513
{% set splunk_hec_url = salt['pillar.get']('splunk-otel-collector:splunk_hec_url', splunk_ingest_url + '/v1/log') %}
1614

1715
{% set splunk_hec_token = salt['pillar.get']('splunk-otel-collector:splunk_hec_token', splunk_access_token) %}
@@ -38,7 +36,6 @@
3836
SPLUNK_REALM={{ splunk_realm }}
3937
SPLUNK_API_URL={{ splunk_api_url }}
4038
SPLUNK_INGEST_URL={{ splunk_ingest_url }}
41-
SPLUNK_TRACE_URL={{ splunk_trace_url }}
4239
SPLUNK_HEC_URL={{ splunk_hec_url }}
4340
SPLUNK_HEC_TOKEN={{ splunk_hec_token }}
4441
SPLUNK_MEMORY_TOTAL_MIB={{ splunk_memory_total_mib }}

0 commit comments

Comments
 (0)