Pierre-make-start-visible

ctf/datadog-values.yaml

@@ -35,7 +35,7 @@ datadog:
   # logLevel: info
   ## Set global tags
   tags:
-    - env: infosys-test-1
+    - env: dash2024
 
   ## Enable Log collections
   logs:
@@ -88,7 +88,7 @@ datadog:
           fieldPath: status.hostIP
   # Enable data to be sent with invalid certs (required for kind cluster)
     tlsVerify: false
-  clusterName: infosys-test-1
+  clusterName: dash2024
 
   ## Set up global environment for agent and pods communication
   env:

kubernetes-manifests/adservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: adservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "adservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: adservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "adservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/cartservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: cartservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "cartservice"
       tags.datadoghq.com/version: "0.5.0"  
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: cartservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "cartservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/checkoutservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: checkoutservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "checkoutservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: checkoutservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "checkoutservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/currencyservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: currencyservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "currencyservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: currencyservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "currencyservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/emailservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: emailservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "emailservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: emailservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "emailservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/frontend.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: frontend
   labels:
-    tags.datadoghq.com/env: "infosys-test-1"
+    tags.datadoghq.com/env: "dash2024"
     tags.datadoghq.com/service: "frontend"
     tags.datadoghq.com/version: "1.2"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: frontend
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "frontend"
         tags.datadoghq.com/version: "1.2"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/loadgenerator.yaml

@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: loadgenerator
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "loadgenerator"
       tags.datadoghq.com/version: "1.0"
 spec:

kubernetes-manifests/paymentdbservice.yaml

@@ -4,7 +4,7 @@ metadata:
   name: paymentdbservice
   labels:
     name: mysql
-    tags.datadoghq.com/env: "infosys-test-1"
+    tags.datadoghq.com/env: "dash2024"
     tags.datadoghq.com/service: "paymentdbservice"
     tags.datadoghq.com/version: "0.5.0"
 spec: # specification for deployment resource
@@ -18,7 +18,7 @@ spec: # specification for deployment resource
       labels:
         app: paymentdbservice # service will look for this label
         name: paymentdbservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "paymentdbservice"
         tags.datadoghq.com/version: "0.5.0"
       annotations:

kubernetes-manifests/paymentservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: paymentservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "paymentservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: paymentservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "paymentservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/productcatalogservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: productcatalogservice
   labels:
-    tags.datadoghq.com/env: "infosys-test-1"
+    tags.datadoghq.com/env: "dash2024"
     tags.datadoghq.com/service: "productcatalogservice"
     tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: productcatalogservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "productcatalogservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/recommendationservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: recommendationservice
   labels:
-      tags.datadoghq.com/env: "infosys-test-1"
+      tags.datadoghq.com/env: "dash2024"
       tags.datadoghq.com/service: "recommendationservice"
       tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: recommendationservice
-        tags.datadoghq.com/env: "infosys-test-1"
+        tags.datadoghq.com/env: "dash2024"
         tags.datadoghq.com/service: "recommendationservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

kubernetes-manifests/shippingservice.yaml

@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: shippingservice
   labels:
-    tags.datadoghq.com/env: "tkso2024"
+    tags.datadoghq.com/env: "dsah2024"
     tags.datadoghq.com/service: "shippingservice"
     tags.datadoghq.com/version: "0.5.0"
 spec:
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: shippingservice
-        tags.datadoghq.com/env: "tkso2024"
+        tags.datadoghq.com/env: "dsah2024"
         tags.datadoghq.com/service: "shippingservice"
         tags.datadoghq.com/version: "0.5.0"
         admission.datadoghq.com/enabled: "true"

src/frontend/handlers.go

@@ -75,7 +75,7 @@ func (fe *frontendServer) homeHandler(w http.ResponseWriter, r *http.Request) {
 	// introducing a random delay for AIOps - Faulty Deployment RCA
 	// TODO: Make this into a feature flag later
 	// 
-	time.Sleep(time.Duration(rand.Int31n(30)) * time.Second);
+	// time.Sleep(time.Duration(rand.Int31n(30)) * time.Second); -- commented out for now - not needed for DASH 2024
 
 	type productView struct {
 		Item  *pb.Product

src/frontend/templates/header.html

@@ -51,13 +51,13 @@
         })(window,document,'script','https://www.datadoghq-browser-agent.com/us1/v5/datadog-rum.js','DD_RUM')
         window.DD_RUM.onReady(function() {
           window.DD_RUM.init({
-            clientToken: 'pub77bae0430f8671d2b626b138d2b93052',
-            applicationId: 'e1545e23-42e9-4da5-927b-22ab2766fd4d',
+            clientToken: 'RUM_CLIENT_TOKEN',
+            applicationId: 'RUM_APP_ID',
             // `site` refers to the Datadog site parameter of your organization
             // see https://docs.datadoghq.com/getting_started/site/
             site: 'datadoghq.com',
-            service: 'swagstore-nohoon',
-            env: 'nohoon-dev',
+            service: 'swagstore',
+            env: 'dash2024',
             // Specify a version number to identify the deployed version of your application in Datadog
             // version: '1.0.0', 
             sessionSampleRate: 100,

src/paymentservice/Dockerfile

@@ -11,12 +11,13 @@ RUN apt-get install -y curl vim
 # Chris: I'm adding this to debug
 RUN apt-get -y install sudo
 
-RUN mkdir /app/data
+RUN mkdir -p /app/data
 RUN chmod -R 777 /app/data
 
 # Chris: just testing something with version 0.6.1 - broke artifactory so will just use local builds for now. What could go wrong?
 # Patrick: updating the version to 0.6.2 per the modified source. The jar is placed in releases directory.
-COPY releases/paymentservicejava-0.6.2.jar /app/paymentservice.jar
+# Aless: updating the version to 0.6.3 to support JSON STDOUT logging. The jar is placed in releases directory.
+COPY releases/paymentservicejava-0.6.3.jar /app/paymentservice.jar
 
 WORKDIR /app
 RUN wget -O dd-java-agent.jar https://dtdg.co/latest-java-tracer

src/paymentservice/src/main/resources/logback.xml

@@ -1,13 +1,10 @@
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-      <immediateFlush>true</immediateFlush>
-
-      <encoder>
-        <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %X{dd.trace_id} %X{dd.span_id} - %m%n</pattern>
-      </encoder>
-    </appender>
-
-    <root level="DEBUG">
-      <appender-ref ref="STDOUT"/>
-    </root>
-  </configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <immediateFlush>true</immediateFlush>
+    <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+  </appender>
+
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>

start.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "Starting..."
+## Start Minikube
+echo "> Creation of Minikube"
+minikube start --cpus=6 --memory 16384 --mount --mount-string="/proc:/host/proc"
+kubectl create secret generic datadog-secret --from-literal=api-key=$DD_API_KEY --from-literal=app-key=$DD_APP_KEY
+## Reconfigure agent
+echo "> Setting up of datadog-agent"
+helm install datadog-agent -f ctf/datadog-values.yaml datadog/datadog --set datadog.apiKey=$DD_API_KEY
+## Restart kubernetes Deployment and Services
+echo "> (Building) Running micro-services"
+
+# Set context to docker
+eval $(minikube -p minikube docker-env)
+# Pull all missing images
+docker pull redis:alpine
+docker pull mariadb
+docker pull busybox:latest
+
+# Skaffold build and run
+## Loop until 18 pods are up 
+skaffold build --platform=linux/amd64
+until [[ $(kubectl get pods | awk 'END{print NR}') -gt 17 ]]; do skaffold run --platform=linux/amd64; done
+
+echo "> Configuring extras"
+# Setting variable to check agent status
+export AGENT_POD=$(kubectl get pods | sed -e '/datadog-agent/!d' | sed -n '/cluster/!p' | sed -n '/metrics/!p' | awk -F' ' '{print $1}')
+# Configure nginx
+export FRONTEND_LB=$(minikube service frontend-lb --url)
+sudo -E ./ctf/microservices/conf_nginx.sh