Merge pull request #929 from edx/jarv/release-fixes

Jarv/release fixes

playbooks/edx-east/certs.yml

@@ -3,12 +3,15 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - certs
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/common.yml

@@ -3,11 +3,14 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - common
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/demo.yml

@@ -3,11 +3,14 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - demo
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/discern.yml

@@ -3,8 +3,9 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -12,6 +13,8 @@
       - discern
     - discern
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/edx_continuous_integration.yml

@@ -6,6 +6,9 @@
   vars:
     migrate_db: "yes"
     openid_workaround: True
+    ENABLE_DATADOG: True
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -33,3 +36,9 @@
     - discern
     - certs
     - edx_ansible
+    - role: datadog
+      when: ENABLE_DATADOG
+    - role: splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/edxapp.yml

@@ -3,8 +3,9 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -15,6 +16,8 @@
       - lms
     - edxapp
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/forum.yml

@@ -3,9 +3,9 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
-    enable_newrelic: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -13,8 +13,10 @@
       - forum
     - forum
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
     - role: newrelic
-      when: enable_newrelic
+      when: ENABLE_NEWRELIC
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/worker.yml

@@ -3,13 +3,16 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: edxapp
       celery_worker: True
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/xqueue.yml

@@ -3,8 +3,9 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -12,6 +13,8 @@
       - xqueue
     - role: xqueue
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx-east/xserver.yml

@@ -3,8 +3,9 @@
   sudo: True
   gather_facts: True
   vars:
-    enable_datadog: True
-    enable_splunkforwarder: True
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - aws
     - role: nginx
@@ -12,6 +13,8 @@
       - xserver
     - role: xserver
     - role: datadog
-      when: enable_datadog
+      when: ENABLE_DATADOG
     - role: splunkforwarder
-      when: enable_splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC

playbooks/edx_sandbox.yml

@@ -13,6 +13,10 @@
     openid_workaround: True
     EDXAPP_LMS_NGINX_PORT: '80'
     edx_platform_version: 'master'
+    # These should stay false for the public AMI
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
   roles:
     - role: nginx
       nginx_sites:
@@ -36,3 +40,9 @@
     - ora
     - discern
     - edx_ansible
+    - role: datadog
+      when: ENABLE_DATADOG
+    - role: splunkforwarder
+      when: ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: ENABLE_NEWRELIC