Merge pull request #633 from IONISx/splunk-improvements

Splunk improvements

playbooks/roles/splunkforwarder/defaults/main.yml

@@ -18,28 +18,28 @@ splunk_role_name: 'splunk'
 
 SPLUNKFORWARDER_SERVER: 'localhost:9997'
 
-SPLUNKFORWARDER_PACKAGE_LOCATION: !!null
+SPLUNKFORWARDER_PACKAGE_URL: !!null
 SPLUNKFORWARDER_DEB: !!null
 SPLUNKFORWARDER_PASSWORD: !!null
 
 SPLUNKFORWARDER_LOG_ITEMS:
-  - directory: '{{ COMMON_LOG_DIR }}/lms'
+  - source: '{{ COMMON_LOG_DIR }}/lms'
     recursive: true
     index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'edx'
-  - directory: '{{ COMMON_LOG_DIR }}/cms'
+  - source: '{{ COMMON_LOG_DIR }}/cms'
     recursive: true
     index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'edx'
-  - directory: '{{ COMMON_LOG_DIR }}'
+  - source: '{{ COMMON_LOG_DIR }}'
     recursive: true
     index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'syslog'
-  - directory: '/var/log'
+  - source: '/var/log'
     recursive: true
     index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'syslog'
-  - directory: '{{ COMMON_LOG_DIR }}/nginx'
+  - source: '{{ COMMON_LOG_DIR }}/nginx'
     recursive: true
     index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'nginx'

playbooks/roles/splunkforwarder/tasks/main.yml

@@ -32,7 +32,7 @@
 - name: download the splunk deb
   get_url: >
     dest="/tmp/{{SPLUNKFORWARDER_DEB}}"
-    url="{{SPLUNKFORWARDER_PACKAGE_LOCATION}}{{SPLUNKFORWARDER_DEB}}"
+    url="{{SPLUNKFORWARDER_PACKAGE_URL}}"
   register: download_deb
 
 - name: install splunk forwarder

playbooks/roles/splunkforwarder/templates/opt/splunkforwarder/etc/system/local/inputs.conf.j2

@@ -2,7 +2,7 @@
 host = {{ansible_hostname}}
 
 {% for loggable in SPLUNKFORWARDER_LOG_ITEMS%}
-[monitor://{{loggable.directory}}]
+[monitor://{{loggable.source}}]
 recursive = {{loggable.recursive|default(false)}}
 {% if loggable.sourcetype is defined %}
 sourcetype = {{loggable.sourcetype}}