Merge branch 'main' into bot/update-dependencies

ebmdatalab · Dec 19, 2024 · 8538764 · 8538764
2 parents d1be8a3 + fd3ebe1
commit 8538764
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/docker/dependencies.txt b/docker/dependencies.txt
@@ -2,6 +2,5 @@
 git
 postgresql-client
 python3.12
-python3.12-distutils
 python3.12-venv
 tzdata
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -1,3 +1,3 @@
-FROM grafana/grafana-enterprise:latest@sha256:921a6909631d82d139501385e33449416d1124bdfdf5a790ca72fdbf1fb3a56e
+FROM grafana/grafana-enterprise:latest@sha256:473a26e9ed1bef41abf2b8d85d0d810a9006534664d30dee7e92b03c9a9cccb2
 
 USER grafana
diff --git a/grafana/README.md b/grafana/README.md
@@ -69,7 +69,7 @@ GRANT CONNECT ON database jobserver TO grafanareader;
 ```sql
 GRANT SELECT ON applications_application, applications_cmoprioritylistpage, applications_commercialinvolvementpage, applications_datasetspage, applications_legalbasispage, applications_previousehrexperiencepage, applications_recordleveldatapage, applications_referencespage, applications_researcherregistration, applications_sharingcodepage, applications_shortdatareportpage, applications_sponsordetailspage, applications_studydatapage, applications_studyfundingpage, applications_studyinformationpage, applications_studypurposepage, applications_teamdetailspage, applications_typeofstudypage, interactive_analysisrequest, jobserver_backend, jobserver_backendmembership, jobserver_job, jobserver_jobrequest, jobserver_org, jobserver_orgmembership, jobserver_project, jobserver_projectcollaboration, jobserver_projectmembership, jobserver_publishrequest, jobserver_release, jobserver_releasefile, jobserver_releasefilereview, jobserver_repo, jobserver_report, jobserver_snapshot, jobserver_snapshot_files, jobserver_stats, jobserver_workspace, redirects_redirect TO grafanareader;
 
-CREATE VIEW jobserver_user_grafana AS SELECT id,last_login,username,is_active,date_joined,fullname,created_by_id,login_token_expires_at,pat_expires_at,roles FROM jobserver_user;
+CREATE VIEW jobserver_user_grafana AS SELECT id,last_login,username,date_joined,fullname,created_by_id,login_token_expires_at,pat_expires_at,roles FROM jobserver_user;
 
 GRANT SELECT ON jobserver_user_grafana TO grafanareader;
 ```