Skip to content

Commit

Permalink
fix: revert original and new ini
Browse files Browse the repository at this point in the history
  • Loading branch information
35C4n0r committed Jan 31, 2025
1 parent 163de09 commit 79ca01e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
5 changes: 4 additions & 1 deletion keep/providers/grafana_provider/grafana/grafana.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[unified_alerting]
[alerting]
enabled = true

[unified_alerting]
enabled = false

[database]
wal = true
url = sqlite3:///var/lib/grafana/grafana.db?_busy_timeout=500
Expand Down
8 changes: 3 additions & 5 deletions tests/e2e_tests/docker-compose-e2e-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ services:
depends_on:
- keep-database


## Keep Services with DB
# Database Service (5433)
keep-database-db-auth:
Expand All @@ -72,8 +71,8 @@ services:
- "3001:3000"
environment:
- NEXTAUTH_SECRET=secret
- NEXTAUTH_URL=http://localhost:3001
- NEXT_PUBLIC_API_URL=http://localhost:8081
- NEXTAUTH_URL=https://3001-35c4n0r-keep-j5ok1nvq1vv.ws-us117.gitpod.io
- NEXT_PUBLIC_API_URL=https://8081-35c4n0r-keep-j5ok1nvq1vv.ws-us117.gitpod.io
- POSTHOG_DISABLED=true
- AUTH_TYPE=DB
- API_URL=http://keep-backend-db-auth:8080
Expand Down Expand Up @@ -111,7 +110,6 @@ services:
depends_on:
- keep-database-db-auth


# Other Services (Common)
keep-websocket-server:
extends:
Expand All @@ -133,7 +131,7 @@ services:
- "3002:3000"
volumes:
- ./keep/providers/grafana_provider/grafana/provisioning:/etc/grafana/provisioning:ro
- ./keep/providers/grafana_provider/grafana/grafana.ini:/etc/grafana/grafana.ini:ro
- ./tests/e2e_tests/grafana.ini:/etc/grafana/grafana.ini:ro
- grafana-storage:/var/lib/grafana
environment:
- GF_SECURITY_ADMIN_PASSWORD=admin
Expand Down
9 changes: 9 additions & 0 deletions tests/e2e_tests/grafana.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[unified_alerting]
enabled = true

[database]
wal = true
url = sqlite3:///var/lib/grafana/grafana.db?_busy_timeout=500

[service_accounts]
enabled = true

0 comments on commit 79ca01e

Please sign in to comment.