test(smoketest): place Grafana dashboard behind oauth proxy (#230)

smoketest.bash

@@ -18,6 +18,7 @@ OPEN_TABS=${OPEN_TABS:-false}
 
 CRYOSTAT_HTTP_PORT=8080
 USE_PROXY=${USE_PROXY:-true}
+DEPLOY_GRAFANA=false
 
 display_usage() {
     echo "Usage:"
@@ -50,6 +51,7 @@ while getopts "hs:prgtOVXcb" opt; do
             ;;
         g)
             FILES+=("${DIR}/smoketest/compose/cryostat-grafana.yml" "${DIR}/smoketest/compose/jfr-datasource.yml")
+            DEPLOY_GRAFANA=true
             ;;
         t)
             FILES+=("${DIR}/smoketest/compose/sample-apps.yml")
@@ -78,13 +80,20 @@ while getopts "hs:prgtOVXcb" opt; do
             ;;
     esac
 done
-export CRYOSTAT_HTTP_PORT
+
 if [ "${USE_PROXY}" = "true" ]; then
     FILES+=("${DIR}/smoketest/compose/auth_proxy.yml")
     CRYOSTAT_HTTP_PORT=8181
+    GRAFANA_DASHBOARD_EXT_URL=http://localhost:8080/grafana/
 else
     FILES+=("${DIR}/smoketest/compose/no_proxy.yml")
+    if [ "${DEPLOY_GRAFANA}" = "true" ]; then
+      FILES+=("${DIR}/smoketest/compose/grafana_no_proxy.yml")
+    fi
+    GRAFANA_DASHBOARD_EXT_URL=http://grafana:3000/
 fi
+export CRYOSTAT_HTTP_PORT
+export GRAFANA_DASHBOARD_EXT_URL
 
 s3Manifest="${DIR}/smoketest/compose/s3-${s3}.yml"
 

smoketest/compose/auth_proxy_alpha_config.yaml

@@ -6,6 +6,9 @@ upstreamConfig:
     - id: cryostat
       path: /
       uri: http://cryostat:8181
+    - id: grafana
+      path: /grafana/
+      uri: http://grafana:3000
 providers:
   - id: dummy
     name: Unused - Sign In Below

smoketest/compose/cryostat-grafana.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
   cryostat:
     environment:
-      - GRAFANA_DASHBOARD_EXT_URL=http://localhost:3000
+      - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-http://localhost:3000/}
       - GRAFANA_DASHBOARD_URL=http://grafana:3000
   grafana:
     image: ${GRAFANA_DASHBOARD_IMAGE:-quay.io/cryostat/cryostat-grafana-dashboard:latest}
@@ -16,9 +16,10 @@ services:
     environment:
       - GF_INSTALL_PLUGINS=grafana-simple-json-datasource
       - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_SERVER_DOMAIN=localhost
+      - GF_SERVER_ROOT_URL=http://localhost:8080/grafana/
+      - GF_SERVER_SERVE_FROM_SUB_PATH=true
       - JFR_DATASOURCE_URL=http://jfr-datasource:8080
-    ports:
-      - "3000:3000"
     expose:
       - "3000"
     healthcheck:

smoketest/compose/grafana_no_proxy.yml

@@ -0,0 +1,13 @@
+version: "3"
+services:
+  cryostat:
+    environment:
+      - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-http://localhost:3000/}
+      - GRAFANA_DASHBOARD_URL=http://grafana:3000
+  grafana:
+    ports:
+      - '3000:3000'
+    environment:
+      - GF_SERVER_DOMAIN=
+      - GF_SERVER_ROOT_URL=
+      - GF_SERVER_SERVE_FROM_SUB_PATH=false