[skywalking] branch master updated: Fix config file and document typo for ttl (#5087) (#5088)

[kezhenxu94]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 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 a6c3aad  Fix config file and  document typo for  ttl (#5087) (#5088)
a6c3aad is described below

commit a6c3aad8fa748e596ea62f424818620cc874004e
Author: xin <1903636...@qq.com>
AuthorDate: Sun Jul 12 17:36:35 2020 +0800

    Fix config file and  document typo for  ttl (#5087) (#5088)
---
 docs/en/setup/backend/ttl.md                                   | 2 +-
 oap-server/server-bootstrap/src/main/resources/application.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/setup/backend/ttl.md b/docs/en/setup/backend/ttl.md
index cdf1f1d..d5a184b 100644
--- a/docs/en/setup/backend/ttl.md
+++ b/docs/en/setup/backend/ttl.md
@@ -7,7 +7,7 @@ You have following settings for different types.
 ```yaml
     # Set a timeout on metrics data. After the timeout has expired, the 
metrics data will automatically be deleted.
     recordDataTTL: ${SW_CORE_RECORD_DATA_TTL:3} # Unit is day
-    metricsDataTTL: ${SW_CORE_RECORD_DATA_TTL:7} # Unit is day
+    metricsDataTTL: ${SW_CORE_METRICS_DATA_TTL:7} # Unit is day
 ```
 
 - `recordDataTTL` affects **Record** data, including tracing and alarm.
diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml 
b/oap-server/server-bootstrap/src/main/resources/application.yml
index 0e89003..ac91339 100755
--- a/oap-server/server-bootstrap/src/main/resources/application.yml
+++ b/oap-server/server-bootstrap/src/main/resources/application.yml
@@ -66,7 +66,7 @@ core:
     enableDataKeeperExecutor: ${SW_CORE_ENABLE_DATA_KEEPER_EXECUTOR:true} # 
Turn it off then automatically metrics data delete will be close.
     dataKeeperExecutePeriod: ${SW_CORE_DATA_KEEPER_EXECUTE_PERIOD:5} # How 
often the data keeper executor runs periodically, unit is minute
     recordDataTTL: ${SW_CORE_RECORD_DATA_TTL:3} # Unit is day
-    metricsDataTTL: ${SW_CORE_RECORD_DATA_TTL:7} # Unit is day
+    metricsDataTTL: ${SW_CORE_METRICS_DATA_TTL:7} # Unit is day
     # Cache metric data for 1 minute to reduce database queries, and if the 
OAP cluster changes within that minute,
     # the metrics may not be accurate within that minute.
     enableDatabaseSession: ${SW_CORE_ENABLE_DATABASE_SESSION:true}