This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 973d30aa48 Fix SW_STORAGE_ES_SUPER_DATASET_DAY_STEP variable name
(#9970)
973d30aa48 is described below
commit 973d30aa485b5fd75bf36e6698f61060893b5738
Author: Brandon Fergerson <[email protected]>
AuthorDate: Wed Nov 16 14:51:42 2022 +0400
Fix SW_STORAGE_ES_SUPER_DATASET_DAY_STEP variable name (#9970)
---
docs/en/changes/changes.md | 1 +
docs/en/setup/backend/backend-storage.md | 2 +-
docs/en/setup/backend/configuration-vocabulary.md | 4 ++--
oap-server/server-starter/src/main/resources/application.yml | 2 +-
.../server-tools/data-generator/src/main/resources/application.yml | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cbbf5dce09..781f9fba98 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -112,6 +112,7 @@
* Add `LongText` to support longer logs persistent as a text type in
ElasticSearch, instead of a keyword, to avoid length limitation.
* Fix wrong system variable name
`SW_CORE_ENABLE_ENDPOINT_NAME_GROUPING_BY_OPENAPI`. It was **opaenapi**.
* Fix not-time-series model blocking OAP boots in no-init mode.
+* Changed system variable `SW_SUPERDATASET_STORAGE_DAY_STEP` to
`SW_STORAGE_ES_SUPER_DATASET_DAY_STEP` to be consistent with other ES storage
related variables.
#### UI
diff --git a/docs/en/setup/backend/backend-storage.md
b/docs/en/setup/backend/backend-storage.md
index 074a4c3313..d6d83f0d55 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -84,7 +84,7 @@ storage:
# If configured, this setting has the highest priority and overrides the
generic settings.
specificIndexSettings: ${SW_STORAGE_ES_SPECIFIC_INDEX_SETTINGS:""}
# Super data set has been defined in the codes, such as trace segments.The
following 3 config would be improve es performance when storage super size data
in es.
- superDatasetDayStep: ${SW_SUPERDATASET_STORAGE_DAY_STEP:-1} # Represent
the number of days in the super size dataset record index, the default value is
the same as dayStep when the value is less than 0
+ superDatasetDayStep: ${SW_STORAGE_ES_SUPER_DATASET_DAY_STEP:-1} #
Represent the number of days in the super size dataset record index, the
default value is the same as dayStep when the value is less than 0
superDatasetIndexShardsFactor:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_SHARDS_FACTOR:5} # This factor provides
more shards for the super data set, shards number = indexShardsNumber *
superDatasetIndexShardsFactor. Also, this factor effects Zipkin traces.
superDatasetIndexReplicasNumber:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_REPLICAS_NUMBER:0} # Represent the replicas
number in the super size dataset record index, the default value is 0.
indexTemplateOrder: ${SW_STORAGE_ES_INDEX_TEMPLATE_ORDER:0} # the order of
index template
diff --git a/docs/en/setup/backend/configuration-vocabulary.md
b/docs/en/setup/backend/configuration-vocabulary.md
index d2474336aa..26c5524106 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -100,8 +100,8 @@ The Configuration Vocabulary lists all available
configurations provided by `app
| - | - | dayStep
| Represents the number
of days in the one-minute/hour/day index.
[...]
| - | - | indexShardsNumber
| Shard number of new
indexes.
[...]
| - | - | indexReplicasNumber
| Replicas number of new
indexes.
[...]
-| - | - | specificIndexSettings
| Specify the settings
for each index individually. If configured, this setting has the highest
priority and overrides the generic settings.
[...]
-| - | - | superDatasetDayStep
| Represents the number
of days in the super size dataset record index. Default value is the same as
dayStep when the value is less than 0.
[...]
+| - | - | specificIndexSettings
| Specify the settings
for each index individually. If configured, this setting has the highest
priority and overrides the generic settings.
[...]
+| - | - | superDatasetDayStep
| Represents the number
of days in the super size dataset record index. Default value is the same as
dayStep when the value is less than 0.
[...]
| - | - | superDatasetIndexShardsFactor
| Super dataset is
defined in the code (e.g. trace segments). This factor provides more shards for
the super dataset: shards number = indexShardsNumber *
superDatasetIndexShardsFactor. This factor also affects Zipkin and Jaeger
traces. [...]
| - | - | superDatasetIndexReplicasNumber
| Represents the replicas
number in the super size dataset record index.
[...]
| - | - | indexTemplateOrder
| The order of index
template.
[...]
diff --git a/oap-server/server-starter/src/main/resources/application.yml
b/oap-server/server-starter/src/main/resources/application.yml
index 3e8329abac..009247151d 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -154,7 +154,7 @@ storage:
# If configured, this setting has the highest priority and overrides the
generic settings.
specificIndexSettings: ${SW_STORAGE_ES_SPECIFIC_INDEX_SETTINGS:""}
# Super data set has been defined in the codes, such as trace segments.The
following 3 config would be improve es performance when storage super size data
in es.
- superDatasetDayStep: ${SW_SUPERDATASET_STORAGE_DAY_STEP:-1} # Represent
the number of days in the super size dataset record index, the default value is
the same as dayStep when the value is less than 0
+ superDatasetDayStep: ${SW_STORAGE_ES_SUPER_DATASET_DAY_STEP:-1} #
Represent the number of days in the super size dataset record index, the
default value is the same as dayStep when the value is less than 0
superDatasetIndexShardsFactor:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_SHARDS_FACTOR:5} # This factor provides
more shards for the super data set, shards number = indexShardsNumber *
superDatasetIndexShardsFactor. Also, this factor effects Zipkin traces.
superDatasetIndexReplicasNumber:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_REPLICAS_NUMBER:0} # Represent the replicas
number in the super size dataset record index, the default value is 0.
indexTemplateOrder: ${SW_STORAGE_ES_INDEX_TEMPLATE_ORDER:0} # the order of
index template
diff --git
a/oap-server/server-tools/data-generator/src/main/resources/application.yml
b/oap-server/server-tools/data-generator/src/main/resources/application.yml
index 8da39093cb..3dd61fd726 100755
--- a/oap-server/server-tools/data-generator/src/main/resources/application.yml
+++ b/oap-server/server-tools/data-generator/src/main/resources/application.yml
@@ -96,7 +96,7 @@ storage:
indexShardsNumber: ${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:1} # Shard number
of new indexes
indexReplicasNumber: ${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:1} # Replicas
number of new indexes
# Super data set has been defined in the codes, such as trace segments.The
following 3 config would be improve es performance when storage super size data
in es.
- superDatasetDayStep: ${SW_SUPERDATASET_STORAGE_DAY_STEP:-1} # Represent
the number of days in the super size dataset record index, the default value is
the same as dayStep when the value is less than 0
+ superDatasetDayStep: ${SW_STORAGE_ES_SUPER_DATASET_DAY_STEP:-1} #
Represent the number of days in the super size dataset record index, the
default value is the same as dayStep when the value is less than 0
superDatasetIndexShardsFactor:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_SHARDS_FACTOR:5} # This factor provides
more shards for the super data set, shards number = indexShardsNumber *
superDatasetIndexShardsFactor. Also, this factor effects Zipkin and Jaeger
traces.
superDatasetIndexReplicasNumber:
${SW_STORAGE_ES_SUPER_DATASET_INDEX_REPLICAS_NUMBER:0} # Represent the replicas
number in the super size dataset record index, the default value is 0.
indexTemplateOrder: ${SW_STORAGE_ES_INDEX_TEMPLATE_ORDER:0} # the order of
index template
