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

Module config set override is not working (#3283) 

* set Override is not working.

* Submodule update

* Add header.
This commit is contained in:
吴晟 Wu Sheng 2019-08-17 10:10:30 +08:00 committed by GitHub
parent db9759fcc2
commit 8888029e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
View File

@ -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;
}
}

2
skywalking-ui

@ -1 +1 @@
Subproject commit 3e78e9cc16f1749ef3a4deb9598394357d8b161d
Subproject commit 17040efd79a973b6a3c84a70b1a401cd92ff9ba4