From 79ca01eb7add0f74c553bf3178c9cc3610c7f32c Mon Sep 17 00:00:00 2001 From: Jay Kumar Date: Fri, 31 Jan 2025 12:40:55 +0000 Subject: [PATCH] fix: revert original and new ini --- keep/providers/grafana_provider/grafana/grafana.ini | 5 ++++- tests/e2e_tests/docker-compose-e2e-postgres.yml | 8 +++----- tests/e2e_tests/grafana.ini | 9 +++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 tests/e2e_tests/grafana.ini diff --git a/keep/providers/grafana_provider/grafana/grafana.ini b/keep/providers/grafana_provider/grafana/grafana.ini index d6e79ef24..09e6e2e7e 100644 --- a/keep/providers/grafana_provider/grafana/grafana.ini +++ b/keep/providers/grafana_provider/grafana/grafana.ini @@ -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 diff --git a/tests/e2e_tests/docker-compose-e2e-postgres.yml b/tests/e2e_tests/docker-compose-e2e-postgres.yml index 0c7b926a1..04feade27 100644 --- a/tests/e2e_tests/docker-compose-e2e-postgres.yml +++ b/tests/e2e_tests/docker-compose-e2e-postgres.yml @@ -47,7 +47,6 @@ services: depends_on: - keep-database - ## Keep Services with DB # Database Service (5433) keep-database-db-auth: @@ -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 @@ -111,7 +110,6 @@ services: depends_on: - keep-database-db-auth - # Other Services (Common) keep-websocket-server: extends: @@ -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 diff --git a/tests/e2e_tests/grafana.ini b/tests/e2e_tests/grafana.ini new file mode 100644 index 000000000..d6e79ef24 --- /dev/null +++ b/tests/e2e_tests/grafana.ini @@ -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