test

Author: jeffreyc-splunk

.github/workflows/ansible.yml

@@ -12,6 +12,7 @@ on:
       - 'deployments/ansible/galaxy.yml'
     branches:
       - main
+      - ansible-discovery-mode
   pull_request:
     paths:
       - '.github/workflows/ansible.yml'

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.81.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
@@ -20,6 +20,10 @@
     splunk_otel_collector_additional_env_vars:
       MY_CUSTOM_VAR1: value1
       MY_CUSTOM_VAR2: value2
+    splunk_discovery_mode: yes
+    splunk_discovery_properties_yaml: |
+      splunk.discovery.extensions.host_observer.enabled: true
+    splunk_discovery_properties_dest: /tmp/test.properties.yaml
   tasks:
     - name: "Include signalfx.splunk_otel_collector.collector role"
       include_role:

deployments/ansible/molecule/custom_vars/verify.yml

@@ -65,6 +65,20 @@
         state: present
       check_mode: yes
 
+    - name: Assert discovery mode is enabled
+      ansible.builtin.lineinfile:
+        line: OTELCOL_OPTIONS=--discovery --discovery-properties=/tmp/test.properties.yaml
+        dest: /etc/otel/collector/splunk-otel-collector.conf
+        state: present
+      check_mode: yes
+
+    - name: Assert discovery properties file
+      ansible.builtin.lineinfile:
+        line: "splunk.discovery.extensions.host_observer.enabled: true"
+        dest: /tmp/test.properties.yaml
+        state: present
+      check_mode: yes
+
     - name: Populate package facts
       ansible.builtin.package_facts:
 

deployments/ansible/molecule/default/verify.yml

@@ -56,3 +56,10 @@
         dest: /etc/otel/collector/splunk-otel-collector.conf
         state: present
       check_mode: yes
+
+    - name: Assert discovery mode is not enabled
+      ansible.builtin.lineinfile:
+        line: OTELCOL_OPTIONS=--discovery
+        dest: /etc/otel/collector/splunk-otel-collector.conf
+        state: absent
+      check_mode: yes

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

@@ -96,3 +96,7 @@ signalfx_dotnet_auto_instrumentation_enable_profiler_memory: false
 signalfx_dotnet_auto_instrumentation_global_tags: ""
 signalfx_dotnet_auto_instrumentation_iisreset: true
 signalfx_dotnet_auto_instrumentation_additional_options: {}
+
+splunk_discovery_mode: false
+splunk_discovery_properties_yaml: ""
+splunk_discovery_properties_dest: /etc/otel/collector/config.d/properties.discovery.yaml

deployments/ansible/roles/collector/tasks/linux_install.yml

@@ -63,6 +63,16 @@
   when: splunk_otel_collector_config_source != ''
   notify: "restart splunk-otel-collector"
 
+- name: Create the discovery properties file
+  ansible.builtin.copy:
+    content: "{{ splunk_discovery_properties_yaml | to_nice_yaml (indent=2) }}"
+    dest: "{{ splunk_discovery_properties_dest }}"
+    owner: "{{ splunk_service_user }}"
+    group: "{{ splunk_service_group }}"
+    mode: 0644
+  when: splunk_discovery_properties_yaml != ''
+  notify: "restart splunk-otel-collector"
+
 - name: Install FluentD
   ansible.builtin.import_tasks: linux_install_fluentd.yml
   when: install_fluentd and fluentd_supported

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

@@ -32,3 +32,6 @@ SPLUNK_COLLECTD_DIR={{ splunk_collectd_dir }}
 {{ key }}={{ value }}
 {% endfor %}
 {% endif %}
+{% if splunk_discovery_mode is defined and splunk_discovery_mode %}
+OTELCOL_OPTIONS=--discovery --discovery-properties={{ splunk_discovery_properties_dest }}
+{% endif %}