Skip to content

[chore] Upgrade release version used in mass deployment testing #6265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 4, 2025
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployments/ansible/molecule/custom_vars/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
splunk_access_token: fake-token
splunk_ingest_url: https://fake-splunk-ingest.com
splunk_api_url: https://fake-splunk-api.com
splunk_otel_collector_version: 0.48.0
splunk_otel_collector_version: 0.126.0
splunk_otel_collector_config: /etc/otel/collector/custom_config.yml
splunk_otel_collector_config_source: ./custom_collector_config.yml
splunk_service_user: custom-user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ processors:
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

exporters:
logging/debug:
loglevel: debug
logging/info:
loglevel: info
debug/detailed:
verbosity: detailed
debug/normal:
verbosity: normal

service:
pipelines:
metrics:
receivers: [otlp, prometheus]
processors: [memory_limiter]
exporters: [logging/info]
exporters: [debug/normal]
logs:
receivers: [fluentforward, otlp]
processors: [memory_limiter]
exporters: [logging/debug]
exporters: [debug/detailed]
4 changes: 2 additions & 2 deletions deployments/ansible/molecule/custom_vars/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

- name: Assert specified version of splunk-otel-collector is installed
assert:
that: ansible_facts.packages['splunk-otel-collector'][0].version == '0.48.0'
that: ansible_facts.packages['splunk-otel-collector'][0].version == '0.126.0'

- name: Assert custom service user is set
ansible.builtin.lineinfile:
Expand Down Expand Up @@ -135,7 +135,7 @@

- name: Look for the test log message in collector service output
ansible.builtin.shell:
cmd: 'journalctl -u splunk-otel-collector | grep "Body: test logs pipeline"'
cmd: 'journalctl -u splunk-otel-collector | grep "Body: Str(test logs pipeline)"'
register: result
changed_when: false
until: result.stdout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
splunk_api_url: https://fake-splunk-api.com
splunk_hec_url: https://fake-splunk-hec.com
splunk_hec_token: fake-hec-token
splunk_otel_collector_version: 0.48.0
splunk_otel_collector_version: 0.126.0
splunk_otel_collector_config: '{{ansible_env.ProgramData}}\Splunk\OpenTelemetry Collector\custom_config.yml'
splunk_otel_collector_config_source: ./custom_collector_config.yml
splunk_memory_total_mib: 256
Expand Down
8 changes: 4 additions & 4 deletions deployments/ansible/molecule/custom_vars/windows-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@
assert:
that: not service_status.changed

- name: Download splunk-otel-collector 0.48.0 MSI
- name: Download splunk-otel-collector 0.126.0 MSI
ansible.windows.win_get_url:
url: https://dl.signalfx.com/splunk-otel-collector/msi/release/splunk-otel-collector-0.48.0-amd64.msi
url: https://dl.signalfx.com/splunk-otel-collector/msi/release/splunk-otel-collector-0.126.0-amd64.msi
dest: "{{ansible_env.TEMP}}"
register: otel_msi_package

- name: Install splunk-otel-collector 0.48.0 MSI
- name: Install splunk-otel-collector 0.126.0 MSI
ansible.windows.win_package:
path: "{{otel_msi_package.dest}}"
state: present
check_mode: yes
register: msi_installed

- name: Assert splunk-otel-collector 0.48.0 MSI is already installed
- name: Assert splunk-otel-collector 0.126.0 MSI is already installed
assert:
that: not msi_installed.changed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
splunk_access_token: fake-token
splunk_realm: fake-realm
install_splunk_otel_auto_instrumentation: true
splunk_otel_auto_instrumentation_version: 0.50.0
splunk_otel_auto_instrumentation_version: 0.126.0
splunk_otel_auto_instrumentation_resource_attributes: deployment.environment=test
splunk_otel_auto_instrumentation_service_name: test
splunk_otel_auto_instrumentation_generate_service_name: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

- name: Assert specified version of splunk-otel-auto-instrumentation is installed
assert:
that: ansible_facts.packages['splunk-otel-auto-instrumentation'][0].version == '0.50.0'
that: ansible_facts.packages['splunk-otel-auto-instrumentation'][0].version == '0.126.0'

- name: Check for the new config files
ansible.builtin.stat:
Expand All @@ -26,9 +26,9 @@
- /etc/splunk/zeroconfig/dotnet.conf
register: new_config_files

- name: Assert the new config files do not exist
- name: Assert the new config files exist
assert:
that: not item.stat.exists
that: item.stat.exists
loop: "{{ new_config_files.results }}"

- name: Check for systemd drop-in file
Expand Down Expand Up @@ -60,7 +60,7 @@

- name: Assert instrumentation config contains resource attribute
ansible.builtin.lineinfile:
line: resource_attributes=splunk.zc.method=splunk-otel-auto-instrumentation-0.50.0,deployment.environment=test
line: resource_attributes=splunk.zc.method=splunk-otel-auto-instrumentation-0.126.0,deployment.environment=test
dest: /usr/lib/splunk-instrumentation/instrumentation.conf
state: present
check_mode: yes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
and auto_instrumentation_version is version('0.87.0', '>=') }}"
with_dotnet: "{{ 'dotnet' in (splunk_otel_auto_instrumentation_sdks | default([])) \
and auto_instrumentation_version is version('0.99.0', '>=') \
and ansible_architecture in ('x86_64', 'amd64') }}"
and ansible_architecture in ('x86_64', 'amd64', 'arm64') }}"

- name: Check for npm
shell: npm --version
Expand Down
4 changes: 2 additions & 2 deletions packaging/tests/deployments/puppet/puppet_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ def test_puppet_with_custom_vars(distro, puppet_release):
try:
api_url = "https://fake-splunk-api.com"
ingest_url = "https://fake-splunk-ingest.com"
config = CUSTOM_VARS_CONFIG.substitute(api_url=api_url, ingest_url=ingest_url, version="0.86.0")
config = CUSTOM_VARS_CONFIG.substitute(api_url=api_url, ingest_url=ingest_url, version="0.126.0")
run_puppet_apply(container, config)
verify_package_version(container, "splunk-otel-collector", "0.86.0")
verify_package_version(container, "splunk-otel-collector", "0.126.0")
verify_env_file(container, api_url, ingest_url, "fake-hec-token")
verify_config_file(container, SPLUNK_ENV_PATH, "SPLUNK_LISTEN_INTERFACE", "0.0.0.0")
verify_config_file(container, SPLUNK_ENV_PATH, "MY_CUSTOM_VAR1", "value1")
Expand Down
2 changes: 1 addition & 1 deletion packaging/tests/deployments/salt/salt_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def test_salt_default(distro):
splunk_ingest_url: 'https://fake-ingest.com'
splunk_api_url: 'https://fake-api.com'
splunk_hec_token: 'fake-hec-token'
collector_version: '0.86.0'
collector_version: '0.126.0'
splunk_service_user: 'test-user'
splunk_service_group: 'test-user'
splunk_listen_interface: '0.0.0.0'
Expand Down
2 changes: 1 addition & 1 deletion packaging/tests/installer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def test_installer_custom(distro, arch):
if distro == "opensuse-12" and arch == "arm64":
pytest.skip("opensuse-12 arm64 no longer supported")

collector_version = "0.75.0"
collector_version = "0.126.0"
service_owner = "test-user"
custom_config = "/etc/my-custom-config.yaml"

Expand Down
Loading