This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik 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 571e25238 UNOMI-740 : in rollover config set maxsize to 30gb and
remove maxage (#592)
571e25238 is described below
commit 571e2523863c814dacd0f6c0e3de8d84dcf8ef50
Author: jsinovassin <58434978+jsinovas...@users.noreply.github.com>
AuthorDate: Mon Mar 20 16:20:15 2023 +0000
UNOMI-740 : in rollover config set maxsize to 30gb and remove maxage (#592)
---
package/src/main/resources/etc/custom.system.properties | 4 ++--
.../core/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 4 ++--
.../src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg | 4 ++--
.../org/apache/unomi/shell/migration/service/MigrationConfig.java | 4 ++--
.../shell-commands/src/main/resources/org.apache.unomi.migration.cfg | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package/src/main/resources/etc/custom.system.properties
b/package/src/main/resources/etc/custom.system.properties
index ab10c3a8e..4b321c49b 100644
--- a/package/src/main/resources/etc/custom.system.properties
+++ b/package/src/main/resources/etc/custom.system.properties
@@ -121,8 +121,8 @@
org.apache.unomi.elasticsearch.rollover.indexMaxDocValueFieldsSearch=${env:UNOMI
org.apache.unomi.elasticsearch.rollover.indices=${env:UNOMI_ELASTICSEARCH_ROLLOVER_INDICES}
# Rollover configuration
-org.apache.unomi.elasticsearch.rollover.maxSize=${env:UNOMI_ELASTICSEARCH_ROLLOVER_MAXSIZE:-}
-org.apache.unomi.elasticsearch.rollover.maxAge=${env:UNOMI_ELASTICSEARCH_ROLLOVER_MAXAGE:-365d}
+org.apache.unomi.elasticsearch.rollover.maxSize=${env:UNOMI_ELASTICSEARCH_ROLLOVER_MAXSIZE:-30gb}
+org.apache.unomi.elasticsearch.rollover.maxAge=${env:UNOMI_ELASTICSEARCH_ROLLOVER_MAXAGE:-}
org.apache.unomi.elasticsearch.rollover.maxDocs=${env:UNOMI_ELASTICSEARCH_ROLLOVER_MAXDOCS:-}
org.apache.unomi.elasticsearch.defaultIndex.nbShards=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_SHARDS:-5}
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 83d4ecd41..507d8789f 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
@@ -51,8 +51,8 @@
<cm:property name="bulkProcessor.backoffPolicy"
value="exponential" />
<cm:property name="rollover.indices" value="" />
- <cm:property name="rollover.maxSize" value="" />
- <cm:property name="rollover.maxAge" value="365d" />
+ <cm:property name="rollover.maxSize" value="30gb" />
+ <cm:property name="rollover.maxAge" value="" />
<cm:property name="rollover.maxDocs" value="" />
<cm:property name="rollover.numberOfShards" value=""/>
<cm:property name="rollover.numberOfReplicas" value=""/>
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 9d055cff6..086941e80 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
@@ -44,8 +44,8 @@
defaultQueryLimit=${org.apache.unomi.elasticsearch.defaultQueryLimit:-10}
# Rollover amd index configuration for event and session indices, values are
cumulative
# See
https://www.elastic.co/guide/en/elasticsearch/reference/7.17/ilm-rollover.html
for option details.
-rollover.maxSize=${org.apache.unomi.elasticsearch.rollover.maxSize}
-rollover.maxAge=${org.apache.unomi.elasticsearch.rollover.maxAge:-365d}
+rollover.maxSize=${org.apache.unomi.elasticsearch.rollover.maxSize:-30gb}
+rollover.maxAge=${org.apache.unomi.elasticsearch.rollover.maxAge}
rollover.maxDocs=${org.apache.unomi.elasticsearch.rollover.maxDocs}
# 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/service/MigrationConfig.java
b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/service/MigrationConfig.java
index 3d4ccd4c7..bc89e92e1 100644
---
a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/service/MigrationConfig.java
+++
b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/service/MigrationConfig.java
@@ -67,8 +67,8 @@ public class MigrationConfig {
m.put(MONTHLY_TOTAL_FIELDS_LIMIT, new MigrationConfigProperty("Enter
ElasticSearch monthly index (event, session) mapping configuration:
mapping.total_fields.limit (default: 1000): ", "1000"));
m.put(MONTHLY_MAX_DOC_VALUE_FIELDS_SEARCH, new
MigrationConfigProperty("Enter ElasticSearch monthly index (event, session)
mapping configuration: max_docvalue_fields_search (default: 1000): ", "1000"));
m.put(MIGRATION_HISTORY_RECOVER, new MigrationConfigProperty("We found
an existing migration attempt, should we restart from it ? (this will avoid
redoing steps already completed successfully) (yes/no)", null));
- m.put(ROLLOVER_MAX_AGE, new MigrationConfigProperty("Enter
ElasticSearch index rollover configuration: max_age (default: 365d): ",
"365d"));
- m.put(ROLLOVER_MAX_SIZE, new MigrationConfigProperty("Enter
ElasticSearch index rollover configuration: max_size (default: null): ", null));
+ m.put(ROLLOVER_MAX_AGE, new MigrationConfigProperty("Enter
ElasticSearch index rollover configuration: max_age (default: null): ", null));
+ m.put(ROLLOVER_MAX_SIZE, new MigrationConfigProperty("Enter
ElasticSearch index rollover configuration: max_size (default: 30gb): ",
"30gb"));
m.put(ROLLOVER_MAX_DOCS, new MigrationConfigProperty("Enter
ElasticSearch index rollover configuration: max_docs (default: null): ", null));
configProperties = Collections.unmodifiableMap(m);
diff --git
a/tools/shell-commands/src/main/resources/org.apache.unomi.migration.cfg
b/tools/shell-commands/src/main/resources/org.apache.unomi.migration.cfg
index cc907d93f..3f2568a83 100644
--- a/tools/shell-commands/src/main/resources/org.apache.unomi.migration.cfg
+++ b/tools/shell-commands/src/main/resources/org.apache.unomi.migration.cfg
@@ -32,8 +32,8 @@
number_of_shards=${org.apache.unomi.elasticsearch.defaultIndex.nbShards:-5}
number_of_replicas=${org.apache.unomi.elasticsearch.defaultIndex.nbReplicas:-0}
mapping.total_fields.limit=${org.apache.unomi.elasticsearch.defaultIndex.indexMappingTotalFieldsLimit:-1000}
max_docvalue_fields_search=${org.apache.unomi.elasticsearch.defaultIndex.indexMaxDocValueFieldsSearch:-1000}
-rolloverMaxSize=${org.apache.unomi.elasticsearch.rollover.maxSize:-}
-rolloverMaxAge=${org.apache.unomi.elasticsearch.rollover.maxAge:-365d}
+rolloverMaxSize=${org.apache.unomi.elasticsearch.rollover.maxSize:-30gb}
+rolloverMaxAge=${org.apache.unomi.elasticsearch.rollover.maxAge:-}
rolloverMaxDocs=${org.apache.unomi.elasticsearch.rollover.maxDocs:-}
# Should the migration try to recover from a previous run ?
