Fix up grafana for new ES

.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

.gitpod.yml

@@ -0,0 +1,3 @@
+vscode:
+  extensions:
+    - ms-azuretools.vscode-docker

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 && \

docker-compose.override.yml.example

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   proxy:
     ports:

docker-compose.yml

@@ -1,10 +1,8 @@
-version: "3.8"
-
 services:
   proxy:
-    image: nginx:1.19
+    image: nginx:1.27
     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
@@ -31,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

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
 

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;
     }
 }