diff --git a/docker-compose-developer.yml b/docker-compose-developer.yml index b751ab1e9..ee668df79 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 f587902e7..60b320e80 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 b115199f8..c54c2fb33 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