From 574bea83435ac5ae73c031ef71e001884c12b7c9 Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Tue, 20 Aug 2024 16:28:00 +0000
Subject: [PATCH] 2417 - qr dedicated rabbitmq

---
 contrib/datawave-quickstart/docker/pom.xml   |  1 +
 docker/bootstrap.sh                          |  1 +
 docker/config/application-querymessaging.yml |  2 ++
 docker/config/application.yml                |  6 ++++++
 docker/docker-compose.yml                    | 18 ++++++++++++++++++
 docker/rabbitmq-config/rabbitmq.conf         |  2 +-
 microservices/services/config                |  2 +-
 7 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml
index a95c49b38e..2b9c4c687a 100644
--- a/contrib/datawave-quickstart/docker/pom.xml
+++ b/contrib/datawave-quickstart/docker/pom.xml
@@ -17,6 +17,7 @@
         <dist.maven>apache-maven-3.8.8-bin.tar.gz</dist.maven>
         <dist.wildfly>wildfly-17.0.1.Final.tar.gz</dist.wildfly>
         <dist.zookeeper>apache-zookeeper-3.7.2-bin.tar.gz</dist.zookeeper>
+        <docker.image.prefix />
         <skipIngest>false</skipIngest>
         <url.accumulo>https://dlcdn.apache.org/accumulo/2.1.3/${dist.accumulo}</url.accumulo>
         <url.hadoop>https://dlcdn.apache.org/hadoop/common/hadoop-3.3.6/${dist.hadoop}</url.hadoop>
diff --git a/docker/bootstrap.sh b/docker/bootstrap.sh
index 50d0acebf5..35c03f969c 100755
--- a/docker/bootstrap.sh
+++ b/docker/bootstrap.sh
@@ -3,6 +3,7 @@ echo
 
 # Ensure that permissions are set correctly for the config files
 chmod -R 755 config pki rabbitmq-config
+chmod -R 755 config pki qr-rabbitmq-config
 
 DW_HOSTNAME=$(hostname)
 DW_HOSTNAME=${DW_HOSTNAME%%.*}
diff --git a/docker/config/application-querymessaging.yml b/docker/config/application-querymessaging.yml
index fd5b0c97e7..6c86fb5db0 100755
--- a/docker/config/application-querymessaging.yml
+++ b/docker/config/application-querymessaging.yml
@@ -7,5 +7,7 @@ datawave:
       backend: ${messaging.backend}
       rabbitmq:
         maxMessageSizeBytes: ${messaging.maxMessageSizeBytes}
+      qr-rabbitmq:
+        maxMessageSizeBytes: ${messaging.maxMessageSizeBytes}
       kafka:
         partitions: 2
diff --git a/docker/config/application.yml b/docker/config/application.yml
index 187031a21c..4b0a13c7fe 100755
--- a/docker/config/application.yml
+++ b/docker/config/application.yml
@@ -66,6 +66,12 @@ spring:
     publisher-confirm-type: simple
     publisher-confirms: true
     publisher-returns: true
+  qr-rabbitmq:
+    host: ${MESSAGING_SERVER_HOSTNAME:localhost}
+    port: 5673
+    publisher-confirm-type: simple
+    publisher-confirms: true
+    publisher-returns: true
   cloud:
     consul:
       enabled: false
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c6a0b8ac4b..a2fa4a08c1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -80,6 +80,24 @@ services:
       consul:
         condition: service_started
 
+  qr-rabbitmq:
+    image: docker.io/rabbitmq:3.12.4
+    volumes:
+      - ${RABBITMQ_CONFIG_DIR:-./rabbitmq-config}:/etc/rabbitmq
+      - ./logs:/logs
+    environment:
+      - TCP_PORTS=25672, 15672, 5672
+      - RABBITMQ_ERLANG_COOKIE="mycookie"
+    ports:
+      - "5673:5672"
+      - "15673:15672"
+      - "25673:25672"
+    networks:
+      - demo
+    depends_on:
+      consul:
+        condition: service_started
+
   # When auto.create.topics.enable is true, this causes deleted topics to be recreated at random.  So, leave it disabled.
   kafka:
     profiles:
diff --git a/docker/rabbitmq-config/rabbitmq.conf b/docker/rabbitmq-config/rabbitmq.conf
index fb31f28240..76476219dd 100755
--- a/docker/rabbitmq-config/rabbitmq.conf
+++ b/docker/rabbitmq-config/rabbitmq.conf
@@ -13,4 +13,4 @@ cluster_formation.consul.svc_ttl = 30
 cluster_formation.consul.deregister_after = 90
 cluster_partition_handling = autoheal
 # Enable the guest user
-loopback_users.guest = false
\ No newline at end of file
+loopback_users.guest = false
diff --git a/microservices/services/config b/microservices/services/config
index 5ebd0e127e..abc111b434 160000
--- a/microservices/services/config
+++ b/microservices/services/config
@@ -1 +1 @@
-Subproject commit 5ebd0e127e74970e9da802387e8ba2b9646ce319
+Subproject commit abc111b434f6375f4dc61cfe9d04a7c9153fc39c