Skip to content

Commit

Permalink
fix: disable accessControlonCall for Grafana 11.3 in docker compose (#…
Browse files Browse the repository at this point in the history
…5255)

# What this PR does

Disable accessControlOnCall for Grafana 11.3 in docker compose
Similar to #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.
  • Loading branch information
mderynck authored Nov 14, 2024
1 parent df6bb69 commit 9338cff
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions docker-compose-developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions docker-compose-mysql-rabbitmq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

0 comments on commit 9338cff

Please sign in to comment.