This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new 917bb99 UNOMI-325 Make Unomi compatible with Kibana
917bb99 is described below
commit 917bb9932a0fa0baa0b96dac0a70f20c8d5d2b1a
Author: Serge Huber <[email protected]>
AuthorDate: Mon Apr 20 18:15:22 2020 +0200
UNOMI-325 Make Unomi compatible with Kibana
---
package/src/main/resources/etc/custom.system.properties | 2 ++
.../ElasticSearchPersistenceServiceImpl.java | 17 +++++++++++++++--
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 4 ++++
.../org.apache.unomi.persistence.elasticsearch.cfg | 2 ++
.../unomi/shell/migration/impl/MigrationTo150.java | 1 +
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/package/src/main/resources/etc/custom.system.properties
b/package/src/main/resources/etc/custom.system.properties
index 9e91a96..423adaa 100644
--- a/package/src/main/resources/etc/custom.system.properties
+++ b/package/src/main/resources/etc/custom.system.properties
@@ -70,9 +70,11 @@
org.apache.unomi.elasticsearch.index.prefix=${env:UNOMI_ELASTICSEARCH_INDEXPREFI
org.apache.unomi.elasticsearch.monthlyIndex.nbShards=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_SHARDS:-5}
org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_REPLICAS:-0}
org.apache.unomi.elasticsearch.monthlyIndex.indexMappingTotalFieldsLimit=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_MAPPINGTOTALFIELDSLIMIT:-1000}
+org.apache.unomi.elasticsearch.monthlyIndex.indexMaxDocValueFieldsSearch=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_MAXDOCVALUEFIELDSSEARCH:-1000}
org.apache.unomi.elasticsearch.defaultIndex.nbShards=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_SHARDS:-5}
org.apache.unomi.elasticsearch.defaultIndex.nbReplicas=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_REPLICAS:-0}
org.apache.unomi.elasticsearch.defaultIndex.indexMappingTotalFieldsLimit=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_MAPPINGTOTALFIELDSLIMIT:-1000}
+org.apache.unomi.elasticsearch.defaultIndex.indexMaxDocValueFieldsSearch=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_MAXDOCVALUEFIELDSSEARCH:-1000}
org.apache.unomi.elasticsearch.defaultQueryLimit=${env:UNOMI_ELASTICSEARCH_DEFAULTQUERYLIMIT:-10}
org.apache.unomi.elasticsearch.aggregateQueryBucketSize=${env:UNOMI_ELASTICSEARCH_AGGREGATEBUCKETSIZE:-5000}
org.apache.unomi.elasticsearch.maximumIdsQueryCount=${env:UNOMI_ELASTICSEARCH_MAXIMUMIDSQUERYCOUNT:-5000}
diff --git
a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index cb563f0..5917485 100644
---
a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++
b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -140,9 +140,11 @@ public class ElasticSearchPersistenceServiceImpl
implements PersistenceService,
private String monthlyIndexNumberOfShards;
private String monthlyIndexNumberOfReplicas;
private String monthlyIndexMappingTotalFieldsLimit;
+ private String monthlyIndexMaxDocValueFieldsSearch;
private String numberOfShards;
private String numberOfReplicas;
private String indexMappingTotalFieldsLimit;
+ private String indexMaxDocValueFieldsSearch;
private BundleContext bundleContext;
private Map<String, String> mappings = new HashMap<String, String>();
private ConditionEvaluatorDispatcher conditionEvaluatorDispatcher;
@@ -211,6 +213,10 @@ public class ElasticSearchPersistenceServiceImpl
implements PersistenceService,
this.monthlyIndexMappingTotalFieldsLimit =
monthlyIndexMappingTotalFieldsLimit;
}
+ public void setMonthlyIndexMaxDocValueFieldsSearch(String
monthlyIndexMaxDocValueFieldsSearch) {
+ this.monthlyIndexMaxDocValueFieldsSearch =
monthlyIndexMaxDocValueFieldsSearch;
+ }
+
public void setNumberOfShards(String numberOfShards) {
this.numberOfShards = numberOfShards;
}
@@ -223,6 +229,10 @@ public class ElasticSearchPersistenceServiceImpl
implements PersistenceService,
this.indexMappingTotalFieldsLimit = indexMappingTotalFieldsLimit;
}
+ public void setIndexMaxDocValueFieldsSearch(String
indexMaxDocValueFieldsSearch) {
+ this.indexMaxDocValueFieldsSearch = indexMaxDocValueFieldsSearch;
+ }
+
public void setDefaultQueryLimit(Integer defaultQueryLimit) {
this.defaultQueryLimit = defaultQueryLimit;
}
@@ -978,11 +988,13 @@ public class ElasticSearchPersistenceServiceImpl
implements PersistenceService,
for (String itemName : itemsMonthlyIndexed) {
PutIndexTemplateRequest putIndexTemplateRequest = new
PutIndexTemplateRequest("context-"+itemName+"-date-template")
.patterns(Collections.singletonList(getMonthlyIndexForQuery(itemName)))
+ .order(1)
.settings("{\n" +
" \"index\" : {\n" +
" \"number_of_shards\" : " +
monthlyIndexNumberOfShards + ",\n" +
" \"number_of_replicas\" : " +
monthlyIndexNumberOfReplicas + ",\n" +
- " \"mapping.total_fields.limit\" :
" + monthlyIndexMappingTotalFieldsLimit + "\n" +
+ " \"mapping.total_fields.limit\" :
" + monthlyIndexMappingTotalFieldsLimit + ",\n" +
+ " \"max_docvalue_fields_search\" :
" + monthlyIndexMaxDocValueFieldsSearch + "\n" +
" },\n" +
" \"analysis\": {\n" +
" \"analyzer\": {\n" +
@@ -1057,7 +1069,8 @@ public class ElasticSearchPersistenceServiceImpl
implements PersistenceService,
" \"index\" : {\n" +
" \"number_of_shards\" : " + numberOfShards +
",\n" +
" \"number_of_replicas\" : " + numberOfReplicas
+ ",\n" +
- " \"mapping.total_fields.limit\" : " +
indexMappingTotalFieldsLimit + "\n" +
+ " \"mapping.total_fields.limit\" : " +
indexMappingTotalFieldsLimit + ",\n" +
+ " \"max_docvalue_fields_search\" : " +
indexMaxDocValueFieldsSearch + "\n" +
" },\n" +
" \"analysis\": {\n" +
" \"analyzer\": {\n" +
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 c749aa1..9cc0dda 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
@@ -36,9 +36,11 @@
<cm:property name="numberOfShards" value="5"/>
<cm:property name="numberOfReplicas" value="0"/>
<cm:property name="indexMappingTotalFieldsLimit" value="1000"/>
+ <cm:property name="indexMaxDocValueFieldsSearch" value="1000"/>
<cm:property name="monthlyIndex.numberOfShards" value="3"/>
<cm:property name="monthlyIndex.numberOfReplicas" value="0"/>
<cm:property name="monthlyIndex.indexMappingTotalFieldsLimit"
value="1000"/>
+ <cm:property name="monthlyIndex.indexMaxDocValueFieldsSearch"
value="1000"/>
<cm:property name="defaultQueryLimit" value="10"/>
<cm:property name="bulkProcessor.concurrentRequests" value="1" />
@@ -93,9 +95,11 @@
<property name="monthlyIndexNumberOfShards"
value="${es.monthlyIndex.numberOfShards}"/>
<property name="monthlyIndexNumberOfReplicas"
value="${es.monthlyIndex.numberOfReplicas}"/>
<property name="monthlyIndexMappingTotalFieldsLimit"
value="${es.monthlyIndex.indexMappingTotalFieldsLimit}"/>
+ <property name="monthlyIndexMaxDocValueFieldsSearch"
value="${es.monthlyIndex.indexMaxDocValueFieldsSearch}"/>
<property name="numberOfShards" value="${es.numberOfShards}"/>
<property name="numberOfReplicas" value="${es.numberOfReplicas}"/>
<property name="indexMappingTotalFieldsLimit"
value="${es.indexMappingTotalFieldsLimit}"/>
+ <property name="indexMaxDocValueFieldsSearch"
value="${es.indexMaxDocValueFieldsSearch}"/>
<property name="elasticSearchAddresses"
value="${es.elasticSearchAddresses}"/>
<property name="defaultQueryLimit" value="${es.defaultQueryLimit}"/>
<property name="itemsMonthlyIndexed">
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 eb0e911..54522c8 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
@@ -24,9 +24,11 @@
index.prefix=${org.apache.unomi.elasticsearch.index.prefix:-context}
monthlyIndex.numberOfShards=${org.apache.unomi.elasticsearch.monthlyIndex.nbShards:-5}
monthlyIndex.numberOfReplicas=${org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas:-0}
monthlyIndex.indexMappingTotalFieldsLimit=${org.apache.unomi.elasticsearch.monthlyIndex.indexMappingTotalFieldsLimit:-1000}
+monthlyIndex.indexMaxDocValueFieldsSearch=${org.apache.unomi.elasticsearch.monthlyIndex.indexMaxDocValueFieldsSearch:-1000}
numberOfShards=${org.apache.unomi.elasticsearch.defaultIndex.nbShards:-5}
numberOfReplicas=${org.apache.unomi.elasticsearch.defaultIndex.nbReplicas:-0}
indexMappingTotalFieldsLimit=${org.apache.unomi.elasticsearch.defaultIndex.indexMappingTotalFieldsLimit:-1000}
+indexMaxDocValueFieldsSearch=${org.apache.unomi.elasticsearch.defaultIndex.indexMaxDocValueFieldsSearch:-1000}
defaultQueryLimit=${org.apache.unomi.elasticsearch.defaultQueryLimit:-10}
# The following settings control the behavior of the BulkProcessor API. You
can find more information about these
diff --git
a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo150.java
b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo150.java
index 7a75e32..03c377e 100644
---
a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo150.java
+++
b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo150.java
@@ -152,6 +152,7 @@ public class MigrationTo150 implements Migration {
.put("index", new JSONObject()
.put("number_of_shards", numberOfShards)
.put("number_of_replicas", numberOfReplicas)
+ .put("max_docvalue_fields_search", 1000)
)
.put("analysis", new JSONObject()
.put("analyzer", new JSONObject()
