Merge branch 'main' into upgrade_otelcol_chef

Author: crobert-1

.github/workflows/otelcol-fips.yml

@@ -134,7 +134,7 @@ jobs:
     needs: [ otelcol-fips ]
     strategy:
       matrix:
-        WIN_VERSION: [ 2019, 2022 ]
+        WIN_VERSION: [ 2022, 2025 ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

.github/workflows/vuln-scans.yml

@@ -159,7 +159,7 @@ jobs:
     needs: [ "binaries-windows_amd64" ]
     strategy:
       matrix:
-        OS: [ windows-2019, windows-2022 ]
+        OS: [ windows-2022, windows-2025 ]
       fail-fast: false
     env:
       PIP_CACHE_DIR: ${{ github.workspace }}/.cache/pip
@@ -181,8 +181,8 @@ jobs:
           $ErrorActionPreference = 'Stop'
           Copy-Item .\bin\otelcol_windows_amd64.exe .\cmd\otelcol\otelcol.exe
           Copy-Item .\dist\agent-bundle_windows_amd64.zip .\cmd\otelcol\agent-bundle_windows_amd64.zip
-          if ("${{ matrix.OS }}" -eq "windows-2019") {
-            $base_image = "mcr.microsoft.com/windows/servercore:ltsc2019"
+          if ("${{ matrix.OS }}" -eq "windows-2025") {
+            $base_image = "mcr.microsoft.com/windows/servercore:ltsc2025"
           } else {
             $base_image = "mcr.microsoft.com/windows/servercore:ltsc2022"
           }

CHANGELOG.md

@@ -12,7 +12,8 @@
 ### 💡 Enhancements 💡
 
 - (Splunk) Add an install property, `COLLECTOR_SVC_ARGS`, to the Windows MSI to
-  configure the command-line arguments used to launch the collector service on Windows.
+  configure the command-line arguments used to launch the collector service on Windows. ([#6268](https://github.com/signalfx/splunk-otel-collector/pull/6268))
+- (Splunk) `discovery` - Add more metrics that are enabled by default for the SQL Server receiver ([#6259](https://github.com/signalfx/splunk-otel-collector/pull/6259))
 
 ## v0.126.0
 

cmd/otelcol/config/collector/config.d.linux/receivers/sqlserver.discovery.yaml

@@ -37,12 +37,20 @@
 #             enabled: true
 #         sqlserver.database.operations:
 #             enabled: true
+#         sqlserver.deadlock.rate:
+#             enabled: true
+#         sqlserver.lock.wait.count:
+#             enabled: true
 #         sqlserver.lock.wait.rate:
 #             enabled: true
+#         sqlserver.os.wait.duration:
+#             enabled: true
 #         sqlserver.page.buffer_cache.hit_ratio:
 #             enabled: true
 #         sqlserver.processes.blocked:
 #             enabled: true
+#         sqlserver.resource_pool.disk.operations:
+#             enabled: true
 #         sqlserver.resource_pool.disk.throttled.read.rate:
 #             enabled: true
 #         sqlserver.resource_pool.disk.throttled.write.rate:

deployments/ansible/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## ansible-v0.32.0
+
+### 💡 Enhancements 💡
+
+- Add support for the `splunk_otel_collector_command_line_args` option to
+  configure the command line arguments for the Splunk OpenTelemetry Collector
+  service.
+
 ## ansible-v0.31.0
 
 ### 🛑 Breaking changes 🛑

deployments/ansible/molecule/custom_vars/converge.yml

@@ -12,6 +12,7 @@
     splunk_service_user: custom-user
     splunk_service_group: custom-group
     splunk_memory_total_mib: 256
+    splunk_otel_collector_command_line_args: "--discovery"
     gomemlimit: 230
     splunk_listen_interface: 1.2.3.4
     splunk_fluentd_config: /etc/otel/collector/fluentd/custom_fluentd.conf

deployments/ansible/molecule/custom_vars/verify.yml

@@ -44,6 +44,13 @@
         state: present
       check_mode: yes
 
+    - name: Assert OTELCOL_OPTIONS env var is set per splunk_otel_collector_command_line_args
+      ansible.builtin.lineinfile:
+        line: OTELCOL_OPTIONS=--discovery
+        dest: /etc/otel/collector/splunk-otel-collector.conf
+        state: present
+      check_mode: yes
+
     - name: Assert MY_CUSTOM_VAR1 env var is set
       ansible.builtin.lineinfile:
         line: MY_CUSTOM_VAR1=value1

deployments/ansible/roles/collector/README.md

@@ -121,6 +121,16 @@ $> ansible-playbook playbook.yaml -e start_service=false
   `splunk_otel_collector_proxy_http` or `splunk_otel_collector_proxy_https` is
   defined. (**default:** `localhost,127.0.0.1,::1`)
 
+- `splunk_otel_collector_command_line_args`: Command-line arguments to pass to the
+  Splunk OpenTelemetry Collector. These will be added as arguments to the service
+  command line.
+  (**default:** `""`)
+  
+  Example:
+  ```yaml
+  splunk_otel_collector_command_line_args: "--discovery --set=processors.batch.timeout=10s"
+  ```
+
 - `splunk_memory_total_mib`: Amount of memory in MiB allocated to the Splunk OTel 
   Collector. (**default:** `512`)
 

deployments/ansible/roles/collector/defaults/main.yml

@@ -8,6 +8,9 @@ splunk_realm: us0
 
 splunk_otel_collector_version: latest
 
+# Command-line arguments to pass to the collector service.
+splunk_otel_collector_command_line_args: ""
+
 # Set this variable to /etc/otel/collector/gateway_config.yaml on linux,
 # "Program Files\Splunk\OpenTelemetry Collector\gateway_config.yaml" on Windows
 # in order to deploy splunk-otel-collector in gateway mode.

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

@@ -1,3 +1,4 @@
+OTELCOL_CONFIG={{ splunk_otel_collector_command_line_args }}
 SPLUNK_CONFIG={{ splunk_otel_collector_config }}
 SPLUNK_ACCESS_TOKEN={{ splunk_access_token }}
 SPLUNK_REALM={{ splunk_realm }}

deployments/chef/kitchen.windows.yml

@@ -19,14 +19,14 @@ verifier:
   name: inspec
 
 platforms:
-  - name: windows-2019
+  - name: windows-2022
     driver:
-      dockerfile: test/windows/Dockerfile.windows-2019
+      dockerfile: test/windows/Dockerfile.windows-2022
       build_context: true
       platform: windows
-  - name: windows-2022
+  - name: windows-2025
     driver:
-      dockerfile: test/windows/Dockerfile.windows-2022
+      dockerfile: test/windows/Dockerfile.windows-2025
       build_context: true
       platform: windows
 

deployments/chef/test/windows/Dockerfile.windows-2019 renamed to deployments/chef/test/windows/Dockerfile.windows-2025

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

deployments/cloudfoundry/buildpack/README.md

@@ -1,11 +1,11 @@
 # Splunk OpenTelemetry Collector Pivotal Cloud Foundry (PCF) Buildpack
 
-A [Cloud Foundry buildpack](https://docs.vmware.com/en/VMware-Tanzu-Application-Service/2.11/tas-for-vms/toc-buildpacks-index.html) to install
+A [Cloud Foundry buildpack](https://docs.cloudfoundry.org/adminguide/buildpacks.html) to install
 the Splunk OpenTelemetry Collector for use with PCF apps.
 
 The buildpack's default functionality, as described in this document, is to deploy the OpenTelemetry Collector
 as a sidecar for the given app that's being deployed. The Collector is able to observe the app as a 
-[nozzle](https://docs.vmware.com/en/VMware-Tanzu-Operations-Manager/3.0/tile-dev-guide/nozzle.html) to
+[nozzle](https://docs.cloudfoundry.org/loggregator/nozzle-tutorial.html) to
 the [Loggregator Firehose](https://docs.cloudfoundry.org/loggregator/architecture.html).
 The Loggregator Firehose is one of the architectures Cloud Foundry
 uses to emit logs and metrics. This means that the Splunk OpenTelemetry Collector will be observing all

internal/confmapprovider/discovery/bundle/bundle.d/receivers/sqlserver.discovery.yaml

@@ -33,12 +33,20 @@ sqlserver:
             enabled: true
         sqlserver.database.operations:
             enabled: true
+        sqlserver.deadlock.rate:
+            enabled: true
+        sqlserver.lock.wait.count:
+            enabled: true
         sqlserver.lock.wait.rate:
             enabled: true
+        sqlserver.os.wait.duration:
+            enabled: true
         sqlserver.page.buffer_cache.hit_ratio:
             enabled: true
         sqlserver.processes.blocked:
             enabled: true
+        sqlserver.resource_pool.disk.operations:
+            enabled: true
         sqlserver.resource_pool.disk.throttled.read.rate:
             enabled: true
         sqlserver.resource_pool.disk.throttled.write.rate:

internal/confmapprovider/discovery/bundle/bundle.d/receivers/sqlserver.discovery.yaml.tmpl

@@ -29,12 +29,20 @@
             enabled: true
         sqlserver.database.operations:
             enabled: true
+        sqlserver.deadlock.rate:
+            enabled: true
+        sqlserver.lock.wait.count:
+            enabled: true
         sqlserver.lock.wait.rate:
             enabled: true
+        sqlserver.os.wait.duration:
+            enabled: true
         sqlserver.page.buffer_cache.hit_ratio:
             enabled: true
         sqlserver.processes.blocked:
             enabled: true
+        sqlserver.resource_pool.disk.operations:
+            enabled: true
         sqlserver.resource_pool.disk.throttled.read.rate:
             enabled: true
         sqlserver.resource_pool.disk.throttled.write.rate: