From 9338cff0ef36661cdd1440724d8d163ad27fdc65 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Thu, 14 Nov 2024 09:19:30 -0700 Subject: [PATCH] fix: disable accessControlonCall for Grafana 11.3 in docker compose (#5255) # What this PR does Disable accessControlOnCall for Grafana 11.3 in docker compose Similar to https://github.com/grafana/oncall/pull/5245 ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] Added the relevant release notes label (see labels prefixed w/ `release:`). These labels dictate how your PR will show up in the autogenerated release notes. --- docker-compose-developer.yml | 1 + docker-compose-mysql-rabbitmq.yml | 10 ++++++++++ docker-compose.yml | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/docker-compose-developer.yml b/docker-compose-developer.yml index b751ab1e98..ee668df794 100644 --- a/docker-compose-developer.yml +++ b/docker-compose-developer.yml @@ -324,6 +324,7 @@ services: GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app GF_FEATURE_TOGGLES_ENABLE: externalServiceAccounts ONCALL_API_URL: http://host.docker.internal:8080 + GF_AUTH_MANAGED_SERVICE_ACCOUNTS_ENABLED: true env_file: - ./dev/.env.${DB}.dev ports: diff --git a/docker-compose-mysql-rabbitmq.yml b/docker-compose-mysql-rabbitmq.yml index f587902e76..60b320e80f 100644 --- a/docker-compose-mysql-rabbitmq.yml +++ b/docker-compose-mysql-rabbitmq.yml @@ -144,6 +144,7 @@ services: GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_PASSWORD:-admin} GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app GF_INSTALL_PLUGINS: grafana-oncall-app + GF_AUTH_MANAGED_SERVICE_ACCOUNTS_ENABLED: true deploy: resources: limits: @@ -156,7 +157,16 @@ services: condition: service_healthy profiles: - with_grafana + configs: + - source: grafana.ini + target: /etc/grafana/grafana.ini volumes: dbdata: rabbitmqdata: + +configs: + grafana.ini: + content: | + [feature_toggles] + accessControlOnCall = false diff --git a/docker-compose.yml b/docker-compose.yml index b115199f8c..c54c2fb33f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,6 +94,7 @@ services: GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_PASSWORD:-admin} GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app GF_INSTALL_PLUGINS: grafana-oncall-app + GF_AUTH_MANAGED_SERVICE_ACCOUNTS_ENABLED: true volumes: - grafana_data:/var/lib/grafana deploy: @@ -103,9 +104,18 @@ services: cpus: "0.5" profiles: - with_grafana + configs: + - source: grafana.ini + target: /etc/grafana/grafana.ini volumes: grafana_data: prometheus_data: oncall_data: redis_data: + +configs: + grafana.ini: + content: | + [feature_toggles] + accessControlOnCall = false