Set up DBM files

.github/workflows/release.yml

@@ -44,6 +44,7 @@ jobs:
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/auth
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/nginx
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend
+            ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/dbm
           )
 
           for i in "${IMAGES[@]}"

README.md

@@ -112,6 +112,30 @@ For example: Turning `cart` off will disable Cart capabilities.
 - Turn `wishlist` on by setting `wishlist` to `true`.
 - Run the app and the wishlist functionality should be back on.
 
+#### How to run the DBM backend to test the Database Monitoring in the product and incrementally improve for the workshop
+
+- complete the startup steps up under Local Development to number 3
+- in `services/frontend/site/featureFlags.config.json` find the object with `name:dbm` and set `active:true`
+- run `docker-compose --profile dbm up -d`
+- once all the containers are up, run `docker exec storedog-postgres-1 ./dbm_exec.sh` this will add a few things we need for dbm to the database
+- run `docker restart storedog-postgres-1` to restart the postgres container
+
+You should now see your logs in DBM!
+
+Once the metrics are showing in DBM, direct the users to the `dbm.py` file in `services/dbm/dbm.py`.
+
+Have them update the query to change the 2 `{random.randint(1, 7000)}` to `{random.randint(5000, 7000)}` so only the most popular items show in the ticker.
+
+Then explain that preorder items get marked as false or `f` in the table once they are now regular items. Say that best practice would be to update the `items` table to include the items marked `f`. Now we will update the query to the following to only look at the `items` table.
+
+```sql
+SELECT *
+FROM items
+WHERE order_count::int > {random.randint(5000, 7000)}
+```
+
+This will greatly reduce the amount of cost per query
+
 ## Troubleshoot
 
 <details>

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     command: yarn dev
     depends_on:
       - worker
+      - dd-agent
     volumes:
       - "./services/frontend/site:/storedog-app/site"
     ports:
@@ -20,27 +21,36 @@ services:
       - "80:80"
     depends_on:
       - frontend
+      - dd-agent
     labels:
       com.datadoghq.ad.logs: '[{"source": "nginx", "service": "nginx"}]'
     networks:
       - storedog-net
   postgres:
     image: postgres:13-alpine
     restart: always
+    depends_on: 
+      - dd-agent
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
     volumes:
       - 'postgres:/var/lib/postgresql/data'
       - ./services/backend/db/restore:/docker-entrypoint-initdb.d
+      - ./services/backend/db/postgresql.conf:/postgresql.conf
+      - ./services/dbm/dbm_setup.sql:/etc/postgresql/13/main/dbm_setup.sql
+      - ./services/dbm/dbm_exec.sh:/dbm_exec.sh
     labels:
       com.datadoghq.ad.check_names: '["postgres"]'
       com.datadoghq.ad.init_configs: '[{}]'
       com.datadoghq.ad.instances: '[{"host":"%%host%%", "port":5432,"username":"datadog","password":"datadog"}]'
       com.datadoghq.ad.logs: '[{"source":"postgresql","service":"postgresql"}]'
+    command: ["postgres", "-c", "config_file=/postgresql.conf"]
     networks:
       - storedog-net
   redis:
     image: redis:6.2-alpine
+    depends_on:
+      - dd-agent
     volumes:
       - 'redis:/data'
     networks:
@@ -49,6 +59,7 @@ services:
     depends_on:
       - 'postgres'
       - 'redis'
+      - 'dd-agent'
     build:
       context: ./services/backend
     ports:
@@ -63,13 +74,15 @@ services:
       DB_PORT: 5432
       DISABLE_SPRING: 1
       DD_APPSEC_ENABLED: 1
+      DD_AGENT_HOST: 172.43.0.1
     networks:
       - storedog-net
   worker:
     depends_on:
       - 'postgres'
       - 'redis'
       - 'web'
+      - 'dd-agent'
     build:
       context: ./services/backend
     command: bundle exec sidekiq -C config/sidekiq.yml
@@ -83,11 +96,13 @@ services:
       DB_PORT: 5432
       DISABLE_SPRING: 1
       DD_APPSEC_ENABLED: 1
+      DD_AGENT_HOST: 172.43.0.1
     networks:
       - storedog-net
   ads:
     depends_on:
       - postgres
+      - dd-agent
     environment:
       - FLASK_APP=ads.py
       - FLASK_DEBUG=1
@@ -116,6 +131,7 @@ services:
   discounts:
     depends_on:
       - postgres
+      - dd-agent
     environment:
       - FLASK_APP=discounts.py
       - FLASK_DEBUG=1
@@ -145,6 +161,7 @@ services:
   auth:
     depends_on:
       - postgres
+      - dd-agent
     profiles:
       - csrf
     environment:
@@ -171,6 +188,7 @@ services:
   dbm:
     depends_on:
       - postgres
+      - dd-agent
     profiles:
       - dbm
     environment:
@@ -201,19 +219,25 @@ services:
       - DD_APM_ENABLED=true
       - DD_APM_NON_LOCAL_TRAFFIC=true
       - DD_LOGS_ENABLED=true
+      - DD_HOSTNAME=172.43.0.4
       - DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true
-      - DD_CONTAINER_EXCLUDE="name:datadog-agent"
+      - DD_CONTAINER_EXCLUDE=name datadog-agent
+      - DD_HOSTNAME_TRUST_UTS_NAMESPACE=true
     ports:
       - "8126:8126"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /proc/:/host/proc/:ro
       - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
+      - ./services/backend/db/dd-agent-conf.yaml:/conf.d/postgres.d/conf.yaml
     networks:
-      - storedog-net
+      storedog-net:
+        ipv4_address: 172.43.0.4
   ads-java:
     build:
       context: ./services/ads/java
+    depends_on:
+      - dd-agent
     environment:
       - DD_SERVICE=ads-java
       - DD_AGENT_HOST=dd-agent
@@ -243,6 +267,7 @@ services:
     depends_on:
       - web
       - discounts
+      - dd-agent
     networks:
       - storedog-net