Update to add splunk to all machines.

playbooks/edx-east/edx_feanilsandbox.yml

@@ -10,10 +10,9 @@
     - datadog
     - nginx
     - role: 'edxapp'
-      EDXAPP_LMS_NGINX_PORT: 80
-      EDXAPP_CMS_NGINX_PORT: 80
       edxapp_lms_env: 'lms.envs.load_test'
-      edx_platform_commit: 'master'
+      edx_platform_commit: 'release'
+    - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_group_worker
   sudo: True
   vars_files:
@@ -27,7 +26,8 @@
     - role: 'edxapp'
       edxapp_lms_env: 'lms.envs.load_test'
       celery_worker: True
-      edx_platform_commit: 'master'
+      edx_platform_commit: 'release'
+    - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_group_xserver
   sudo: True
   vars_files:
@@ -37,6 +37,7 @@
     - common
     - nginx
     - xserver
+    - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_group_rabbitmq
   serial: 1
   sudo: True
@@ -46,6 +47,7 @@
   roles:
     - common
     - rabbitmq
+    - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_group_xqueue
   sudo: True
   vars_files:
@@ -55,3 +57,4 @@
     - common
     - nginx
     - xqueue
+    - splunkforwarder

playbooks/group_vars/all

@@ -7,6 +7,9 @@ log_base_dir: /mnt/logs
 venv_dir: /opt/edx
 os_name: ubuntu
 
+ENV_NAME: 'default_env'
+ENV_TYPE: 'default_type'
+
 # these pathes are relative to the playbook dir
 # directory for secret settings (keys, etc)
 secure_dir: 'secure_example'

playbooks/roles/splunkforwarder/defaults/main.yml

@@ -25,13 +25,24 @@ splunk_debian_pkgs:
 
 splunk_redhat_pkgs: []
 
-SPLUNKFORWARDER_LOG_ITEMS:
-  - directory: '/mnt/logs/lms/edx.log'
-    index: 'feanilsandbox-lms'
-
 SPLUNKFORWARDER_SERVER: 'localhost:9997'
 
 SPLUNKFORWARDER_PACKAGE_LOCATION: !!null
 SPLUNKFORWARDER_DEB: !!null
 SPLUNKFORWARDER_PASSWORD: !!null
+
 splunkforwarder_output_dir: '/opt/splunkforwarder/'
+
+SPLUNKFORWARDER_LOG_ITEMS:
+  - directory: '{{log_base_dir}}'
+    recursive: true
+    index: '{{ENV_TYPE}}-{{ENV_NAME}}'
+    sourcetype: 'edx'
+  - directory: '/var/log'
+    recursive: true
+    index: '{{ENV_TYPE}}-{{ENV_NAME}}'
+    sourcetype: 'syslog'
+  - directory: '{{log_base_dir}}/nginx'
+    recursive: true
+    index: '{{ENV_TYPE}}-{{ENV_NAME}}'
+    sourcetype: 'nginx'