revert splunk config work

playbooks/roles/jenkins_build/defaults/main.yml

@@ -18,7 +18,6 @@ build_jenkins_configuration_scripts:
   - 4configureJobConfigHistory.groovy
   - 4configureMailerPlugin.groovy
   - 4configureMaskPasswords.groovy
-  - 4configureSplunk.groovy
   - 5createLoggers.groovy
 
 # plugins
@@ -191,9 +190,6 @@ build_jenkins_plugins_list:
   - name: 'shiningpanda'
     version: '0.21'
     group: 'org.jenkins-ci.plugins'
-  - name: 'splunk-devops'
-    version: '1.6.4'
-    group: 'com.splunk.splunkins'
   - name: 'ssh-agent'
     version: '1.14'
     group: 'org.jenkins-ci.plugins'
@@ -283,28 +279,3 @@ build_jenkins_log_list:
 # job config history
 build_jenkins_history_max_days: '15'
 build_jenkins_history_exclude_pattern: 'queue|nodeMonitors|UpdateCenter|global-build-stats|GhprbTrigger'
-
-# splunk
-build_jenkins_splunk_master_hostname: 'build.testeng.edx.org'
-build_jenkins_splunk_ignored_jobs: '(^((?!edx-(platform|e2e)).)*$)|.*private.*'
-build_jenkins_splunk_script_type: 'inline'
-build_jenkins_splunk_script_path: 'files/splunk.groovy'
-build_jenkins_splunk_metadata:
-    - metadata.data_source: 'Default'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'json:jenkins:old'
-    - metadata.data_source: 'Build Report'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'build_report'
-    - metadata.data_source: 'Build Event'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'build_event'
-    - metadata.data_source: 'Console Log'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'console_log'
-    - metadata.data_source: 'Queue Information'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'queue_information'
-    - metadata.data_source: 'Slave Information'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'slave_information'

playbooks/roles/jenkins_build/files/splunk.groovy

-//send job metadata and junit reports with page size set to 50 (each event contains max 50 test cases)
-splunkins.sendTestReport(50)
-
-
-// Send paver timing logs to Splunk
-splunkins.archive("**/timing*.log", null, false, "10MB")

playbooks/roles/jenkins_build/meta/main.yml

@@ -22,8 +22,3 @@ dependencies:
     jenkins_common_history_max_days: '{{ build_jenkins_history_max_days }}'
     jenkins_common_history_exclude_pattern: '{{ build_jenkins_history_exclude_pattern }}'
     jenkins_common_server_name: '{{ JENKINS_SERVER_NAME }}'
-    jenkins_common_splunk_ignored_jobs: '{{ build_jenkins_splunk_ignored_jobs }}'
-    jenkins_common_splunk_script_type: '{{ build_jenkins_splunk_script_type }}'
-    jenkins_common_splunk_script_path: '{{ build_jenkins_splunk_script_path }}'
-    jenkins_commmon_splunk_metadata: '{{ build_jenkins_splunk_metadata }}'
-    jenkins_common_splunk_master_hostname: '{{ build_jenkins_splunk_master_hostname }}'

playbooks/roles/jenkins_common/defaults/main.yml

@@ -39,7 +39,6 @@ jenkins_common_non_plugin_template_files:
   - properties_config
   - security
   - seed_config
-  - splunk_config
 
 # Jenkins default config values
 jenkins_common_jvm_args: ''
@@ -184,23 +183,3 @@ JENKINS_MAILER_SMTP_AUTH_PASSWORD: ''
 # mask passwords
 JENKINS_MASK_PASSWORDS_CLASSES: []
 JENKINS_MASK_PASSWORDS_PAIRS: []
-
-# splunk
-jenkins_common_splunk_enabled: true
-jenkins_common_splunk_use_ssl: true
-jenkins_common_splunk_raw_events_enabled: true
-jenkins_common_splunk_batch_size: 4096
-jenkins_common_splunk_retries: 3
-jenkins_common_splunk_ignored_jobs: ''
-jenkins_common_splunk_master_hostname: ''
-jenkins_common_splunk_event_source: ''
-jenkins_common_splunk_script_type: 'path'
-jenkins_common_splunk_script_path: ''
-jenkins_commmon_splunk_metadata:
-    - metadata.data_source: 'Default'
-      metadata.config_item: 'Source Type'
-      metadata.value: 'json:jenkins:old'
-JENKINS_SPLUNK_HOSTNAME: ''
-JENKINS_SPLUNK_PORT: 8088
-JENKINS_SPLUNK_APP_URL: ''
-JENKINS_SPLUNK_TOKEN: ''

playbooks/roles/jenkins_common/templates/config/splunk_config.yml.j2

----
-SPLUNK_APP_ENABLED: {{ jenkins_common_splunk_enabled }}
-SPLUNK_HOSTNAME: '{{ JENKINS_SPLUNK_HOSTNAME }}'
-SPLUNK_HOST_PORT: {{ JENKINS_SPLUNK_PORT }}
-USE_SSL: {{ jenkins_common_splunk_use_ssl }}
-SPLUNK_TOKEN: '{{ JENKINS_SPLUNK_TOKEN }}'
-RAW_EVENTS_ENABLED: {{ jenkins_common_splunk_raw_events_enabled }}
-MAX_EVENT_BATCH_SIZE: {{ jenkins_common_splunk_batch_size }}
-SPLUNK_APP_URL: '{{ JENKINS_SPLUNK_APP_URL }}'
-RETRIES_ON_ERROR: {{ jenkins_common_splunk_retries }}
-IGNORED_JOBS_PATTERN: {{ jenkins_common_splunk_ignored_jobs }}
-MASTER_HOSTNAME: '{{ jenkins_common_splunk_master_hostname }}'
-EVENT_SOURCE: '{{ jenkins_common_event_source }}'
-SCRIPT_TYPE: '{{ jenkins_common_splunk_script_type }}'
-SCRIPT_PATH: '{{ jenkins_common_splunk_script_path }}'
-METADATA:
-    {% for metadata in jenkins_common_splunk_metadata %}
-    - DATA_SOURCE: '{{ metadata.data_source }}'
-      CONFIG_ITEM: '{{ metadata.config_item }}'
-      VALUE: '{{ metadata.value }}'
-     {% endfor %}