This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch UNOMI-225-ES7 in repository https://gitbox.apache.org/repos/asf/unomi.git
commit a9268fa4d85dcb48a4da5b589ca5ce7187aa4324 Author: Serge Huber <[email protected]> AuthorDate: Mon Nov 18 22:50:32 2019 +0100 UNOMI-225 ElasticSearch 7 support - Connection to ElasticSearch is not starting, but still some errors Signed-off-by: Serge Huber <[email protected]> --- docker/docker-compose.yml | 1 - manual/src/main/asciidoc/configuration.adoc | 4 ++-- package/src/main/resources/etc/custom.system.properties | 4 ++-- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 13 +++---------- .../org.apache.unomi.persistence.elasticsearch.cfg | 8 ++++---- 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7017232..e804213 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -27,7 +27,6 @@ services: - xpack.security.enabled=false - cluster.name=contextElasticSearch ports: # Expose Elasticsearch ports - - "9300:9300" - "9200:9200" unomi: diff --git a/manual/src/main/asciidoc/configuration.adoc b/manual/src/main/asciidoc/configuration.adoc index 9392d7e..f193b20 100644 --- a/manual/src/main/asciidoc/configuration.adoc +++ b/manual/src/main/asciidoc/configuration.adoc @@ -79,9 +79,9 @@ You can use the following properties for the ElasticSearch configuration ---- org.apache.unomi.elasticsearch.cluster.name=contextElasticSearch # The elasticsearch.adresses may be a comma seperated list of host names and ports such as -# hostA:9300,hostB:9300 +# hostA:9200,hostB:9200 # Note: the port number must be repeated for each host. -org.apache.unomi.elasticsearch.addresses=localhost:9300 +org.apache.unomi.elasticsearch.addresses=localhost:9200 ---- ==== Secured events configuration diff --git a/package/src/main/resources/etc/custom.system.properties b/package/src/main/resources/etc/custom.system.properties index f1ad51e..dc14052 100644 --- a/package/src/main/resources/etc/custom.system.properties +++ b/package/src/main/resources/etc/custom.system.properties @@ -63,9 +63,9 @@ org.apache.unomi.cluster.nodeStatisticsUpdateFrequency=${env:UNOMI_CLUSTER_NODES ####################################################################################################################### org.apache.unomi.elasticsearch.cluster.name=${env:UNOMI_ELASTICSEARCH_CLUSTERNAME:-contextElasticSearch} # The elasticSearchAddresses may be a comma seperated list of host names and ports such as -# hostA:9300,hostB:9300 +# hostA:9200,hostB:9200 # Note: the port number must be repeated for each host. -org.apache.unomi.elasticsearch.addresses=${env:UNOMI_ELASTICSEARCH_ADDRESSES:-localhost:9300} +org.apache.unomi.elasticsearch.addresses=${env:UNOMI_ELASTICSEARCH_ADDRESSES:-localhost:9200} org.apache.unomi.elasticsearch.index.name=${env:UNOMI_ELASTICSEARCH_INDEXNAME:-context} org.apache.unomi.elasticsearch.monthlyIndex.nbShards=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_SHARDS:-5} org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_REPLICAS:-0} diff --git a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a1f13b5..dadf585 100644 --- a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -31,7 +31,7 @@ update-strategy="reload" placeholder-prefix="${es."> <cm:default-properties> <cm:property name="cluster.name" value="contextElasticSearch"/> - <cm:property name="elasticSearchAddresses" value="localhost:9300"/> + <cm:property name="elasticSearchAddresses" value="localhost:9200"/> <cm:property name="index.name" value="context"/> <cm:property name="numberOfShards" value="5"/> <cm:property name="numberOfReplicas" value="0"/> @@ -45,15 +45,11 @@ <cm:property name="bulkProcessor.flushInterval" value="5s" /> <cm:property name="bulkProcessor.backoffPolicy" value="exponential" /> - <cm:property name="minimalElasticSearchVersion" value="5.0.0" /> - <cm:property name="maximalElasticSearchVersion" value="5.7.0" /> + <cm:property name="minimalElasticSearchVersion" value="7.0.0" /> + <cm:property name="maximalElasticSearchVersion" value="8.0.0" /> <cm:property name="aggregateQueryBucketSize" value="5000" /> - <cm:property name="transportClientClassName" value="" /> - <cm:property name="transportClientJarDirectory" value="" /> - <cm:property name="transportClientProperties" value="" /> - <cm:property name="itemClassesToCache" value="" /> <cm:property name="useBatchingForSave" value="false" /> @@ -119,9 +115,6 @@ <property name="maximalElasticSearchVersion" value="${es.maximalElasticSearchVersion}" /> <property name="aggregateQueryBucketSize" value="${es.aggregateQueryBucketSize}" /> - <property name="transportClientClassName" value="${es.transportClientClassName}" /> - <property name="transportClientJarDirectory" value="${es.transportClientJarDirectory}" /> - <property name="transportClientProperties" value="${es.transportClientProperties}" /> <property name="metricsService" ref="metricsService" /> <property name="hazelcastInstance" ref="hazelcastInstance" /> diff --git a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg index 2a47ed5..8e7dc7b 100644 --- a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg +++ b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg @@ -17,9 +17,9 @@ cluster.name=${org.apache.unomi.elasticsearch.cluster.name:-contextElasticSearch} # The elasticSearchAddresses may be a comma seperated list of host names and ports such as -# hostA:9300,hostB:9300 +# hostA:9200,hostB:9200 # Note: the port number must be repeated for each host. -elasticSearchAddresses=${org.apache.unomi.elasticsearch.addresses:-localhost:9300} +elasticSearchAddresses=${org.apache.unomi.elasticsearch.addresses:-localhost:9200} index.name=${org.apache.unomi.elasticsearch.index.name:-context} monthlyIndex.numberOfShards=${org.apache.unomi.elasticsearch.monthlyIndex.nbShards:-5} monthlyIndex.numberOfReplicas=${org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas:-0} @@ -40,8 +40,8 @@ bulkProcessor.backoffPolicy=${org.apache.unomi.elasticsearch.bulkProcessor.backo # appropriate versions are used. The check is performed like this : # for each node in the ElasticSearch cluster: # minimalElasticSearchVersion <= ElasticSearch node version < maximalElasticSearchVersion -minimalElasticSearchVersion=5.0.0 -maximalElasticSearchVersion=5.7.0 +minimalElasticSearchVersion=7.0.0 +maximalElasticSearchVersion=8.0.0 # The following setting is used to set the aggregate query bucket size aggregateQueryBucketSize=${org.apache.unomi.elasticsearch.aggregateQueryBucketSize:-5000}
