diff --git a/deployments/ansible/molecule/custom_vars/converge.yml b/deployments/ansible/molecule/custom_vars/converge.yml index b857e3f79a..5b795b6f20 100644 --- a/deployments/ansible/molecule/custom_vars/converge.yml +++ b/deployments/ansible/molecule/custom_vars/converge.yml @@ -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 diff --git a/deployments/ansible/molecule/custom_vars/custom_collector_config.yml b/deployments/ansible/molecule/custom_vars/custom_collector_config.yml index 229d315cc3..e0324d055f 100644 --- a/deployments/ansible/molecule/custom_vars/custom_collector_config.yml +++ b/deployments/ansible/molecule/custom_vars/custom_collector_config.yml @@ -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] diff --git a/deployments/ansible/molecule/custom_vars/custom_collector_config_deprecated.yml b/deployments/ansible/molecule/custom_vars/custom_collector_config_deprecated.yml new file mode 100644 index 0000000000..229d315cc3 --- /dev/null +++ b/deployments/ansible/molecule/custom_vars/custom_collector_config_deprecated.yml @@ -0,0 +1,39 @@ +--- +# Custom collector config for test purposes + +receivers: + fluentforward: + endpoint: 127.0.0.1:8006 + otlp: + protocols: + grpc: + http: + prometheus: + config: + scrape_configs: + - job_name: 'otel-collector' + scrape_interval: 10s + static_configs: + - targets: ['127.0.0.1:8888'] + +processors: + memory_limiter: + check_interval: 2s + limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} + +exporters: + logging/debug: + loglevel: debug + logging/info: + loglevel: info + +service: + pipelines: + metrics: + receivers: [otlp, prometheus] + processors: [memory_limiter] + exporters: [logging/info] + logs: + receivers: [fluentforward, otlp] + processors: [memory_limiter] + exporters: [logging/debug] diff --git a/deployments/ansible/molecule/custom_vars/verify.yml b/deployments/ansible/molecule/custom_vars/verify.yml index be79ce0971..2cee3523af 100644 --- a/deployments/ansible/molecule/custom_vars/verify.yml +++ b/deployments/ansible/molecule/custom_vars/verify.yml @@ -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: @@ -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 diff --git a/deployments/ansible/molecule/custom_vars/windows-converge.yml b/deployments/ansible/molecule/custom_vars/windows-converge.yml index 237673f8cc..339a0a4099 100644 --- a/deployments/ansible/molecule/custom_vars/windows-converge.yml +++ b/deployments/ansible/molecule/custom_vars/windows-converge.yml @@ -10,7 +10,7 @@ splunk_hec_token: fake-hec-token splunk_otel_collector_version: 0.48.0 splunk_otel_collector_config: '{{ansible_env.ProgramData}}\Splunk\OpenTelemetry Collector\custom_config.yml' - splunk_otel_collector_config_source: ./custom_collector_config.yml + splunk_otel_collector_config_source: ./custom_collector_config_deprecated.yml splunk_memory_total_mib: 256 gomemlimit: 230 install_fluentd: yes diff --git a/deployments/ansible/molecule/with_instrumentation/converge.yml b/deployments/ansible/molecule/with_instrumentation/converge.yml index fa420fbf3a..7bc4efd75e 100644 --- a/deployments/ansible/molecule/with_instrumentation/converge.yml +++ b/deployments/ansible/molecule/with_instrumentation/converge.yml @@ -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 diff --git a/deployments/ansible/molecule/with_instrumentation/verify.yml b/deployments/ansible/molecule/with_instrumentation/verify.yml index 09bc028cb9..eb8248b312 100644 --- a/deployments/ansible/molecule/with_instrumentation/verify.yml +++ b/deployments/ansible/molecule/with_instrumentation/verify.yml @@ -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: @@ -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 @@ -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 diff --git a/deployments/ansible/roles/collector/tasks/linux_auto_instrumentation.yml b/deployments/ansible/roles/collector/tasks/linux_auto_instrumentation.yml index 075e618390..17e49d6208 100644 --- a/deployments/ansible/roles/collector/tasks/linux_auto_instrumentation.yml +++ b/deployments/ansible/roles/collector/tasks/linux_auto_instrumentation.yml @@ -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 diff --git a/packaging/tests/deployments/puppet/puppet_test.py b/packaging/tests/deployments/puppet/puppet_test.py index 693a5106d7..18459d6b6f 100644 --- a/packaging/tests/deployments/puppet/puppet_test.py +++ b/packaging/tests/deployments/puppet/puppet_test.py @@ -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") diff --git a/packaging/tests/deployments/salt/salt_test.py b/packaging/tests/deployments/salt/salt_test.py index 4855b8a735..c3167497ab 100644 --- a/packaging/tests/deployments/salt/salt_test.py +++ b/packaging/tests/deployments/salt/salt_test.py @@ -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' diff --git a/packaging/tests/installer_test.py b/packaging/tests/installer_test.py index 864cdacdce..cc65faeba7 100644 --- a/packaging/tests/installer_test.py +++ b/packaging/tests/installer_test.py @@ -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"