From f7151daa4e04569f95ae8793221f2b6ca3076778 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett.langdon@datadoghq.com>
Date: Sat, 13 Jul 2019 16:02:34 -0400
Subject: [PATCH] make step 3 easier

---
 dash-apm-python/index.json           |  3 +-
 dash-apm-python/step_3.md            | 58 +++-------------------------
 dash-apm-python/step_3_background.sh |  3 ++
 3 files changed, 10 insertions(+), 54 deletions(-)
 create mode 100644 dash-apm-python/step_3_background.sh

diff --git a/dash-apm-python/index.json b/dash-apm-python/index.json
index 8aba68d..5c9d1bb 100644
--- a/dash-apm-python/index.json
+++ b/dash-apm-python/index.json
@@ -13,7 +13,8 @@
       },
       {
         "title": "Enable trace analytics",
-        "text": "step_3.md"
+        "text": "step_3.md",
+        "courseData": "step_3_background.sh"
       },
       {
         "title": "Adding custom metadata",
diff --git a/dash-apm-python/step_3.md b/dash-apm-python/step_3.md
index 2799ee5..dc9bbeb 100644
--- a/dash-apm-python/step_3.md
+++ b/dash-apm-python/step_3.md
@@ -1,62 +1,14 @@
-Add the following environment variable to the `frontend`, `node`, `pumps`,
-and `sensors` services in `docker-compose.yml`.
+We are going to enable trace search and analytics feature
+which is not enabled by default OOTB for Datadog APM.
 
-`DD_TRACE_ANALYTICS_ENABLED=true`{{copy}}
+To enable you can set the environment variable `DD_TRACE_ANALYTICS_ENABLED=true`.
 
-Our services should look like:
+We have taken care of this step for you by adding it to the `.env` file.
 
-```yaml
-frontend:
-  env_file: ".env"
-  environment:
-    - FLASK_APP=api.py
-    - FLASK_DEBUG=1
-    - DATADOG_SERVICE_NAME=frontend
-    - DATADOG_TRACE_AGENT_HOSTNAME=agent
-    - DD_TRACE_ANALYTICS_ENABLED=true
-```{{copy}}
-
-``` yaml
-node:
-  env_file: ".env"
-  environment:
-    - DD_SERVICE_NAME=users-api
-    - DD_TRACE_AGENT_HOSTNAME=agent
-    - DD_TRACE_ANALYTICS_ENABLED=true
-```{{copy}}
-
-```yaml
-pumps:
-  env_file: ".env"
-  environment:
-    - FLASK_APP=pumps.py
-    - FLASK_DEBUG=1
-    - POSTGRES_PASSWORD=postgres
-    - POSTGRES_USER=postgres
-    - DATADOG_SERVICE_NAME=pumps-service
-    - DATADOG_TRACE_AGENT_HOSTNAME=agent
-    - DD_TRACE_ANALYTICS_ENABLED=true
-```{{copy}}
-
-```yaml
-sensors:
-  env_file: ".env"
-  environment:
-    - FLASK_APP=sensors.py
-    - FLASK_DEBUG=1
-    - POSTGRES_PASSWORD=postgres
-    - POSTGRES_USER=postgres
-    - DATADOG_SERVICE_NAME=sensors-api
-    - DATADOG_TRACE_AGENT_HOSTNAME=agent
-    - DD_TRACE_ANALYTICS_ENABLED=true
-```{{copy}}
-
-
-Afterwards restart docker services:
+To have the change take effect restart our docker services:
 
 `restart-services`{{execute interrupt}}
 
-
 Finally, open trace analytics dashboard:
 
 https://app.datadoghq.com/apm/search/analytics
diff --git a/dash-apm-python/step_3_background.sh b/dash-apm-python/step_3_background.sh
new file mode 100644
index 0000000..3600c35
--- /dev/null
+++ b/dash-apm-python/step_3_background.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "DD_TRACE_ANALYTICS_ENABLED=true" >> /tracing-workshop/.env