From f7c3f79d67a326c49e25c91104237a4260d7bc09 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 05:31:25 +0000 Subject: [PATCH 1/7] Include docker in gitpod default --- .gitpod.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..1981298 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,3 @@ +vscode: + extensions: + - ms-azuretools.vscode-docker \ No newline at end of file From 5bcb2fc089f655e672b1ba1c952d128ccdb4c981 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 05:45:43 +0000 Subject: [PATCH 2/7] New kibana endpoint, remove versions --- docker-compose.override.yml.example | 2 -- docker-compose.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docker-compose.override.yml.example b/docker-compose.override.yml.example index 0b6864f..0ea89e8 100644 --- a/docker-compose.override.yml.example +++ b/docker-compose.override.yml.example @@ -1,5 +1,3 @@ -version: "3.8" - services: proxy: ports: diff --git a/docker-compose.yml b/docker-compose.yml index 30dddf9..6f50605 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,8 @@ -version: "3.8" - services: proxy: image: nginx:1.19 environment: - - KIBANA_ENDPOINT=https://5bc3d4f7330a4459881197a85659caf5.us-west-2.aws.found.io:9243 + - KIBANA_ENDPOINT=https://my-deployment-c3fead.kb.us-west-2.aws.found.io:9243 - KIBANA_BASIC_AUTH ports: - 80:80 From c1f805de78c131e1bec6554e50cca3b96535ef81 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 05:57:44 +0000 Subject: [PATCH 3/7] Update proxy and renderer --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f50605..9f80b4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: proxy: - image: nginx:1.19 + image: nginx:1.27 environment: - KIBANA_ENDPOINT=https://my-deployment-c3fead.kb.us-west-2.aws.found.io:9243 - KIBANA_BASIC_AUTH @@ -29,7 +29,7 @@ services: - GF_SERVER_ROOT_URL renderer: - image: grafana/grafana-image-renderer:3.3.0 + image: grafana/grafana-image-renderer:3.11.4 library: image: safecast/library:latest From d237210412f764e05e01dbea41554b83b1c814e0 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 06:19:03 +0000 Subject: [PATCH 4/7] Put comment in env example Looks like docker compose doesn't exec $() anymore. --- .env.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index a7beb61..f431c55 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,3 @@ -KIBANA_BASIC_AUTH=$(echo 'MYUSER:MYPASS' | base64 -i -) +# replace with $(echo 'reporting-proxy:PASSWORD' | base64 -i -) +KIBANA_BASIC_AUTH=CHANGE_THIS_VALUE GF_DATABASE_TYPE=sqlite3 From 2b77252ba01700803cc726b8a321a8d2ec037f2c Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 06:19:33 +0000 Subject: [PATCH 5/7] Update grafana proxy to pass origin Per https://stackoverflow.com/a/74927449/69002 --- proxy/templates/grafana.conf.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proxy/templates/grafana.conf.template b/proxy/templates/grafana.conf.template index f617970..e5254cd 100644 --- a/proxy/templates/grafana.conf.template +++ b/proxy/templates/grafana.conf.template @@ -4,6 +4,8 @@ server { server_name grafana.* grafana-dev.*; location / { + proxy_set_header Host grafana; + proxy_set_header Origin http://grafana:3000; proxy_pass http://grafana:3000; } } From 17324a36f5dd8b34e772a2c0816cb520248986e0 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 06:29:56 +0000 Subject: [PATCH 6/7] Hopefully make teamdata admins --- grafana/grafana.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/grafana/grafana.ini b/grafana/grafana.ini index 6e64da5..51d6258 100644 --- a/grafana/grafana.ini +++ b/grafana/grafana.ini @@ -18,10 +18,9 @@ auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token allow_sign_up = true allowed_organizations = Safecast -role_attribute_path = contains(info.roles[*], 'admin') && 'GrafanaAdmin' || 'Viewer' +role_attribute_path = contains(groups[*], '@safecast/teamdata') && 'Admin' || 'Viewer' allow_assign_grafana_admin = true - [external_image_storage] provider = s3 From 1d791d1b8346784fb19fab2ca54a5616a96fc872 Mon Sep 17 00:00:00 2001 From: Mat Schaffer Date: Fri, 13 Sep 2024 06:34:01 +0000 Subject: [PATCH 7/7] Bump to latest grafana --- Dockerfile.grafana | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.grafana b/Dockerfile.grafana index 95d62d8..571d839 100644 --- a/Dockerfile.grafana +++ b/Dockerfile.grafana @@ -1,4 +1,4 @@ -FROM grafana/grafana:11.1.1 +FROM grafana/grafana:11.2.0 RUN grafana cli plugins install petrslavotinek-carpetplot-panel && \ grafana cli plugins install grafana-googlesheets-datasource && \