diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
index 5ba66929c230b6d85c3f8ccb214d46770e994016..e8a0fc66b59674fc1f3fbe21646fe4aef329aa7b 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
@@ -47,11 +47,24 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig {
     private int otherMetricsDataTTL = 0;
     @Setter private int monthMetricsDataTTL = 18;
 
-    public void setOtherMetricsDataTTL(int otherMetricsDataTTL) {
+    public int getMinuteMetricsDataTTL() {
         if (otherMetricsDataTTL > 0) {
-            minuteMetricsDataTTL = otherMetricsDataTTL;
-            hourMetricsDataTTL = otherMetricsDataTTL;
-            dayMetricsDataTTL = otherMetricsDataTTL;
+            return otherMetricsDataTTL;
         }
+        return minuteMetricsDataTTL;
+    }
+
+    public int getHourMetricsDataTTL() {
+        if (otherMetricsDataTTL > 0) {
+            return otherMetricsDataTTL;
+        }
+        return hourMetricsDataTTL;
+    }
+
+    public int getDayMetricsDataTTL() {
+        if (otherMetricsDataTTL > 0) {
+            return otherMetricsDataTTL;
+        }
+        return dayMetricsDataTTL;
     }
 }
diff --git a/skywalking-ui b/skywalking-ui
index 3e78e9cc16f1749ef3a4deb9598394357d8b161d..17040efd79a973b6a3c84a70b1a401cd92ff9ba4 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 3e78e9cc16f1749ef3a4deb9598394357d8b161d
+Subproject commit 17040efd79a973b6a3c84a70b1a401cd92ff9ba4