diff --git a/bbmri/modules/teiler-compose.yml b/bbmri/modules/teiler-compose.yml index e58dea6..33274a2 100644 --- a/bbmri/modules/teiler-compose.yml +++ b/bbmri/modules/teiler-compose.yml @@ -32,9 +32,6 @@ services: DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "/bbmri-teiler-backend" TEILER_DASHBOARD_URL: "/bbmri-teiler-dashboard" - OIDC_URL: "${OIDC_URL}" - OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" - OIDC_TOKEN_GROUP: "${OIDC_GROUP_CLAIM}" TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}" TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}" TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}" @@ -42,8 +39,6 @@ services: EXPORTER_API_KEY: "${EXPORTER_API_KEY}" TEILER_ORCHESTRATOR_URL: "/bbmri-teiler" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/bbmri-teiler" - TEILER_USER: "${OIDC_USER_GROUP}" - TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" REPORTER_DEFAULT_TEMPLATE_ID: "bbmri-qb" EXPORTER_DEFAULT_TEMPLATE_ID: "bbmri" diff --git a/cce/modules/teiler-compose.yml b/cce/modules/teiler-compose.yml index e5db73f..a2845bf 100644 --- a/cce/modules/teiler-compose.yml +++ b/cce/modules/teiler-compose.yml @@ -32,9 +32,6 @@ services: DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "/cce-teiler-backend" TEILER_DASHBOARD_URL: "/cce-teiler-dashboard" - OIDC_URL: "${OIDC_URL}" - OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" - OIDC_TOKEN_GROUP: "${OIDC_GROUP_CLAIM}" TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}" TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}" TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}" @@ -42,8 +39,6 @@ services: EXPORTER_API_KEY: "${EXPORTER_API_KEY}" TEILER_ORCHESTRATOR_URL: "/cce-teiler" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/cce-teiler" - TEILER_USER: "${OIDC_USER_GROUP}" - TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" REPORTER_DEFAULT_TEMPLATE_ID: "cce-qb" EXPORTER_DEFAULT_TEMPLATE_ID: "cce" diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index 37b0442..2e8c945 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -25,7 +25,7 @@ services: APP_CONTEXT_PATH: "/opal" OPAL_PRIVATE_KEY: "/run/secrets/opal-key.pem" OPAL_CERTIFICATE: "/run/secrets/opal-cert.pem" - OIDC_URL: "${OIDC_URL}" + OIDC_URL: "${OIDC_PRIVATE_URL}" OIDC_CLIENT_ID: "${OIDC_PRIVATE_CLIENT_ID}" OIDC_CLIENT_SECRET: "${OIDC_CLIENT_SECRET}" OIDC_ADMIN_GROUP: "${OIDC_ADMIN_GROUP}" diff --git a/ccp/vars b/ccp/vars index 002da7a..8284476 100644 --- a/ccp/vars +++ b/ccp/vars @@ -13,6 +13,7 @@ OIDC_ADMIN_GROUP="DKTK_CCP_$(capitalize_first_letter ${SITE_ID})_Verwalter" OIDC_PRIVATE_CLIENT_ID=${SITE_ID}-private OIDC_PUBLIC_CLIENT_ID=${SITE_ID}-public OIDC_URL="https://sso.verbis.dkfz.de/application/o/${OIDC_PUBLIC_CLIENT_ID}/" +OIDC_PRIVATE_URL="https://sso.verbis.dkfz.de/application/o/${OIDC_PRIVATE_CLIENT_ID}/" OIDC_GROUP_CLAIM="groups" for module in $PROJECT/modules/*.sh diff --git a/kr/modules/exporter-compose.yml b/kr/modules/exporter-compose.yml index d5eb227..c5e6984 100644 --- a/kr/modules/exporter-compose.yml +++ b/kr/modules/exporter-compose.yml @@ -1,9 +1,10 @@ version: "3.7" services: + exporter: image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest - container_name: bridgehead-ccp-exporter + container_name: bridgehead-kr-exporter environment: JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" LOG_LEVEL: "INFO" @@ -12,39 +13,51 @@ services: EXPORTER_DB_USER: "exporter" EXPORTER_DB_PASSWORD: "${EXPORTER_DB_PASSWORD}" # Set in exporter-setup.sh EXPORTER_DB_URL: "jdbc:postgresql://exporter-db:5432/exporter" - HTTP_RELATIVE_PATH: "/ccp-exporter" + HTTP_RELATIVE_PATH: "/kr-exporter" SITE: "${SITE_ID}" HTTP_SERVLET_REQUEST_SCHEME: "https" OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}" labels: - "traefik.enable=true" - - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)" - - "traefik.http.services.exporter_ccp.loadbalancer.server.port=8092" - - "traefik.http.routers.exporter_ccp.tls=true" - - "traefik.http.middlewares.exporter_ccp_strip.stripprefix.prefixes=/ccp-exporter" - - "traefik.http.routers.exporter_ccp.middlewares=exporter_ccp_strip" + - "traefik.http.routers.exporter_kr.rule=PathPrefix(`/kr-exporter`)" + - "traefik.http.services.exporter_kr.loadbalancer.server.port=8092" + - "traefik.http.routers.exporter_kr.tls=true" + - "traefik.http.middlewares.exporter_kr_strip.stripprefix.prefixes=/kr-exporter" + - "traefik.http.routers.exporter_kr.middlewares=exporter_kr_strip" + # Main router + - "traefik.http.routers.exporter_kr.priority=20" + + # API router + - "traefik.http.routers.exporter_kr_api.middlewares=exporter_kr_strip,exporter_auth" + - "traefik.http.routers.exporter_kr_api.rule=PathRegexp(`/kr-exporter/.+`)" + - "traefik.http.routers.exporter_kr_api.tls=true" + - "traefik.http.routers.exporter_kr_api.priority=25" + + # Shared middlewares + - "traefik.http.middlewares.exporter_auth.basicauth.users=${EXPORTER_USER}" + volumes: - - "/var/cache/bridgehead/ccp/exporter-files:/app/exporter-files/output" + - "/var/cache/bridgehead/kr/exporter-files:/app/exporter-files/output" exporter-db: image: docker.verbis.dkfz.de/cache/postgres:${POSTGRES_TAG} - container_name: bridgehead-ccp-exporter-db + container_name: bridgehead-kr-exporter-db environment: POSTGRES_USER: "exporter" POSTGRES_PASSWORD: "${EXPORTER_DB_PASSWORD}" # Set in exporter-setup.sh POSTGRES_DB: "exporter" volumes: # Consider removing this volume once we find a solution to save Lens-queries to be executed in the explorer. - - "/var/cache/bridgehead/ccp/exporter-db:/var/lib/postgresql/data" + - "/var/cache/bridgehead/kr/exporter-db:/var/lib/postgresql/data" reporter: image: docker.verbis.dkfz.de/ccp/dktk-reporter:latest - container_name: bridgehead-ccp-reporter + container_name: bridgehead-kr-reporter environment: JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" LOG_LEVEL: "INFO" CROSS_ORIGINS: "https://${HOST}" - HTTP_RELATIVE_PATH: "/ccp-reporter" + HTTP_RELATIVE_PATH: "/kr-reporter" SITE: "${SITE_ID}" EXPORTER_API_KEY: "${EXPORTER_API_KEY}" # Set in exporter-setup.sh EXPORTER_URL: "http://exporter:8092" @@ -52,16 +65,23 @@ services: HTTP_SERVLET_REQUEST_SCHEME: "https" # In this initial development state of the bridgehead, we are trying to have so many volumes as possible. - # However, in the first executions in the CCP sites, this volume seems to be very important. A report is + # However, in the first executions in the kr sites, this volume seems to be very important. A report is # a process that can take several hours, because it depends on the exporter. # There is a risk that the bridgehead restarts, losing the already created export. volumes: - - "/var/cache/bridgehead/ccp/reporter-files:/app/reports" + - "/var/cache/bridgehead/kr/reporter-files:/app/reports" labels: - "traefik.enable=true" - - "traefik.http.routers.reporter_ccp.rule=PathPrefix(`/ccp-reporter`)" - - "traefik.http.services.reporter_ccp.loadbalancer.server.port=8095" - - "traefik.http.routers.reporter_ccp.tls=true" - - "traefik.http.middlewares.reporter_ccp_strip.stripprefix.prefixes=/ccp-reporter" - - "traefik.http.routers.reporter_ccp.middlewares=reporter_ccp_strip" + - "traefik.http.routers.reporter_kr.rule=PathPrefix(`/kr-reporter`)" + - "traefik.http.services.reporter_kr.loadbalancer.server.port=8095" + - "traefik.http.routers.reporter_kr.tls=true" + - "traefik.http.middlewares.reporter_kr_strip.stripprefix.prefixes=/kr-reporter" + - "traefik.http.routers.reporter_kr.middlewares=reporter_kr_strip" + - "traefik.http.routers.reporter_kr.priority=20" + + - "traefik.http.routers.reporter_kr_api.middlewares=reporter_kr_strip,exporter_auth" + - "traefik.http.routers.reporter_kr_api.rule=PathRegexp(`/kr-reporter/.+`)" + - "traefik.http.routers.reporter_kr_api.tls=true" + - "traefik.http.routers.reporter_kr_api.priority=25" + diff --git a/kr/modules/exporter.md b/kr/modules/exporter.md deleted file mode 100644 index 24e81b0..0000000 --- a/kr/modules/exporter.md +++ /dev/null @@ -1,15 +0,0 @@ -# Exporter and Reporter - - -## Exporter -The exporter is a REST API that exports the data of the different databases of the bridgehead in a set of tables. -It can accept different output formats as CSV, Excel, JSON or XML. It can also export data into Opal. - -## Exporter-DB -It is a database to save queries for its execution in the exporter. -The exporter manages also the different executions of the same query in through the database. - -## Reporter -This component is a plugin of the exporter that allows to create more complex Excel reports described in templates. -It is compatible with different template engines as Groovy, Thymeleaf,... -It is perfect to generate a document as our traditional CCP quality report. diff --git a/kr/modules/teiler-compose.yml b/kr/modules/teiler-compose.yml index 25a3423..db42513 100644 --- a/kr/modules/teiler-compose.yml +++ b/kr/modules/teiler-compose.yml @@ -7,73 +7,58 @@ services: container_name: bridgehead-teiler-orchestrator labels: - "traefik.enable=true" - - "traefik.http.routers.teiler_orchestrator_ccp.rule=PathPrefix(`/ccp-teiler`)" - - "traefik.http.services.teiler_orchestrator_ccp.loadbalancer.server.port=9000" - - "traefik.http.routers.teiler_orchestrator_ccp.tls=true" - - "traefik.http.middlewares.teiler_orchestrator_ccp_strip.stripprefix.prefixes=/ccp-teiler" - - "traefik.http.routers.teiler_orchestrator_ccp.middlewares=teiler_orchestrator_ccp_strip" + - "traefik.http.routers.teiler_orchestrator_kr.rule=PathPrefix(`/kr-teiler`)" + - "traefik.http.services.teiler_orchestrator_kr.loadbalancer.server.port=9000" + - "traefik.http.routers.teiler_orchestrator_kr.tls=true" + - "traefik.http.middlewares.teiler_orchestrator_kr_strip.stripprefix.prefixes=/kr-teiler" + - "traefik.http.routers.teiler_orchestrator_kr.middlewares=teiler_orchestrator_kr_strip" environment: - TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" - TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" + TEILER_BACKEND_URL: "/kr-teiler-backend" + TEILER_DASHBOARD_URL: "/kr-teiler-dashboard" DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}" - HTTP_RELATIVE_PATH: "/ccp-teiler" + HTTP_RELATIVE_PATH: "/kr-teiler" teiler-dashboard: image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" - - "traefik.http.routers.teiler_dashboard_ccp.rule=PathPrefix(`/ccp-teiler-dashboard`)" - - "traefik.http.services.teiler_dashboard_ccp.loadbalancer.server.port=80" - - "traefik.http.routers.teiler_dashboard_ccp.tls=true" - - "traefik.http.middlewares.teiler_dashboard_ccp_strip.stripprefix.prefixes=/ccp-teiler-dashboard" - - "traefik.http.routers.teiler_dashboard_ccp.middlewares=teiler_dashboard_ccp_strip" + - "traefik.http.routers.teiler_dashboard_kr.rule=PathPrefix(`/kr-teiler-dashboard`)" + - "traefik.http.services.teiler_dashboard_kr.loadbalancer.server.port=80" + - "traefik.http.routers.teiler_dashboard_kr.tls=true" + - "traefik.http.middlewares.teiler_dashboard_kr_strip.stripprefix.prefixes=/kr-teiler-dashboard" + - "traefik.http.routers.teiler_dashboard_kr.middlewares=teiler_dashboard_kr_strip" environment: DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" - TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" - TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" - OIDC_URL: "${OIDC_URL}" - OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" - OIDC_TOKEN_GROUP: "${OIDC_GROUP_CLAIM}" + TEILER_BACKEND_URL: "/kr-teiler-backend" + TEILER_DASHBOARD_URL: "/kr-teiler-dashboard" TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}" TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}" TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}" TEILER_PROJECT: "${PROJECT}" EXPORTER_API_KEY: "${EXPORTER_API_KEY}" - TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler" - TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler" - TEILER_USER: "${OIDC_USER_GROUP}" - TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" + TEILER_ORCHESTRATOR_URL: "/kr-teiler" + TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/kr-teiler" REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb" EXPORTER_DEFAULT_TEMPLATE_ID: "ccp" teiler-backend: - image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:latest + image: docker.verbis.dkfz.de/ccp/kr-teiler-backend:latest container_name: bridgehead-teiler-backend labels: - "traefik.enable=true" - - "traefik.http.routers.teiler_backend_ccp.rule=PathPrefix(`/ccp-teiler-backend`)" - - "traefik.http.services.teiler_backend_ccp.loadbalancer.server.port=8085" - - "traefik.http.routers.teiler_backend_ccp.tls=true" - - "traefik.http.middlewares.teiler_backend_ccp_strip.stripprefix.prefixes=/ccp-teiler-backend" - - "traefik.http.routers.teiler_backend_ccp.middlewares=teiler_backend_ccp_strip" + - "traefik.http.routers.teiler_backend_kr.rule=PathPrefix(`/kr-teiler-backend`)" + - "traefik.http.services.teiler_backend_kr.loadbalancer.server.port=8085" + - "traefik.http.routers.teiler_backend_kr.tls=true" + - "traefik.http.middlewares.teiler_backend_kr_strip.stripprefix.prefixes=/kr-teiler-backend" + - "traefik.http.routers.teiler_backend_kr.middlewares=teiler_backend_kr_strip" environment: LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" - APPLICATION_ADDRESS: "${HOST}" DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" - CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf" - TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler" - TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler" - TEILER_DASHBOARD_DE_URL: "https://${HOST}/ccp-teiler-dashboard/de" - TEILER_DASHBOARD_EN_URL: "https://${HOST}/ccp-teiler-dashboard/en" + TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/kr-teiler" + TEILER_ORCHESTRATOR_URL: "/kr-teiler" + TEILER_DASHBOARD_DE_URL: "/kr-teiler-dashboard/de" + TEILER_DASHBOARD_EN_URL: "/kr-teiler-dashboard/en" HTTP_PROXY: "http://forward_proxy:3128" - ENABLE_MTBA: "${ENABLE_MTBA}" - ENABLE_DATASHIELD: "${ENABLE_DATASHIELD}" - secrets: - - ccp.conf - -secrets: - ccp.conf: - file: /etc/bridgehead/ccp.conf diff --git a/kr/modules/teiler-setup.sh b/kr/modules/teiler-setup.sh index eed3f81..dc8dfc4 100644 --- a/kr/modules/teiler-setup.sh +++ b/kr/modules/teiler-setup.sh @@ -3,7 +3,6 @@ if [ "$ENABLE_TEILER" == true ];then log INFO "Teiler setup detected -- will start Teiler services." OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" - TEILER_DEFAULT_LANGUAGE=DE + TEILER_DEFAULT_LANGUAGE=EN TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} - add_public_oidc_redirect_url "/ccp-teiler/*" fi diff --git a/kr/modules/teiler.md b/kr/modules/teiler.md deleted file mode 100644 index 51e94e4..0000000 --- a/kr/modules/teiler.md +++ /dev/null @@ -1,19 +0,0 @@ -# Teiler -This module orchestrates the different microfrontends of the bridgehead as a single page application. - -## Teiler Orchestrator -Single SPA component that consists on the root HTML site of the single page application and a javascript code that -gets the information about the microfrontend calling the teiler backend and is responsible for registering them. With the -resulting mapping, it can initialize, mount and unmount the required microfrontends on the fly. - -The microfrontends run independently in different containers and can be based on different frameworks (Angular, Vue, React,...) -This microfrontends can run as single alone but need an extension with Single-SPA (https://single-spa.js.org/docs/ecosystem). -There are also available three templates (Angular, Vue, React) to be directly extended to be used directly in the teiler. - -## Teiler Dashboard -It consists on the main dashboard and a set of embedded services. -### Login -user and password in ccp.local.conf - -## Teiler Backend -In this component, the microfrontends are configured.