Merge pull request #4119 from edx/zoldak/enable-splunk-on-jenkins

Enable splunk and jvm args on jenkins

playbooks/edx-east/jenkins_build.yml

@@ -10,8 +10,57 @@
   hosts: all
   become: True
   gather_facts: True
+  vars:
+    COMMON_ENABLE_DATADOG: True
+    COMMON_ENABLE_SPLUNKFORWARDER: True
+    COMMON_SECURITY_UPDATES: yes
+    SECURITY_UPGRADE_ON_ANSIBLE: true
+
+    SPLUNKFORWARDER_LOG_ITEMS:
+      - source: '/var/lib/jenkins/jobs/*/builds/*/junitResult.xml'
+        recursive: true
+        index: 'testeng'
+        sourcetype: junit
+        followSymlink: false
+        crcSalt: '<SOURCE>'
+
+      - source: '/var/lib/jenkins/jobs/*/builds/*/build.xml'
+        index: 'testeng'
+        recursive: true
+        sourcetype: build_result
+        followSymlink: false
+        crcSalt: '<SOURCE>'
+        blacklist: '(((\.(gz))|\d)$)|(.*seed.*)'
+
+      - source: '/var/lib/jenkins/jobs/*/builds/*/log'
+        index: 'testeng'
+        recursive: true
+        sourcetype: build_log
+        followSymlink: false
+        crcSalt: '<SOURCE>'
+        blacklist: '(((\.(gz))|\d)$)|(.*seed.*)'
+
+      - source: '/var/lib/jenkins/jobs/*/builds/*/archive/test_root/log/timing.*.log'
+        index: 'testeng'
+        sourcetype: 'json_timing_log'
+        followSymlink: false
+
+      - source: '/var/lib/jenkins/jobs/*/builds/*/archive/sitespeed-result/*/data/result.json'
+        index: 'testeng'
+        recursive: true
+        sourcetype: sitespeed_result
+        followSymlink: false
+
+      - source: '/var/log/jenkins/jenkins.log'
+        index: 'testeng'
+        recursive: false
+        followSymlink: false
+
   roles:
     - aws
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
+
     - role: jenkins_build
       build_jenkins_configuration_scripts:
         - 1addJarsToClasspath.groovy
@@ -27,3 +76,10 @@
         - 4configureJobConfigHistory.groovy
         - 4configureMailerPlugin.groovy
         - 5createLoggers.groovy
+
+    # run just the splunkforwarder role by using '--tags "splunkonly"'
+    # e.g. ansible-playbook jenkins_testeng_master.yml -i inventory.ini --tags "splunkonly" -vvvv
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER
+      tags: splunkonly
+      become: True

playbooks/roles/jenkins_build/defaults/main.yml

 build_jenkins_version: jenkins_1.651.3
+build_jenkins_jvm_args: '-Djava.awt.headless=true -Xmx8192m'
 build_jenkins_configuration_scripts:
   - 1addJarsToClasspath.groovy
   - 2checkInstalledPlugins.groovy

playbooks/roles/jenkins_build/meta/main.yml

@@ -3,6 +3,7 @@ dependencies:
   - common
   - role: jenkins_common
     jenkins_common_version: '{{ build_jenkins_version }}'
+    jenkins_common_jvm_args: '{{ build_jenkins_jvm_args }}'
     jenkins_common_configuration_scripts: '{{ build_jenkins_configuration_scripts }}'
     jenkins_common_template_files: '{{ build_jenkins_template_files }}'
     jenkins_common_plugins_list: '{{ build_jenkins_plugins_list }}'

playbooks/roles/jenkins_common/defaults/main.yml

@@ -40,6 +40,7 @@ jenkins_common_non_plugin_template_files:
   - seed_config
 
 # Jenkins default config values
+jenkins_common_jvm_args: ''
 
 # main
 jenkins_common_main_system_message: ''

playbooks/roles/jenkins_common/templates/etc/systemd/system/jenkins.service.j2

@@ -4,7 +4,7 @@ Description=Jenkins
 [Service]
 Environment=JENKINS_HOME={{ jenkins_common_home }}
 Environment=JENKINS_CONFIG_PATH={{ jenkins_common_config_path }}
-ExecStart=/usr/bin/java -jar /usr/share/jenkins/jenkins.war --httpPort={{ jenkins_common_port }}
+ExecStart=/usr/bin/java {{ jenkins_common_jvm_args }} -jar /usr/share/jenkins/jenkins.war --httpPort={{ jenkins_common_port }}
 
 [Install]
 WantedBy=multi-user.target