CCD-5570 Update values.preview.template.yaml point to test ES cloud

Jenkinsfile_CNP

@@ -20,8 +20,8 @@ def branchesToSync = ['demo', 'ithc', 'perftest', 'develop']
 
 // Variables to switch pipeline logic and wiring per type of build
 
-def definitionStoreDevelopPr = "PR-575"  // This doesn't change frequently, but when it does, only change this value.
-def dataStoreApiDevelopPr    = "PR-1260" // This doesn't change frequently, but when it does, only change this value.
+def definitionStoreDevelopPr = "PR-1492"  // This doesn't change frequently, but when it does, only change this value.
+def dataStoreApiDevelopPr    = "PR-2458" // This doesn't change frequently, but when it does, only change this value.
 def prsToUseAat              = ""        // Set this value to a PR number, or add it as a comma-separated value, if it's to follow CI/CD.
 
 def secrets = [

README.md

@@ -123,4 +123,4 @@ Will run only S-1023.5:
 
 ## LICENSE
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE.md) file for details.
+This project is licensed under the MIT License - see the [LICENSE](LICENSE.md) file for details. 

build.gradle

@@ -331,7 +331,7 @@ dependencies {
     implementation(group: 'io.searchbox', name: 'jest', version: '6.3.1') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
     }
-    implementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.16.2') {
+    implementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.17.23') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     }
     implementation 'org.jooq:jool-java-8:0.9.14'
@@ -364,7 +364,7 @@ dependencies {
     }
     contractTestImplementation("org.springframework.boot:spring-boot-starter-data-jpa")
     contractTestImplementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.1'
-    contractTestImplementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.16.2') {
+    contractTestImplementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.17.23') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     }
     contractTestImplementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'

charts/ccd-data-store-api/values.preview.template.yaml

@@ -27,12 +27,12 @@ java:
     DATA_STORE_DB_PASSWORD: "{{ .Values.postgresql.auth.password}}"
     DATA_STORE_DB_OPTIONS: "?stringtype=unspecified"
     DATA_STORE_DB_MAX_POOL_SIZE: 10
-    DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-575-java/
+    DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-1492-java/
     USER_PROFILE_HOST: http://ccd-user-profile-api-pr-399-java/
     ELASTIC_SEARCH_ENABLED: true # enable whenever ES required on a particular PR
-    ELASTIC_SEARCH_NODES_DISCOVERY_ENABLED: true
-    ELASTIC_SEARCH_HOSTS: "{{ .Release.Name }}-es-master:9200"
-    ELASTIC_SEARCH_DATA_NODES_HOSTS: "http://{{ .Release.Name }}-es-master:9200"
+    ELASTIC_SEARCH_NODES_DISCOVERY_ENABLED: false
+    ELASTIC_SEARCH_HOSTS: "elastic-poc-ccd.es.privatelink.uksouth.azure.elastic-cloud.com:443"
+    ELASTIC_SEARCH_DATA_NODES_HOSTS: "https://elastic-poc-ccd.es.privatelink.uksouth.azure.elastic-cloud.com:443"
     TESTING_SUPPORT_ENABLED: true
     MIGRATIONS_ENDPOINT_ENABLED: true
     LOGGING_LEVEL_UK_GOV_HMCTS_CCD_SECURITY_IDAM: DEBUG
@@ -42,7 +42,7 @@ java:
     enabled: true
 
 elastic:
-  enabled: true # enable whenever required on a particular PR
+  enabled: true # enable whenever required on a particular PR - disable for POC
 
 elasticsearch:
   nameOverride: ${SERVICE_NAME}-es
@@ -91,9 +91,10 @@ logstash:
       mountPath: /usr/share/logstash/ccd
   logstashConfig:
     logstash.yml: |
+      log.level: trace
       http.host: 0.0.0.0
       xpack.monitoring.enabled: false
-      xpack.monitoring.elasticsearch.hosts: ["http://{{ .Release.Name }}-es-master:9200"]
+      xpack.monitoring.elasticsearch.hosts: ["https://elastic-poc-ccd.es.privatelink.uksouth.azure.elastic-cloud.com:443"]
       queue.type: persisted
       dead_letter_queue.enable: true
     pipelines.yml: |
@@ -218,7 +219,7 @@ logstash:
     03_output.conf: |
       output {
           elasticsearch {
-              hosts => ["http://{{ .Release.Name }}-es-master:9200"]
+              hosts => ["https://elastic-poc-ccd.es.privatelink.uksouth.azure.elastic-cloud.com:443"]
               sniffing => false
               index => "%{[index_id]}"
               document_type => "_doc"