From 5c79b4790caf8c16a1fa2ca0ce27946eb06c8066 Mon Sep 17 00:00:00 2001 From: Dert1129 Date: Thu, 6 Jul 2023 16:05:04 -0400 Subject: [PATCH 1/6] add hydra-data image --- atlas/knowledge-environment/.env.example | 1 + .../docker-compose.local.yml | 26 +++++++++++++++++- .../docker-compose.prod.yml | 27 ++++++++++++++++++- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/atlas/knowledge-environment/.env.example b/atlas/knowledge-environment/.env.example index 6c10604..2ef4608 100644 --- a/atlas/knowledge-environment/.env.example +++ b/atlas/knowledge-environment/.env.example @@ -6,6 +6,7 @@ ENV_MYSQL_PASSWORD= ENV_PEGASUS_CONTAINER=kingstonduo/pegasus-data:1.0 ENV_HUBBLE_CONTAINER=kingstonduo/hubble-data:1.0 +ENV_HYDRA_CONTAINER=kingstonduo/hydra-data:1.0 # SSL - Only used for docker-compose.dev.yml ENV_SSL_CERT_DIR=~/certs diff --git a/atlas/knowledge-environment/docker-compose.local.yml b/atlas/knowledge-environment/docker-compose.local.yml index 21a12b4..d687090 100644 --- a/atlas/knowledge-environment/docker-compose.local.yml +++ b/atlas/knowledge-environment/docker-compose.local.yml @@ -47,7 +47,31 @@ services: networks: local: aliases: - - hubble-spring + - hubble-spring + + hydra-spring: + container_name: hubble-spring + image: kingstonduo/hydra-data:1.0 + depends_on: + - mariadb + ports: + - "3050:3030" + environment: + SPRING_BOOT_ENVIRONMENT: ${ENV_DOCKER_ENVIRONMENT} + MYSQL_HOST: ${ENV_MYSQL_HOST} + MYSQL_USER: ${ENV_MYSQL_USER} + MYSQL_PASSWORD: ${ENV_MYSQL_PASSWORD} + TZ: "America/Detroit" + privileged: true + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "5" + networks: + local: + aliases: + - hydra-spring mariadb: image: mariadb diff --git a/atlas/knowledge-environment/docker-compose.prod.yml b/atlas/knowledge-environment/docker-compose.prod.yml index 2cbfb66..c64b639 100644 --- a/atlas/knowledge-environment/docker-compose.prod.yml +++ b/atlas/knowledge-environment/docker-compose.prod.yml @@ -48,7 +48,32 @@ services: networks: local: aliases: - - hubble-spring + - hubble-spring + + hydra-spring: + container_name: hydra-spring + image: ${ENV_HYDRA_CONTAINER} + depends_on: + - mariadb + ports: + - "3050:3030" + environment: + SPRING_BOOT_ENVIRONMENT: ${ENV_DOCKER_ENVIRONMENT} + MYSQL_HOST: ${ENV_MYSQL_HOST} + MYSQL_USER: ${ENV_MYSQL_USER} + MYSQL_PASSWORD: ${ENV_MYSQL_PASSWORD} + ES_API_TOKEN: ${ENV_ES_API_TOKEN} + TZ: "America/Detroit" + privileged: true + logging: + driver: "fluentd" + options: + fluentd-address: "${ENV_FLUENTD_ADDRESS}" + tag: "hydra-data" + networks: + local: + aliases: + - hydra-spring mariadb: container_name: mariadb From 6f8929c1915d46029ea428c41618ec2779ed6cc0 Mon Sep 17 00:00:00 2001 From: Dert1129 Date: Thu, 6 Jul 2023 16:06:02 -0400 Subject: [PATCH 2/6] fix container name --- atlas/knowledge-environment/docker-compose.local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas/knowledge-environment/docker-compose.local.yml b/atlas/knowledge-environment/docker-compose.local.yml index d687090..a68b799 100644 --- a/atlas/knowledge-environment/docker-compose.local.yml +++ b/atlas/knowledge-environment/docker-compose.local.yml @@ -50,7 +50,7 @@ services: - hubble-spring hydra-spring: - container_name: hubble-spring + container_name: hydra-spring image: kingstonduo/hydra-data:1.0 depends_on: - mariadb From 9ade4396c389e48ab78017a965157ec78d3c173f Mon Sep 17 00:00:00 2001 From: dert1129 Date: Wed, 9 Aug 2023 14:45:26 -0400 Subject: [PATCH 3/6] add dlu-watcher to compose --- libra/docker-compose.prod.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libra/docker-compose.prod.yml b/libra/docker-compose.prod.yml index 6cae0ab..0286877 100644 --- a/libra/docker-compose.prod.yml +++ b/libra/docker-compose.prod.yml @@ -26,6 +26,21 @@ services: aliases: - data-manager-service + dlu-watcher-service: + container_name: dlu-watcher + image: kingstonduo/dlu-watcher:1.0 + environment: + - mysql_user=${mysql_user} + - mysql_pwd=${mysql_pwd} + - mysql_host=${mysql_host} + - mysql_port=${mysql_port} + - mysql_db=${mysql_db} + networks: + dataLake: + aliases: + - dlu-watcher + + networks: dataLake: external: true From 695afdcbc157b7cd2a225cd256a15640065e4747 Mon Sep 17 00:00:00 2001 From: HaneenT Date: Thu, 10 Aug 2023 09:21:47 -0400 Subject: [PATCH 4/6] KPMP-4625: created route to get to clearCache endpoint in pegasus-data --- .../apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf | 1 + atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf index e30127d..67c202e 100755 --- a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf +++ b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf @@ -51,6 +51,7 @@ Listen 443 RewriteEngine on RewriteRule "^/endpoint/(.*?)$" "http://ENV_ARRANGER_SERVER_ADDRESS:5050/endpoint/$1" [P] RewriteRule "^/explorer/v1/error" "http://pegasus-spring:3030/v1/error" [P] + RewriteRule "^/explorer/api/(.*)$" "http://pegasus-spring:3030/$1" [P] RewriteRule "^/api/(.*)$" "http://ENV_FILE_SERVER_ADDRESS:5000/$1" [P] RewriteRule "^/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/graphql" [P] RewriteRule "^/spatial-viewer/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3040/graphql" [P] diff --git a/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf b/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf index 8e3e4a6..5142365 100755 --- a/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf +++ b/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf @@ -35,6 +35,7 @@ Listen 443 RewriteEngine on RewriteRule "^/endpoint/(.*?)$" "http://arranger-server.local:5050/endpoint/$1" [P] RewriteRule "^/explorer/v1/error" "http://pegasus-spring:3030/v1/error" [P] + RewriteRule "^/explorer/api/(.*)$" "http://pegasus-spring:3030/$1" [P] RewriteRule "^/api/(.*)$" "http://atlas-file-service:5000/$1" [P] RewriteRule "^/graphql" "http://pegasus-spring:3030/graphql" [P] RewriteRule "^/spatial-viewer/graphql" "http://hubble-spring:3030/graphql" [P] From 23643a5183ab7d2179ddc39d58469d3829755a6c Mon Sep 17 00:00:00 2001 From: HaneenT Date: Thu, 31 Aug 2023 16:32:48 -0400 Subject: [PATCH 5/6] KPMP-4221: updated rewriteRules to include clearCache endpoint --- .../container_files/etc/httpd/conf.d/virt.conf | 4 ++-- atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf index 67c202e..284b19a 100755 --- a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf +++ b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf @@ -50,8 +50,8 @@ Listen 443 RewriteEngine on RewriteRule "^/endpoint/(.*?)$" "http://ENV_ARRANGER_SERVER_ADDRESS:5050/endpoint/$1" [P] - RewriteRule "^/explorer/v1/error" "http://pegasus-spring:3030/v1/error" [P] - RewriteRule "^/explorer/api/(.*)$" "http://pegasus-spring:3030/$1" [P] + RewriteRule "^/explorer/v1/error" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/v1/error" [P] + RewriteRule "^/api/v1/clearCache" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/v1/clearCache" [P] RewriteRule "^/api/(.*)$" "http://ENV_FILE_SERVER_ADDRESS:5000/$1" [P] RewriteRule "^/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3030/graphql" [P] RewriteRule "^/spatial-viewer/graphql" "http://ENV_EXPLORER_DATA_SERVER_ADDRESS:3040/graphql" [P] diff --git a/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf b/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf index 5142365..9f92878 100755 --- a/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf +++ b/atlas/apache-atlas/container_files/etc/httpd/conf.d/virt.conf @@ -35,7 +35,7 @@ Listen 443 RewriteEngine on RewriteRule "^/endpoint/(.*?)$" "http://arranger-server.local:5050/endpoint/$1" [P] RewriteRule "^/explorer/v1/error" "http://pegasus-spring:3030/v1/error" [P] - RewriteRule "^/explorer/api/(.*)$" "http://pegasus-spring:3030/$1" [P] + RewriteRule "^/api/v1/clearCache" "http://pegasus-spring:3030/v1/clearCache" [P] RewriteRule "^/api/(.*)$" "http://atlas-file-service:5000/$1" [P] RewriteRule "^/graphql" "http://pegasus-spring:3030/graphql" [P] RewriteRule "^/spatial-viewer/graphql" "http://hubble-spring:3030/graphql" [P] From b5e8b12ac001ee03a494aac4213965ee62d0f080 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Tue, 12 Sep 2023 16:26:11 -0400 Subject: [PATCH 6/6] att option to stop processing rewrite directives --- .../container_files/etc/httpd/conf.d/virt.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf index 284b19a..a4f231a 100755 --- a/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf +++ b/atlas/apache-atlas-ssl/container_files/etc/httpd/conf.d/virt.conf @@ -30,9 +30,10 @@ Listen 443 RewriteCond %{REQUEST_FILENAME} -d RewriteRule ^ - [L] + # Send all non-existant file/directory requests to /repository to /repository/index.html RewriteCond %{REQUEST_URI} /repository* - RewriteRule ^ /repository/index.html + RewriteRule ^ /repository/index.html [L] # Send all non-existant file/directory requests to /repository2 to /repository2/index.html RewriteCond %{REQUEST_URI} /repository2*