consolidate dd and splunk into deploy plays

playbooks/edx-east/certs.yml

@@ -2,7 +2,14 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - certs
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/common.yml

@@ -2,7 +2,14 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - common
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/discern.yml

@@ -2,6 +2,9 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
@@ -9,3 +12,7 @@
       nginx_sites:
       - discern
     - discern
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/edxapp.yml

@@ -2,6 +2,9 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
@@ -12,3 +15,7 @@
       nginx_default_sites:
       - lms
     - edxapp
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/forum.yml

@@ -2,6 +2,9 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
@@ -9,3 +12,7 @@
       nginx_sites:
       - forum
     - forum
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/worker.yml

@@ -2,8 +2,15 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - role: edxapp
       celery_worker: True
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/xqueue.yml

@@ -2,6 +2,9 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
@@ -9,3 +12,7 @@
       nginx_sites:
       - xqueue
     - role: xqueue
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

playbooks/edx-east/xserver.yml

@@ -2,6 +2,9 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    enable_datadog: True
+    enable_newrelic: True
   vars_files:
     - ["{{ secure_vars }}", "dummy.yml"]
   roles:
@@ -9,3 +12,7 @@
       nginx_sites:
       - xserver
     - role: xserver
+    - role: datadog
+      when: enable_datadog
+    - role: newrelic
+      when: enable_datadog

util/vpc-tools/abbey.py

@@ -23,7 +23,7 @@ AMI_TIMEOUT = 600  # time to wait for AMIs to complete
 EC2_RUN_TIMEOUT = 180  # time to wait for ec2 state transition
 EC2_STATUS_TIMEOUT = 300  # time to wait for ec2 system status checks
 NUM_TASKS = 5  # number of tasks for time summary report
-NUM_PLAYBOOKS = 4
+NUM_PLAYBOOKS = 2
 
 
 class MongoConnection:
@@ -346,8 +346,6 @@ sudo pip install -r requirements.txt
 cd $playbook_dir
 
 ansible-playbook -vvvv -c local -i "localhost," $play.yml -e@$extra_vars -e@$common_vars_file
-ansible-playbook -vvvv -c local -i "localhost," datadog.yml -e@$extra_vars -e@$common_vars_file
-ansible-playbook -vvvv -c local -i "localhost," splunkforwarder.yml -e@$extra_vars -e@$common_vars_file
 ansible-playbook -vvvv -c local -i "localhost," stop_all_edx_services.yml -e@$extra_vars -e@$common_vars_file
 
 rm -rf $base_dir