Merge branch 'master' into arbab/edx_service-rewrite

playbooks/edx-east/jenkins_admin.yml

@@ -9,3 +9,12 @@
   roles:
     - aws
     - jenkins_admin
+    # This requires an override of the following form:
+    # SPLUNKFORWARDER_LOG_ITEMS:
+    #   - source: /edx/var/jenkins/jobs/*/builds/*/log
+    #     index: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-jenkins'
+    #     sourcetype: jenkins_build
+    #     followSymlink: false
+    #     crcSalt: <SOURCE>
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER

playbooks/edx-east/jenkins_tools.yml

@@ -9,3 +9,12 @@
   roles:
     - aws
     - tools_jenkins
+    # This requires an override of the following form:
+    # SPLUNKFORWARDER_LOG_ITEMS:
+    #   - source: /edx/var/jenkins/jobs/*/builds/*/log
+    #     index: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-jenkins'
+    #     sourcetype: jenkins_build
+    #     followSymlink: false
+    #     crcSalt: <SOURCE>
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER

playbooks/edx-east/populate_configuration_model.yml

+#
+# edX Configuration
+#
+# github:     https://github.com/edx/configuration
+# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
+# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
+# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
+#
+# Usage: ansible-playbook -i lms-host-1, -e "file=/path/to/json/file" -e "user=username"
+#
+# Overview:
+# This executes the "populate_model" management command to populate a ConfigurationModel with
+# data from the supplied JSON file.
+#
+# The username of an existing user must be specified to indicate who is performing the operation.
+#
+# JSON file format should be:
+#
+#    { "model": "config_models.ExampleConfigurationModel",
+#      "data":
+#        [
+#          { "enabled": True,
+#            "color": "black"
+#            ...
+#          },
+#          { "enabled": False,
+#            "color": "yellow"
+#            ...
+#          },
+#          ...
+#        ]
+#   }
+#
+
+- hosts: all
+  vars:
+    python_path: /edx/bin/python.edxapp
+    manage_path: /edx/bin/manage.edxapp
+  tasks:
+    - name: Manage xblock configurations
+      shell: >
+        {{ python_path }} {{ manage_path }} lms --settings=aws
+        populate_model -f {{ file | quote }} -u {{ user }}
+      register: command_result
+      changed_when: "'Import complete, 0 new entries created' not in command_result.stdout"
+    - debug: msg="{{ command_result.stdout }}"

playbooks/roles/mongo_mms/defaults/main.yml

@@ -5,7 +5,7 @@ pkg_format: "deb"
 
 agents:
   - agent: mongodb-mms-monitoring-agent
-    version: "4.3.0.265-1"
+    version: "5.0.0.309-1"
     config: "/etc/mongodb-mms/monitoring-agent.config"
   - agent: mongodb-mms-backup-agent
     version: "4.3.0.384-1"

playbooks/roles/splunkforwarder/tasks/main.yml

@@ -84,7 +84,7 @@
   notify: restart splunkforwarder
 
 - name: Update admin pasword
-  shell: "{{ splunkforwarder_output_dir }}/bin/splunk edit user admin -password {{ SPLUNKFORWARDER_PASSWORD }} -auth admin:changeme --accept-license --answer-yes --no-prompt"
+  shell: "{{ splunkforwarder_output_dir }}/bin/splunk edit user admin -password '{{ SPLUNKFORWARDER_PASSWORD }}' -auth admin:changeme --accept-license --answer-yes --no-prompt"
   when: download_deb.changed
   notify: restart splunkforwarder
 

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

@@ -3,7 +3,11 @@
 {% for loggable in SPLUNKFORWARDER_LOG_ITEMS%}
 [monitor://{{ loggable.source }}]
 blacklist = \.(gz)$
-recursive = {{ loggable.recursive|default(false) }}
+{% if loggable.recursive | default(False) %}
+{# There's a bug in which "recursive" must be unset for logs to be forwarded #}
+{# See https://answers.splunk.com/answers/420901/splunk-not-matching-files-with-wildcard-in-monitor.html #}
+recursive = true
+{% endif %}
 {% if loggable.sourcetype is defined %}
 sourcetype = {{ loggable.sourcetype }}
 {% endif %}

playbooks/roles/xqwatcher/defaults/main.yml

@@ -52,7 +52,7 @@ XQWATCHER_CONFIG:
 
 XQWATCHER_COURSES: []
 
-XQWATCHER_GIT_IDENTITY: !!null
+XQWATCHER_GIT_IDENTITY: "none"
 XQWATCHER_VERSION: "master"
 
 XQWATCHER_REPOS:

playbooks/roles/xqwatcher/tasks/deploy.yml

@@ -5,6 +5,7 @@
     owner: "{{ xqwatcher_user }}"
     group: "{{ xqwatcher_user }}"
     mode: "0600"
+  when: XQWATCHER_GIT_IDENTITY != 'none'
   tags:
     - install
     - install:code