pooling

ministryofjustice · Sep 24, 2024 · 88a5733 · 88a5733
1 parent 4db3ee6
commit 88a5733
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/kustomize/base/patch-live-content-indexing.yaml b/kustomize/base/patch-live-content-indexing.yaml
@@ -8,9 +8,12 @@ spec:
       containers:
         - name: alfresco-search-enterprise-content
           env:
-            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
-            #   value: "true"
-            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
-            #   value: "100"
+            - name: SPRING_ACTIVEMQ_POOL_ENABLED
+              value: "true"
+            - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+              value: "100"
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
+            - name: INPUT_ALFRESCO_CONTENT_BATCH_EVENT_CHANNEL
+              value: sjms-batch:content.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
+
diff --git a/kustomize/base/patch-live-mediation-indexing.yaml b/kustomize/base/patch-live-mediation-indexing.yaml
@@ -8,9 +8,11 @@ spec:
       containers:
         - name: alfresco-search-enterprise-mediation
           env:
-            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
-            #   value: "true"
-            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
-            #   value: "100"
+            - name: SPRING_ACTIVEMQ_POOL_ENABLED
+              value: "true"
+            - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+              value: "100"
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
+            - name: INPUT_ALFRESCO_MEDIATION_BATCH_EVENT_CHANNEL
+              value: sjms-batch:mediation.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
diff --git a/kustomize/base/patch-live-metadata-indexing.yaml b/kustomize/base/patch-live-metadata-indexing.yaml
@@ -8,9 +8,11 @@ spec:
       containers:
         - name: alfresco-search-enterprise-metadata
           env:
-            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
-            #   value: "true"
-            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
-            #   value: "100"
+            - name: SPRING_ACTIVEMQ_POOL_ENABLED
+              value: "true"
+            - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+              value: "100"
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
+            - name: INPUT_ALFRESCO_METADATA_BATCH_EVENT_CHANNEL
+              value: sjms-batch:metadata.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
diff --git a/kustomize/base/patch-live-path-indexing.yaml b/kustomize/base/patch-live-path-indexing.yaml
@@ -8,9 +8,11 @@ spec:
       containers:
         - name: alfresco-search-enterprise-path
           env:
-            # - name: SPRING_ACTIVEMQ_POOL_ENABLED
-            #   value: "true"
-            # - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
-            #   value: "100"
+            - name: SPRING_ACTIVEMQ_POOL_ENABLED
+              value: "true"
+            - name: SPRING_ACTIVEMQ_POOL_MAXCONNECTIONS
+              value: "100"
             - name: JAVA_OPTS
               value: "-Dspring.activemq.packages.trustAll=true"
+            - name: INPUT_ALFRESCO_PATH_BATCH_EVENT_CHANNEL
+              value: sjms-batch:path.event?completionTimeout=1000&completionSize=10&aggregationStrategy=#eventAggregator&?consumerCount=20
diff --git a/kustomize/stage/patch-ingress-repository.yaml b/kustomize/stage/patch-ingress-repository.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-alfresco-cs-repository
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-repository-hmpps-delius-alfresco-stage-green
-    nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder"
+    nginx.ingress.kubernetes.io/whitelist-source-range: "3.10.104.193,3.11.26.150,18.130.189.137,35.178.209.113,3.8.51.207,35.177.252.54,35.176.93.186/32,35.177.125.252/32,35.177.137.160/32,81.134.202.29/32,51.149.250.0/24,51.149.251.0/24,213.121.161.112/28,217.33.148.210/32,13.43.9.198/32,13.42.163.245/32,18.132.208.127/32,51.149.249.0/29,51.149.249.32/29,194.33.192.0/25,194.33.193.0/25,194.33.196.0/25,194.33.197.0/25,195.59.75.0/24,194.33.248.0/29,194.33.249.0/29,62.25.106.209/32,195.92.40.49/32,62.25.109.197/32,195.92.38.16/28,212.137.36.230/32,78.33.10.50/31,78.33.10.52/30,78.33.10.56/30,78.33.10.60/32,78.33.32.99/32,78.33.32.100/30,78.33.32.104/30,78.33.32.108/32,83.98.63.176/29,194.75.210.216/29,217.138.45.109/32,217.138.45.110/32"
 spec:
   rules:
     - host: hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk

diff --git a/kustomize/stage/patch-ingress-share.yaml b/kustomize/stage/patch-ingress-share.yaml
@@ -4,7 +4,7 @@ metadata:
   name: alfresco-content-services-alfresco-cs-share
   annotations:
     external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-share-hmpps-delius-alfresco-stage-green
-    nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder"
+    nginx.ingress.kubernetes.io/whitelist-source-range: "3.10.104.193,3.11.26.150,18.130.189.137,35.178.209.113,3.8.51.207,35.177.252.54,35.176.93.186/32,35.177.125.252/32,35.177.137.160/32,81.134.202.29/32,51.149.250.0/24,51.149.251.0/24,213.121.161.112/28,217.33.148.210/32,13.43.9.198/32,13.42.163.245/32,18.132.208.127/32,51.149.249.0/29,51.149.249.32/29,194.33.192.0/25,194.33.193.0/25,194.33.196.0/25,194.33.197.0/25,195.59.75.0/24,194.33.248.0/29,194.33.249.0/29,62.25.106.209/32,195.92.40.49/32,62.25.109.197/32,195.92.38.16/28,212.137.36.230/32,78.33.10.50/31,78.33.10.52/30,78.33.10.56/30,78.33.10.60/32,78.33.32.99/32,78.33.32.100/30,78.33.32.104/30,78.33.32.108/32,83.98.63.176/29,194.75.210.216/29,217.138.45.109/32,217.138.45.110/32"
 spec:
   rules:
     - host: share.hmpps-delius-alfresco-stage.apps.live.cloud-platform.service.justice.gov.uk