From 9c974b80b44bacc1a8199ecc578b93bfaed5d079 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Wed, 11 Mar 2020 07:46:59 +0800 Subject: [PATCH] Fix unclear doc and add missing variable (#4484) * Revert "[BugFix] Docker InfluxDB cannot be enabled (#4483)" This reverts commit 73d0802cd69e7bdf5fd925060afc00207edb711d. * Fix unclear doc and add missing variable --- docker/oap-es7/docker-entrypoint.sh | 2 +- docker/oap/docker-entrypoint.sh | 2 +- docs/en/setup/backend/backend-storage.md | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/oap-es7/docker-entrypoint.sh b/docker/oap-es7/docker-entrypoint.sh index c8188e200..07e02c191 100755 --- a/docker/oap-es7/docker-entrypoint.sh +++ b/docker/oap-es7/docker-entrypoint.sh @@ -302,7 +302,7 @@ generateApplicationYaml() { 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" diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh index 41b5c6825..306933444 100755 --- a/docker/oap/docker-entrypoint.sh +++ b/docker/oap/docker-entrypoint.sh @@ -303,7 +303,7 @@ generateApplicationYaml() { 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" diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md index 72169ba9a..a9702c948 100644 --- a/docs/en/setup/backend/backend-storage.md +++ b/docs/en/setup/backend/backend-storage.md @@ -38,8 +38,6 @@ storage: For now, ElasticSearch 6 and ElasticSearch 7 share the same configurations, as follows: -Setting fragment example - ```yaml storage: elasticsearch: @@ -70,6 +68,9 @@ storage: 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(`storage/elasticsearch/enablePackedDownsampling`, default activated) is a new feature since 7.0.0.