Merge branch 'testing2' into 'master'

Fixed gatling

See merge request surya/devops-workshop!14

gatling/chat/ChatSimulation.scala

@@ -8,24 +8,22 @@ import io.gatling.jdbc.Predef._
 
 class ChatSimulation extends Simulation {
 
-	val httpProtocol = http
-    .baseURL("http://localhost")
-		.inferHtmlResources(BlackList(""".*\.css""", """.*\.js""", """.*\.ico"""), WhiteList())
-		.acceptHeader("*/*")
+  val httpProtocol = http // 4
+    .baseUrl("http://localhost") // 5
+    .acceptHeader("*/*") // 6
+    .doNotTrackHeader("1")
     .acceptEncodingHeader("gzip, deflate")
     .acceptLanguageHeader("no,en;q=0.9,en-US;q=0.8,nb-NO;q=0.7,nb;q=0.6")
     .userAgentHeader("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.80 Safari/537.36")
 
   val headers_0 = Map(
     "Content-Type" -> "application/json; charset=utf-8;",
-		"Origin" -> "http://localhost"
-              )
+    "Origin" -> "http://localhost")
 
   val headers_3 = Map(
     "Accept" -> "application/json",
     "Content-Type" -> "application/json",
-		"Origin" -> "http://localhost"
-              )
+    "Origin" -> "http://localhost")
 
   val uri1 = "http://localhost/api"
 

installGatling

 #!/bin/bash
-wget https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/2.3.1/gatling-charts-highcharts-bundle-2.3.1-bundle.zip -P ~
-unzip ~/gatling-charts-highcharts-bundle-2.3.1-bundle.zip -d ~
+wget https://repo1.maven.org/maven2/io/gatling/highcharts/gatling-charts-highcharts-bundle/3.9.1/gatling-charts-highcharts-bundle-3.9.1-bundle.zip -P ~
+unzip ~/gatling-charts-highcharts-bundle-3.9.1-bundle.zip -d ~
 echo Gatling Stress Tool installed

runGatling

 #!/bin/bash
-cp -r gatling/chat ~/gatling-charts-highcharts-bundle-2.3.1/user-files/simulations
-cp gatling/usernames.csv ~/gatling-charts-highcharts-bundle-2.3.1/user-files/data
-~/gatling-charts-highcharts-bundle-2.3.1/bin/gatling.sh
\ No newline at end of file
+cp -r gatling/chat ~/gatling-charts-highcharts-bundle-3.9.1/user-files/simulations
+cp gatling/usernames.csv ~/gatling-charts-highcharts-bundle-3.9.1/user-files/resources
+~/gatling-charts-highcharts-bundle-3.9.1/bin/gatling.sh
\ No newline at end of file