From 9df1ac9d600f0b70e3075d2f3c23dfaa775f3a2c Mon Sep 17 00:00:00 2001
From: joeaba <77398477+joeaba@users.noreply.github.com>
Date: Wed, 5 Apr 2023 11:12:29 -0500
Subject: [PATCH] fix session timeout (#31057)

* fix session timeout
---
 metrics/metrics-internal/chronograf_8888_internal.sh | 2 +-
 metrics/metrics-internal/chronograf_8889_internal.sh | 2 +-
 metrics/metrics-internal/grafana_internal.sh         | 4 ++--
 metrics/metrics-internal/start.sh                    | 8 ++++----
 metrics/metrics-main/chronograf.sh                   | 2 +-
 metrics/metrics-main/chronograf_8889.sh              | 2 +-
 metrics/metrics-main/start.sh                        | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/metrics/metrics-internal/chronograf_8888_internal.sh b/metrics/metrics-internal/chronograf_8888_internal.sh
index 907524720..cf7cb2bb4 100644
--- a/metrics/metrics-internal/chronograf_8888_internal.sh
+++ b/metrics/metrics-internal/chronograf_8888_internal.sh
@@ -53,4 +53,4 @@ sudo docker run \
   --volume /var/lib/chronograf:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
diff --git a/metrics/metrics-internal/chronograf_8889_internal.sh b/metrics/metrics-internal/chronograf_8889_internal.sh
index 41d7fc645..92f85c7be 100644
--- a/metrics/metrics-internal/chronograf_8889_internal.sh
+++ b/metrics/metrics-internal/chronograf_8889_internal.sh
@@ -53,4 +53,4 @@ sudo docker run \
   --volume /var/lib/chronograf_8889:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
diff --git a/metrics/metrics-internal/grafana_internal.sh b/metrics/metrics-internal/grafana_internal.sh
index 1675b69a8..33b38590f 100644
--- a/metrics/metrics-internal/grafana_internal.sh
+++ b/metrics/metrics-internal/grafana_internal.sh
@@ -41,8 +41,8 @@ sudo docker run \
   --publish 3000:3000 \
   --user root:root \
   --env GF_PATHS_CONFIG=/grafana.ini \
-  --env GF_AUTH_GITHUB_CLIENT_ID="$GITHUB_CLIENT_ID" \
-  --env GF_AUTH_GITHUB_CLIENT_SECRET="$GITHUB_CLIENT_SECRET" \
+  --env GF_AUTH_GOOGLE_CLIENT_ID="$GOOGLE_CLIENT_ID" \
+  --env GF_AUTH_GOOGLE_CLIENT_SECRET="$GOOGLE_CLIENT_SECRET" \
   --env GF_SECURITY_ADMIN_USER="$ADMIN_USER_GRAFANA" \
   --env GF_SECURITY_ADMIN_PASSWORD="$ADMIN_PASSWORD_GRAFANA" \
   --volume "$PWD"/certs:/certs:ro \
diff --git a/metrics/metrics-internal/start.sh b/metrics/metrics-internal/start.sh
index 13b4831ef..f93b07518 100644
--- a/metrics/metrics-internal/start.sh
+++ b/metrics/metrics-internal/start.sh
@@ -48,8 +48,8 @@ sudo docker run \
   --publish 3000:3000 \
   --user root:root \
   --env GF_PATHS_CONFIG=/grafana.ini \
-  --env GF_AUTH_GITHUB_CLIENT_ID="$GITHUB_CLIENT_ID" \
-  --env GF_AUTH_GITHUB_CLIENT_SECRET="$GITHUB_CLIENT_SECRET" \
+  --env GF_AUTH_GOOGLE_CLIENT_ID="$GOOGLE_CLIENT_ID" \
+  --env GF_AUTH_GOOGLE_CLIENT_SECRET="$GOOGLE_CLIENT_SECRET" \
   --env GF_SECURITY_ADMIN_USER="$ADMIN_USER_GRAFANA" \
   --env GF_SECURITY_ADMIN_PASSWORD="$ADMIN_PASSWORD_GRAFANA" \
   --volume "$PWD"/certs:/certs:ro \
@@ -96,7 +96,7 @@ sudo docker run \
   --volume /var/lib/chronograf_8889:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
 
 sudo docker run \
   --detach \
@@ -117,7 +117,7 @@ sudo docker run \
   --volume /var/lib/chronograf:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
 
 curl -h | sed -ne '/--tlsv/p'
 curl --retry 10 --retry-delay 5 -v --head https://"$HOST":8086/ping
diff --git a/metrics/metrics-main/chronograf.sh b/metrics/metrics-main/chronograf.sh
index 423c008ed..9639acd87 100644
--- a/metrics/metrics-main/chronograf.sh
+++ b/metrics/metrics-main/chronograf.sh
@@ -55,4 +55,4 @@ sudo docker run \
   --volume /var/lib/chronograf:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file=5 \
-  chronograf:1.8.8 --influxdb-url=https://metrics.solana.com:8086
+  $CHRONOGRAF_IMAGE --influxdb-url=https://metrics.solana.com:8086 --auth-duration="720h" --inactivity-duration="48h"
diff --git a/metrics/metrics-main/chronograf_8889.sh b/metrics/metrics-main/chronograf_8889.sh
index 54b8ef40d..712a682ed 100644
--- a/metrics/metrics-main/chronograf_8889.sh
+++ b/metrics/metrics-main/chronograf_8889.sh
@@ -52,4 +52,4 @@ sudo docker run \
   --volume /var/lib/chronograf_8889:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
diff --git a/metrics/metrics-main/start.sh b/metrics/metrics-main/start.sh
index 5b7bbac30..37055b48b 100755
--- a/metrics/metrics-main/start.sh
+++ b/metrics/metrics-main/start.sh
@@ -111,7 +111,7 @@ sudo docker run \
   --volume /var/lib/chronograf_8889:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file="5" \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD"
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --influxdb-username="$INFLUXDB_USERNAME" --influxdb-password="$INLUXDB_PASSWORD" --auth-duration="720h" --inactivity-duration="48h"
 
 sudo docker run \
   --detach \
@@ -132,7 +132,7 @@ sudo docker run \
   --volume /var/lib/chronograf:/var/lib/chronograf \
   --log-opt max-size=1g \
   --log-opt max-file=5 \
-  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086
+  $CHRONOGRAF_IMAGE --influxdb-url=https://"$HOST":8086 --auth-duration="720h" --inactivity-duration="48h"
 
 sudo docker run \
   --detach \