additions based on todos in helm-charts branch

gh/start.process.local.txt

@@ -2,6 +2,6 @@ docker run -d --network host --rm --env-file ./env.txt rico2edm:latest
 
 
 cd /home/swissbib/environment/code/repositories/memoriav/gitlab/services/elastic-services/elastic-bulk-action-service/gh
-docker run -d --network host --rm --env-file ./env.txt elastic-bulk:latest
+
 
 docker run -d -v /home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs:/configs --network host --rm --env-file ./env.txt rico2edm:latest
\ No newline at end of file

helm-charts/templates/app-config.yaml

@@ -8,9 +8,9 @@ data:
   TOPIC_IN: "{{ .Values.inputTopicName }}"
   TOPIC_OUT: "{{ .Values.outputTopicName }}"
   TOPIC_PROCESS: "{{ .Values.reportingTopicName }}"
-  ELASTIC_CLUSTERNAME: "{{ .Values.elasticClustername }}"
-  ELASTIC_INSTITUTION_INDEX: "{{ .Values.elasticClustername }}" # TODO: Can maybe be removed
-  ELASTIC_RECORD_SET_INDEX: "{{ .Values.elasticClustername }}" # TODO: Can maybe be removed
+  #ELASTIC_CLUSTERNAME: "{{ .Values.elasticClustername }}"
+  #ELASTIC_INSTITUTION_INDEX: "{{ .Values.elasticClustername }}" # TODO: Can maybe be removed
+  #ELASTIC_RECORD_SET_INDEX: "{{ .Values.elasticClustername }}" # TODO: Can maybe be removed
   ISOCODE_MAPPING: "{{ .Values.isocodeMapping }}"
   INSTITUTIONS_COORDINATES: "{{ .Values.institutionsCoordinates }}"
   EXPORT_DEFINITION_RULES: "{{ .Values.exportDefinitionRules }}"

helm-charts/values.yaml

@@ -20,9 +20,16 @@ reportingTopicName: placeholder
 applicationId: placeholder
 
 elasticHostConfigs: placeholder
-elasticClustername: placeholder # TODO: Why is this value needed?
-elasticInstitutionIndex: placeholder # TODO: From already existing ConfigMap (prod-institution-index) or custom value?
-elasticRecordSetIndex: placeholder # TODO: From already existing ConfigMap (prod-record-sets-index)
+#@sebastian
+#clustername was regularly used in early ES times - seems I'm getting to old..
+#compare: https://discuss.elastic.co/t/when-does-client-need-cluster-name/114916/2
+#I removed the Header setting in the code - should work now without this setting
+#elasticClustername: placeholder
+#yes please: if you can provide an elegant reference (with helm) to an already existing configmap - go for it, thanks!
+#important: the code is working with the env variables set in app.yml ("Jonas mechanism") If possible
+#I would prefer not to have to adapt the code - thanks, let me know
+#elasticInstitutionIndex: placeholder # TODO: From already existing ConfigMap (prod-institutions-index) or custom value?
+#elasticRecordSetIndex: placeholder # TODO: From already existing ConfigMap (prod-record-sets-index)
 
 isocodeMapping: placeholder
 institutionsCoordinates: placeholder

src/main/resources/app.yml

@@ -9,7 +9,7 @@ app:
   elastic:
     host: ${ELASTIC_HOST:?system}
     port: ${ELASTIC_PORT:?system}
-    clustername: ${ELASTIC_CLUSTERNAME:?system}
+    #clustername: ${ELASTIC_CLUSTERNAME:?system}
     #documentsIndex: ${DOCUMENTS_INDEX:?system}
     institutionIndex: ${INSTITUTION_INDEX:?system}
     recordSetIndex: ${RECORD_SET_INDEX:?system}

src/main/scala/ch/memobase/rico2edm/utils/ElasticSearchClientWrapper.scala

@@ -131,9 +131,16 @@ object ElasticSearchClientWrapper extends Logging{
         hosts += new HttpHost(value, configuredPort)
       }
     )
+
+    /*
+    cluster name is not (no longer) necessary for RestClient - was often used in earlier times for
+    transport client
+    cp. https://discuss.elastic.co/t/when-does-client-need-cluster-name/114916
     val headers = Array(new BasicHeader("cluster.name", props.get(Keys.ELASTIC_CLUSTERNAME).toString)
       .asInstanceOf[Header])
     new RestHighLevelClient(RestClient.builder(hosts.toArray : _*).setDefaultHeaders(headers))
+
+     */
   }