未验证 提交 9c974b80 编写于 作者: K kezhenxu94 提交者: GitHub

Fix unclear doc and add missing variable (#4484)

* Revert "[BugFix] Docker InfluxDB cannot be enabled (#4483)"

This reverts commit 73d0802c.

* Fix unclear doc and add missing variable
上级 73d0802c
...@@ -302,7 +302,7 @@ generateApplicationYaml() { ...@@ -302,7 +302,7 @@ generateApplicationYaml() {
validateVariables "SW_CLUSTER" "$SW_CLUSTER" "standalone zookeeper kubernetes consul etcd nacos" validateVariables "SW_CLUSTER" "$SW_CLUSTER" "standalone zookeeper kubernetes consul etcd nacos"
validateVariables "SW_STORAGE" "$SW_STORAGE" "elasticsearch h2 mysql" validateVariables "SW_STORAGE" "$SW_STORAGE" "elasticsearch h2 mysql influxdb"
validateVariables "SW_CONFIGURATION" "$SW_CONFIGURATION" "none apollo nacos zookeeper" validateVariables "SW_CONFIGURATION" "$SW_CONFIGURATION" "none apollo nacos zookeeper"
......
...@@ -303,7 +303,7 @@ generateApplicationYaml() { ...@@ -303,7 +303,7 @@ generateApplicationYaml() {
validateVariables "SW_CLUSTER" "$SW_CLUSTER" "standalone zookeeper kubernetes consul etcd nacos" validateVariables "SW_CLUSTER" "$SW_CLUSTER" "standalone zookeeper kubernetes consul etcd nacos"
validateVariables "SW_STORAGE" "$SW_STORAGE" "elasticsearch h2 mysql" validateVariables "SW_STORAGE" "$SW_STORAGE" "elasticsearch h2 mysql influxdb"
validateVariables "SW_CONFIGURATION" "$SW_CONFIGURATION" "none apollo nacos zookeeper" validateVariables "SW_CONFIGURATION" "$SW_CONFIGURATION" "none apollo nacos zookeeper"
......
...@@ -38,8 +38,6 @@ storage: ...@@ -38,8 +38,6 @@ storage:
For now, ElasticSearch 6 and ElasticSearch 7 share the same configurations, as follows: For now, ElasticSearch 6 and ElasticSearch 7 share the same configurations, as follows:
Setting fragment example
```yaml ```yaml
storage: storage:
elasticsearch: elasticsearch:
...@@ -70,6 +68,9 @@ storage: ...@@ -70,6 +68,9 @@ storage:
advanced: ${SW_STORAGE_ES_ADVANCED:""} advanced: ${SW_STORAGE_ES_ADVANCED:""}
``` ```
In order to use ElasticSearch 7, comment/remove the section `storage/elasticsearch` and find the corresponding config section(`storage/elasticsearch7`),
uncomment to enable it.
### Downsampling Data Packing ### Downsampling Data Packing
Downsampling data packing(`storage/elasticsearch/enablePackedDownsampling`, default activated) is a new feature since 7.0.0. Downsampling data packing(`storage/elasticsearch/enablePackedDownsampling`, default activated) is a new feature since 7.0.0.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册