diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar index 42cd10a361a5b4a644dabc8044ccc4a52f5870b9..56e59899d04186b9b32112cb00a17bb8716efc99 100644 Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ diff --git a/dbrepo-dashboard-service/init/app.py b/dbrepo-dashboard-service/init/app.py index 41cfd9a0e5973d663090a95bb8e74088a6d314c3..294b4802fb82827acefc8bdec4eba850cd9aa0a7 100644 --- a/dbrepo-dashboard-service/init/app.py +++ b/dbrepo-dashboard-service/init/app.py @@ -53,9 +53,9 @@ def fetch_databases() -> List[Database]: def upsert_dashboard(database: Database) -> None: - db = dashboard_client().find(database.dashboard_uid)['dashboard'] + db = dashboard_client().find(database.dashboard_uid) if db is None: - db = dashboard_client().create(database.internal_name, database.dashboard_uid)['dashboard'] + db = dashboard_client().create(database.internal_name, database.dashboard_uid) rest_client().update_database_dashboard(database.id, db['uid']) return dashboard_client().update(database) diff --git a/dbrepo-metadata-db/migration/17/schema.sql b/dbrepo-metadata-db/migration/17/schema.sql new file mode 100644 index 0000000000000000000000000000000000000000..5a34a3fd0d90e00a4b2d7b6eb09b3c763e3c1144 --- /dev/null +++ b/dbrepo-metadata-db/migration/17/schema.sql @@ -0,0 +1,17 @@ +ALTER TABLE mdb_containers + DROP SYSTEM VERSIONING; +ALTER TABLE mdb_containers + ADD COLUMN readonly_username VARCHAR(255) NOT NULL; +ALTER TABLE mdb_containers + ADD COLUMN readonly_password VARCHAR(255) NOT NULL; +ALTER TABLE mdb_containers + ADD SYSTEM VERSIONING; + +ALTER TABLE mdb_databases + DROP SYSTEM VERSIONING; +ALTER TABLE mdb_databases + ADD COLUMN grafana_dashboard_uid character varying(255); +ALTER TABLE mdb_databases + ADD COLUMN is_dashboard_enabled BOOLEAN NOT NULL DEFAULT TRUE; +ALTER TABLE mdb_databases + ADD SYSTEM VERSIONING; \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8151d2c55c031162feed8868e5232667e48d2bd5..ab1fe197ec90d693befac7499ed5baa4638c7040 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -99,6 +99,7 @@ services: KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}" KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}" KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}" + KEYCLOAK_HOSTNAME: "http://localhost" METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}" SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}" SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}" diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 42cd10a361a5b4a644dabc8044ccc4a52f5870b9..56e59899d04186b9b32112cb00a17bb8716efc99 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ