Skip to content

Commit

Permalink
Update Grafana configuration and dependencies
Browse files Browse the repository at this point in the history
- Enable managed service accounts in grafana.ini
- Update Grafana Oncall and Redis images to latest versions
- Upgrade aiohttp dependency in requirements.txt

Signed-off-by: Weifeng Wang <[email protected]>
  • Loading branch information
qclaogui committed Feb 6, 2025
1 parent 00c80c1 commit 86ff7c7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions docker-compose/common/config/grafana/grafana.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ reporting_enabled = false
check_for_updates = false
check_for_plugin_updates = false

[feature_toggles]
accessControlOnCall = false

[auth]
managed_service_accounts_enabled = true

[auth.basic]
enabled = false

Expand Down
2 changes: 1 addition & 1 deletion examples/grafana-oncall/compose.override.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ services:
GF_SECURITY_ADMIN_USER: oncall
GF_SECURITY_ADMIN_PASSWORD: oncall
GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app, redis-app
GF_INSTALL_PLUGINS: grafana-oncall-app v1.11.0, redis-app
GF_INSTALL_PLUGINS: grafana-oncall-app v1.14.3, redis-app
4 changes: 2 additions & 2 deletions examples/grafana-oncall/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
condition: service_completed_successfully
redis:
condition: service_healthy
image: &oncallImage grafana/oncall:v1.11.0
image: &oncallImage grafana/oncall:v1.14.3
restart: always
ports:
# - "8080"
Expand Down Expand Up @@ -106,7 +106,7 @@ services:
redis:
labels:
metrics.grafana.com/scrape: false
image: redis:7.0.5
image: redis:7.0.15
restart: always
volumes:
- redis_data:/data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
aiohttp==3.10.2
aiohttp==3.10.11
Faker==16.4.0
tqdm==4.66.3

0 comments on commit 86ff7c7

Please sign in to comment.