From 2032decaf774f3d1d8610af3bc159fd7b102880f Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Sat, 5 Apr 2025 21:20:27 +0200 Subject: [PATCH] Updated the init image Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at> --- .../target/create-event-listener.jar | Bin 10143 -> 10140 bytes dbrepo-dashboard-service/init/app.py | 4 ++-- dbrepo-metadata-db/migration/17/schema.sql | 17 +++++++++++++++++ docker-compose.yml | 1 + helm/dbrepo/files/create-event-listener.jar | Bin 10143 -> 10140 bytes 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 dbrepo-metadata-db/migration/17/schema.sql 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 GIT binary patch delta 938 zcmbR5KgVA>z?+#xgn@yBgW>Sv)~Kfznh%N?85qtmF))ZszNaK!-y7r`d{{wXZ@Sw5 zMtg=W%i>R-edTB!mLB!GmRb6=iK6U{CExCQ2lpl)59B{^$nKl%y-h6HTwjjFU#JYe z-NSoSp)XH{Y2mZa$;YN$Sd@C*FW0xbPc^B;>5O!6*1ikY`|d5~y1uNiq{}B!Bw)pn z`MgtS7|yl6b6rO2R#E>tQ?7dbiMHQE!+#lNmcBLGHskue&3{gWt+**0AaghTw~+Rh zFXs1Izeq2X_&?#l`t!7}6E^Bzyq6v%$H$(?rN6>bVhht0hDpc7_-uB%1wOuTdb5qB z`@t8U5n>md&X;%ZWV|h3SEds2`^nFh%#zJs{%&{w39kBZhdp`r_PqO#)s?<XP_K9X z*BHCH>;9E%ix%m<51qPK>Q&p6#Cv8t14>oPD?(CvciRalYKDFnx7g-bTw$T#tG?yM zxz_L-vy9({INBXfob)<!Rms9B#~iJsdp@szsUq7qY34aa&r2VF-a9rm{@mYXj+30H zgnkgXJAIm;hrpMGsuGg!??G|G#lXP9z;KvpaqHwQj4I5B7Pn5m&8W+Kcya4wZYDV} zt;3`WrbC#tz;q*%37Fo&<ONpG%6t|~UuEtFiEmD3nZpETFtKxUf*Aq=HG&|<<bK6j zU|L6MGABG8Og^DxDG%Z?AOTJ|TY%xM<C4h=$`W8ptd*r1Pfre4Rs@?<tt>6}n~{Mb zu|z+>n~_O`8S0(It&`U%OIyk?fu%}H%QI8+&{agiZD3$v;D>WS*11elfp}d}MVhIQ zY4QXn*~!r=Tngxp)JM^^0;EuS@&Xkl`9q6aqyEfmbLwJXVEDkmz@PzF$iT3q@$2M= zD&}C{NUKUS9-VBi8VL4Hx2iN#Fw10l0rkn}RVBefuT`a)KCw*}WS5w%pvD6h(pQsa zVi1@tFQ7ZQQca6#uI%IqOwyANsA+;_->6A5)hj}Uq$b;`i-Chy*dydzG6Ms{Mg|53 SVHC&6OfFVeW80tv5(EJ2X;-TN delta 1021 zcmbQ^Ki^+Cz?+#xgn@yBgW*_kbJV(&m06_|g%#@$`aL!f*z11E{s()Gxv!^lo(NwK zYj;S(`^hI;qI~C^nz!Wk{^P!i9a&p<v)@iW|9Q`I^E#I7tWP@i6F)E8-0E>fr!P;I zF<3SHxRcExhp;;qcV;!t@wob^CF1L{l}~ovI{Dl-amTiv#lb0A%?B1vsxiD1pt$PN z#eI`6d=9HBYOZ(O<>Ghe^Tsc!m%`?1AE~-psefwmjR4hmjgMcr@6KPLdiwvf-3@ih zA>s8W{;NNK{cNE?^s~MCTkK@`PF;yBtT#vzUBGnh*fl<z-Euq2pL~s+*S9#KL~NQV zkHN>gftd&V+ULu1UbCyLeC43HVC|-(JN|R#R=jK8`1gIG{X=8Xs(OvfE_Dg>H%{F? zcWaByGuv%PXFn{=kbRaLuk|Ks?_y;$**D7^T9+LAsP7@w^z1{yO^Nd<C+BkKXBebM z9bsAMmpJkHhBIlI^VEKpPMg*(^E_PgfsJSS_0uNy_p3|KPA{&%yx^wbOS1}(ciyKp zR5*TJ5bEh!Tn>s0E(Qh;1_tJ1!OfF5GO92i4Q`%%gHadE=U|cp)0#}GU^<XV3ryEB znSkl7OkQC1Ow4D&^d;tQkoe{VmN`sd#(y?$PB4R4phghHnB1c{3ruS&P3DBh|Ky`e zmS9mvWogFclVz196pjWrM=>A)Avjxr;jQC2#>o$vMJ8t|^O%4Pfy*&4FfhY8Acg-J z85j~v^aH#ZnM9Z&J_UJnrLwfFJQG-|q_jLUH4j6@LuF}3_sM^iApsz#BF$Jbxlu(% z8_gsXH|nEUy?Sz^iXGS=f9AD0buln7d|+T;(15F9U|7=lgK4rLv({uzRUWWHpWiI2 z^cWZzbQl;IoKO^=V4nPt*=2I2Dvtul!~Z`u@AhY6V7SK0z+i-;FpOn#K8wlZn^1+^ z{{;Ws;$UD{C&0iUhNAE*+hjg=iOI5RJm8SmQIlq37MPsRqCUAm&46*i<b`UkV2PJ% z(o9W?lY5z@C*Nlhn|wx*4;luDJS^-HaxR&Hfng&91A{P%CGwLC)YaHFD}e+7G&*NH diff --git a/dbrepo-dashboard-service/init/app.py b/dbrepo-dashboard-service/init/app.py index 41cfd9a0e5..294b4802fb 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 0000000000..5a34a3fd0d --- /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 8151d2c55c..ab1fe197ec 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 GIT binary patch delta 938 zcmbR5KgVA>z?+#xgn@yBgW>Sv)~Kfznh%N?85qtmF))ZszNaK!-y7r`d{{wXZ@Sw5 zMtg=W%i>R-edTB!mLB!GmRb6=iK6U{CExCQ2lpl)59B{^$nKl%y-h6HTwjjFU#JYe z-NSoSp)XH{Y2mZa$;YN$Sd@C*FW0xbPc^B;>5O!6*1ikY`|d5~y1uNiq{}B!Bw)pn z`MgtS7|yl6b6rO2R#E>tQ?7dbiMHQE!+#lNmcBLGHskue&3{gWt+**0AaghTw~+Rh zFXs1Izeq2X_&?#l`t!7}6E^Bzyq6v%$H$(?rN6>bVhht0hDpc7_-uB%1wOuTdb5qB z`@t8U5n>md&X;%ZWV|h3SEds2`^nFh%#zJs{%&{w39kBZhdp`r_PqO#)s?<XP_K9X z*BHCH>;9E%ix%m<51qPK>Q&p6#Cv8t14>oPD?(CvciRalYKDFnx7g-bTw$T#tG?yM zxz_L-vy9({INBXfob)<!Rms9B#~iJsdp@szsUq7qY34aa&r2VF-a9rm{@mYXj+30H zgnkgXJAIm;hrpMGsuGg!??G|G#lXP9z;KvpaqHwQj4I5B7Pn5m&8W+Kcya4wZYDV} zt;3`WrbC#tz;q*%37Fo&<ONpG%6t|~UuEtFiEmD3nZpETFtKxUf*Aq=HG&|<<bK6j zU|L6MGABG8Og^DxDG%Z?AOTJ|TY%xM<C4h=$`W8ptd*r1Pfre4Rs@?<tt>6}n~{Mb zu|z+>n~_O`8S0(It&`U%OIyk?fu%}H%QI8+&{agiZD3$v;D>WS*11elfp}d}MVhIQ zY4QXn*~!r=Tngxp)JM^^0;EuS@&Xkl`9q6aqyEfmbLwJXVEDkmz@PzF$iT3q@$2M= zD&}C{NUKUS9-VBi8VL4Hx2iN#Fw10l0rkn}RVBefuT`a)KCw*}WS5w%pvD6h(pQsa zVi1@tFQ7ZQQca6#uI%IqOwyANsA+;_->6A5)hj}Uq$b;`i-Chy*dydzG6Ms{Mg|53 SVHC&6OfFVeW80tv5(EJ2X;-TN delta 1021 zcmbQ^Ki^+Cz?+#xgn@yBgW*_kbJV(&m06_|g%#@$`aL!f*z11E{s()Gxv!^lo(NwK zYj;S(`^hI;qI~C^nz!Wk{^P!i9a&p<v)@iW|9Q`I^E#I7tWP@i6F)E8-0E>fr!P;I zF<3SHxRcExhp;;qcV;!t@wob^CF1L{l}~ovI{Dl-amTiv#lb0A%?B1vsxiD1pt$PN z#eI`6d=9HBYOZ(O<>Ghe^Tsc!m%`?1AE~-psefwmjR4hmjgMcr@6KPLdiwvf-3@ih zA>s8W{;NNK{cNE?^s~MCTkK@`PF;yBtT#vzUBGnh*fl<z-Euq2pL~s+*S9#KL~NQV zkHN>gftd&V+ULu1UbCyLeC43HVC|-(JN|R#R=jK8`1gIG{X=8Xs(OvfE_Dg>H%{F? zcWaByGuv%PXFn{=kbRaLuk|Ks?_y;$**D7^T9+LAsP7@w^z1{yO^Nd<C+BkKXBebM z9bsAMmpJkHhBIlI^VEKpPMg*(^E_PgfsJSS_0uNy_p3|KPA{&%yx^wbOS1}(ciyKp zR5*TJ5bEh!Tn>s0E(Qh;1_tJ1!OfF5GO92i4Q`%%gHadE=U|cp)0#}GU^<XV3ryEB znSkl7OkQC1Ow4D&^d;tQkoe{VmN`sd#(y?$PB4R4phghHnB1c{3ruS&P3DBh|Ky`e zmS9mvWogFclVz196pjWrM=>A)Avjxr;jQC2#>o$vMJ8t|^O%4Pfy*&4FfhY8Acg-J z85j~v^aH#ZnM9Z&J_UJnrLwfFJQG-|q_jLUH4j6@LuF}3_sM^iApsz#BF$Jbxlu(% z8_gsXH|nEUy?Sz^iXGS=f9AD0buln7d|+T;(15F9U|7=lgK4rLv({uzRUWWHpWiI2 z^cWZzbQl;IoKO^=V4nPt*=2I2Dvtul!~Z`u@AhY6V7SK0z+i-;FpOn#K8wlZn^1+^ z{{;Ws;$UD{C&0iUhNAE*+hjg=iOI5RJm8SmQIlq37MPsRqCUAm&46*i<b`UkV2PJ% z(o9W?lY5z@C*Nlhn|wx*4;luDJS^-HaxR&Hfng&91A{P%CGwLC)YaHFD}e+7G&*NH -- GitLab