diff --git a/.gitignore b/.gitignore
index 35baef2b4c87969bc5c1cd847507a62840024b72..db94d9e1620830d669418bcff5a3f586509576c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ fda-identifier-service/
fda-metadata-db/
fda-metadata-service/
fda-query-service/
-fda-search-service/
+fda-search-db/
fda-semantics-service/
fda-table-service/
fda-ui/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd583480a66cc2da632b6d9f382f465f428468e3..e5d50a84d5f4f3daacf4d3d6a8f8164211769f45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -511,7 +511,7 @@ scan-query-service:
reports:
container_scanning: ./.trivy/trivy-query-service-report.json
-scan-search-service:
+scan-search-db:
stage: scan-docker
needs:
- build-docker
@@ -521,7 +521,7 @@ scan-search-service:
- master
allow_failure: true
script:
- - make scan-search-service
+ - make scan-search-db
cache:
paths:
- .trivycache/
@@ -529,7 +529,7 @@ scan-search-service:
when: always
expire_in: 1 days
reports:
- container_scanning: ./.trivy/trivy-search-service-report.json
+ container_scanning: ./.trivy/trivy-search-db-report.json
scan-semantics-service:
stage: scan-docker
@@ -625,7 +625,7 @@ release-latest:
- scan-metadata-service
- scan-proxy
- scan-query-service
- - scan-search-service
+ - scan-search-db
- scan-semantics-service
- scan-table-service
- scan-ui
@@ -652,7 +652,7 @@ release-version:
- scan-metadata-service
- scan-proxy
- scan-query-service
- - scan-search-service
+ - scan-search-db
- scan-semantics-service
- scan-table-service
- scan-ui
diff --git a/.junit/hosts b/.junit/hosts
index 701ef56fa315ea16163432c842816c946150d97f..16352ce832d31857ba1a0f4f5288f46272bffd36 100644
--- a/.junit/hosts
+++ b/.junit/hosts
@@ -7,4 +7,4 @@
172.30.0.7 dbrepo-userdb-u03
172.30.0.8 dbrepo-userdb-u04
172.31.0.2 dbrepo-broker-service
-172.31.0.3 dbrepo-search-service
\ No newline at end of file
+172.31.0.3 dbrepo-search-db
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 052417741865c941208d4a1ae9dd9b2a97ffa4f2..ed8f632caa60f739d7fe922ab0febd6fb8f01d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ tag-broker:
docker tag dbrepo-broker-service:latest "dbrepo/broker-service:${TAG}"
tag-search:
- docker tag dbrepo-search-service:latest "dbrepo/search-service:${TAG}"
+ docker tag dbrepo-search-db:latest "dbrepo/search-db:${TAG}"
release: build-docker tag release-identifier release-container release-database release-query release-table release-analyse release-authentication release-metadata-db release-ui release-semantics release-broker release-metadata release-user
@@ -221,7 +221,7 @@ scan-query-service:
scan-search-db:
docker pull "elasticsearch:${ELASTIC_VERSION}"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-service-report.json "elasticsearch:${ELASTIC_VERSION}"
+ trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "elasticsearch:${ELASTIC_VERSION}"
trivy image --insecure --exit-code 0 "elasticsearch:${ELASTIC_VERSION}"
trivy image --insecure --exit-code 1 --severity CRITICAL "elasticsearch:${ELASTIC_VERSION}"
diff --git a/dbrepo-container-service/rest-service/src/main/resources/application.yml b/dbrepo-container-service/rest-service/src/main/resources/application.yml
index 514c45bb328236d8f940331d051c0c2c2faf9ade..70619e94b9d9ea34578c06eb8e1fc42b38b7ebb0 100644
--- a/dbrepo-container-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-container-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: "${ELASTIC_USERNAME}"
- uris: http://search-service:9200
+ uris: http://search-db:9200
management.endpoints.web.exposure.include: health,info,prometheus
springdoc.swagger-ui.enabled: true
server:
diff --git a/dbrepo-database-service/rest-service/src/main/resources/application.yml b/dbrepo-database-service/rest-service/src/main/resources/application.yml
index 3c555dd20b32f8925acff0121346f9c1452deeca..ba7ad2434e03693d0413759fcec3c985c3984586 100644
--- a/dbrepo-database-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-database-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: "${ELASTIC_USERNAME}"
- uris: http://search-service:9200
+ uris: http://search-db:9200
management.endpoints.web.exposure.include: health,info,prometheus
server:
port: 9092
diff --git a/dbrepo-identifier-service/rest-service/src/main/resources/application.yml b/dbrepo-identifier-service/rest-service/src/main/resources/application.yml
index 1782b03e657c9b7d9163791896718f03488b478a..0ec8f69c7b680fb1105deb024141aa139aff4333 100644
--- a/dbrepo-identifier-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-identifier-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: elastic
- uris: http://search-service:9200
+ uris: http://search-db:9200
management.endpoints.web.exposure.include: health,info,prometheus
server:
port: 9096
diff --git a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
index 363c82a0e197384dd199f6d0f00c72c90ada7321..22e0c0c39ac2e5830512adf7099c58c6307a2e1d 100644
--- a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -1112,8 +1112,8 @@ public abstract class BaseTest {
.build();
public final static Long CONTAINER_ELASTIC_ID = 6L;
- public final static String CONTAINER_ELASTIC_NAME = "dbrepo-search-service";
- public final static String CONTAINER_ELASTIC_INTERNAL_NAME = "dbrepo-search-service";
+ public final static String CONTAINER_ELASTIC_NAME = "dbrepo-search-db";
+ public final static String CONTAINER_ELASTIC_INTERNAL_NAME = "dbrepo-search-db";
public final static String CONTAINER_ELASTIC_IP = "172.31.0.3";
public final static String CONTAINER_ELASTIC_HASH = "deadbeef";
public final static Instant CONTAINER_ELASTIC_CREATED = Instant.ofEpochSecond(1677399721) /* 2023-02-26 08:22:01 (UTC) */;
diff --git a/dbrepo-query-service/rest-service/src/main/resources/application.yml b/dbrepo-query-service/rest-service/src/main/resources/application.yml
index 2dafd0f2819732de50d6a606400c8fe1ad9526fd..db37d874ec942755cc879f26242862f6330ca488 100644
--- a/dbrepo-query-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-query-service/rest-service/src/main/resources/application.yml
@@ -28,7 +28,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: elastic
- uris: http://search-service:9200
+ uris: http://search-db:9200
cloud:
loadbalancer.ribbon.enabled: false
management.endpoints.web.exposure.include: health,info,prometheus
diff --git a/dbrepo-query-service/rest-service/src/test/resources/application.properties b/dbrepo-query-service/rest-service/src/test/resources/application.properties
index c64e6962f91b44b44cbfbe6d34d9c56e252dbd9d..c030a10c3744afa02378cbbbccfdd5bbf43bbb59 100644
--- a/dbrepo-query-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-query-service/rest-service/src/test/resources/application.properties
@@ -23,7 +23,7 @@ logging.level.root=error
logging.level.at.tuwien.=trace
# elastic
-spring.elasticsearch.uris=dbrepo-search-service:9200
+spring.elasticsearch.uris=dbrepo-search-db:9200
# broker service
spring.rabbitmq.host=dbrepo-broker-service
@@ -34,4 +34,4 @@ spring.rabbitmq.password=guest
# search service
fda.consumers=2
fda.gateway.endpoint: http://localhost:15672
-fda.elastic.endpoint=dbrepo-search-service:9200
\ No newline at end of file
+fda.elastic.endpoint=dbrepo-search-db:9200
\ No newline at end of file
diff --git a/dbrepo-semantics-service/rest-service/src/main/resources/application.yml b/dbrepo-semantics-service/rest-service/src/main/resources/application.yml
index a26264fb3d74bfde1b6eb6b62223ff3e805e1cfe..7e35d82129116a29148421bf5d86238d1d6e97cd 100644
--- a/dbrepo-semantics-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-semantics-service/rest-service/src/main/resources/application.yml
@@ -28,7 +28,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: elastic
- uris: http://search-service:9200
+ uris: http://search-db:9200
cloud:
loadbalancer.ribbon.enabled: false
management.endpoints.web.exposure.include: health,info,prometheus
diff --git a/dbrepo-table-service/rest-service/src/main/resources/application.yml b/dbrepo-table-service/rest-service/src/main/resources/application.yml
index 3cf83d1507d6556d0060756be16fa5d930edd7bb..ac70fe699af16b1c71725a7a8afe4c5737c46048 100644
--- a/dbrepo-table-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-table-service/rest-service/src/main/resources/application.yml
@@ -28,7 +28,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: elastic
- uris: http://search-service:9200
+ uris: http://search-db:9200
cloud:
loadbalancer.ribbon.enabled: false
management.endpoints.web.exposure.include: health,info,prometheus
diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile
index c286e5a6db94b9405ab76bd662c133946e2274ad..ecc3d12c3acc403751201d32d6daee1040123cb7 100644
--- a/dbrepo-ui/Dockerfile
+++ b/dbrepo-ui/Dockerfile
@@ -47,7 +47,7 @@ EXPOSE 9100
ENV BROKER_USERNAME="fda"
ENV BROKER_PASSWORD="fda"
ENV SANDBOX=false
-ENV SEARCH="http://search-service:9200"
+ENV SEARCH="http://search-db:9200"
ENV SHARED_FILESYSTEM="/tmp"
ENV LOGO="/logo.png"
ENV ELASTIC_USERNAME="elastic"
diff --git a/dbrepo-ui/static/covfefe.gif b/dbrepo-ui/static/covfefe.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bd9df63a8c023d791e774b45812dcb2db1c64617
Binary files /dev/null and b/dbrepo-ui/static/covfefe.gif differ
diff --git a/dbrepo-user-service/rest-service/src/main/resources/application.yml b/dbrepo-user-service/rest-service/src/main/resources/application.yml
index 3ff5be6c907e573889250c970fdadec733235b22..58ca1c7f57132a226ee7437ab48e3345e011becf 100644
--- a/dbrepo-user-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-user-service/rest-service/src/main/resources/application.yml
@@ -28,7 +28,7 @@ spring:
elasticsearch:
password: "${ELASTIC_PASSWORD}"
username: elastic
- uris: http://search-service:9200
+ uris: http://search-db:9200
cloud:
loadbalancer.ribbon.enabled: false
management.endpoints.web.exposure.include: health,info,prometheus
diff --git a/dbrepo-user-service/rest-service/src/test/resources/application.properties b/dbrepo-user-service/rest-service/src/test/resources/application.properties
index d2ef7c7093608f1e7f58be83ca2e045c65f53a8d..0400abd1af2bc166d559101dfdab5cde1c122fb0 100644
--- a/dbrepo-user-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-user-service/rest-service/src/test/resources/application.properties
@@ -27,4 +27,4 @@ logging.level.org.hibernate.type=trace
# search service
fda.consumers=2
fda.gateway.endpoint: http://localhost:15672
-fda.elastic.endpoint=dbrepo-search-service:9200
\ No newline at end of file
+fda.elastic.endpoint=dbrepo-search-db:9200
\ No newline at end of file
diff --git a/docker-compose.dbrepo1.yml b/docker-compose.dbrepo1.yml
index 71b612f3fea80ddf8302163172f025998293d678..529f45401bddcf12990dd10c52d8bbda141731b3 100644
--- a/docker-compose.dbrepo1.yml
+++ b/docker-compose.dbrepo1.yml
@@ -6,7 +6,7 @@ version: "3.6"
volumes:
metadata-db-data:
- search-service-data:
+ search-db-data:
broker-service-data:
networks:
@@ -145,7 +145,7 @@ services:
depends_on:
dbrepo-authentication-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-broker-service:
condition: service_healthy
@@ -281,7 +281,7 @@ services:
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes:
- - search-service-data:/usr/share/elasticsearch/data
+ - search-db-data:/usr/share/elasticsearch/data
logging:
driver: json-file
@@ -338,7 +338,7 @@ services:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy
diff --git a/docker-compose.dbrepo2.yml b/docker-compose.dbrepo2.yml
index ce16a340b714e5bbbde76b14566b97611562e6a7..cfcda2454de4478d8fa4e82eb4c859a8214d60d0 100644
--- a/docker-compose.dbrepo2.yml
+++ b/docker-compose.dbrepo2.yml
@@ -6,7 +6,7 @@ version: "3.6"
volumes:
metadata-db-data:
- search-service-data:
+ search-db-data:
broker-service-data:
authentication-service-data:
@@ -146,7 +146,7 @@ services:
depends_on:
dbrepo-authentication-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-broker-service:
condition: service_healthy
@@ -282,7 +282,7 @@ services:
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes:
- - search-service-data:/usr/share/elasticsearch/data
+ - search-db-data:/usr/share/elasticsearch/data
logging:
driver: json-file
@@ -339,7 +339,7 @@ services:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy
diff --git a/docker-compose.egi.yml b/docker-compose.egi.yml
index 030422783c2d95d61c0414669e660ae045d7c3c2..6447daecf722b6fc90efbc37a1f2233ff9ed54e1 100644
--- a/docker-compose.egi.yml
+++ b/docker-compose.egi.yml
@@ -6,7 +6,7 @@ version: "3.6"
volumes:
metadata-db-data:
- search-service-data:
+ search-db-data:
broker-service-data:
authentication-service-data:
@@ -146,7 +146,7 @@ services:
depends_on:
dbrepo-authentication-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-broker-service:
condition: service_healthy
@@ -282,7 +282,7 @@ services:
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes:
- - search-service-data:/usr/share/elasticsearch/data
+ - search-db-data:/usr/share/elasticsearch/data
logging:
driver: json-file
@@ -339,7 +339,7 @@ services:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 090f5d1f334b205508d0a9d8c90b8b847cc027eb..5b6939c0ed21f62dfd88886a80aea7af4bebef31 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,7 +6,7 @@ version: "3.6"
volumes:
metadata-db-data:
- search-service-data:
+ search-db-data:
broker-service-data:
authentication-service-data:
@@ -146,7 +146,7 @@ services:
depends_on:
dbrepo-authentication-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-broker-service:
condition: service_healthy
@@ -279,7 +279,7 @@ services:
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes:
- - search-service-data:/usr/share/elasticsearch/data
+ - search-db-data:/usr/share/elasticsearch/data
logging:
driver: json-file
@@ -335,7 +335,7 @@ services:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
- dbrepo-search-service:
+ dbrepo-search-db:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy