Merge pull request #293 from KPMP/develop

Atlas Q3 2023 release
KPMP · Sep 30, 2023 · eca9788 · eca9788
2 parents 21fede7 + f67caf1
commit eca9788
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 4 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
@@ -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*
@@ -50,7 +51,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/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
@@ -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   "^/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]

diff --git 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
@@ -47,7 +47,31 @@ services:
     networks:
       local:
         aliases:
-          - hubble-spring           
+          - hubble-spring      
+
+  hydra-spring:
+    container_name: hydra-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
@@ -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

diff --git a/libra/docker-compose.prod.yml b/libra/docker-compose.prod.yml
@@ -27,6 +27,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