From 806ddd63a0ee06746429e5f01cd7e860e9f76e67 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 25 Jan 2019 13:16:19 +0100
Subject: [PATCH] load test/ha fixes

---
 devenv/docker/ha_test/docker-compose.yaml | 3 ++-
 devenv/docker/loadtest/auth_token_test.js | 4 ++--
 devenv/docker/loadtest/run.sh             | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/devenv/docker/ha_test/docker-compose.yaml b/devenv/docker/ha_test/docker-compose.yaml
index ef4f6225cbe..e8f212e1cd5 100644
--- a/devenv/docker/ha_test/docker-compose.yaml
+++ b/devenv/docker/ha_test/docker-compose.yaml
@@ -55,7 +55,8 @@ services:
       # - GF_DATABASE_SSL_MODE=disable
       # - GF_SESSION_PROVIDER=postgres
       # - GF_SESSION_PROVIDER_CONFIG=user=grafana password=password host=db port=5432 dbname=grafana sslmode=disable
-      - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug
+      - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug,auth:debug
+      - GF_LOGIN_ROTATE_TOKEN_MINUTES=2
     ports:
       - 3000
     depends_on:
diff --git a/devenv/docker/loadtest/auth_token_test.js b/devenv/docker/loadtest/auth_token_test.js
index c7c6fb98efe..e1356fb6f9a 100644
--- a/devenv/docker/loadtest/auth_token_test.js
+++ b/devenv/docker/loadtest/auth_token_test.js
@@ -6,8 +6,8 @@ export let options = {
   noCookiesReset: true
 };
 
-let endpoint = __ENV.URL || 'http://localhost:3000'
-const client = createClient(endpoint)
+let endpoint = __ENV.URL || 'http://localhost:3000';
+const client = createClient(endpoint);
 
 export const setup = () => {
   const basicAuthClient = createBasicAuthClient(endpoint, 'admin', 'admin');
diff --git a/devenv/docker/loadtest/run.sh b/devenv/docker/loadtest/run.sh
index 9edb8879080..474d75383b6 100755
--- a/devenv/docker/loadtest/run.sh
+++ b/devenv/docker/loadtest/run.sh
@@ -4,17 +4,21 @@ PWD=$(pwd)
 
 run() {
   duration='15m'
+  url='http://localhost:3000'
 
-  while getopts ":d:" o; do
+  while getopts ":d:u:" o; do
     case "${o}" in
 				d)
             duration=${OPTARG}
             ;;
+        u)
+            url=${OPTARG}
+            ;;
     esac
 	done
 	shift $((OPTIND-1))
 
-  docker run -t --network=host -v $PWD:/src --rm -i loadimpact/k6:master run --vus 2 --duration $duration src/auth_token_test.js
+  docker run -t --network=host -v $PWD:/src -e URL=$url --rm -i loadimpact/k6:master run --vus 2 --duration $duration src/auth_token_test.js
 }
 
 run "$@"