kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unclear doc and add missing variable (#4484) 

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

This reverts commit 73d0802cd6.

* Fix unclear doc and add missing variable
This commit is contained in:
kezhenxu94 2020-03-11 07:46:59 +08:00 committed by GitHub
parent 73d0802cd6
commit 9c974b80b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/oap-es7/docker-entrypoint.sh
View File

@ -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"

2
docker/oap/docker-entrypoint.sh
View File

@ -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"

5
docs/en/setup/backend/backend-storage.md
View File

@ -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.