This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch grpc_alarm in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 7f8926144931812a19fdc1dd0a4b8ce305edea71 Merge: 788a416 fc4402f Author: JaredTan95 <jian....@daocloud.io> AuthorDate: Mon Feb 10 17:42:10 2020 +0800 Merge branch 'master' into grpc_alarm # Conflicts: # oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java docs/en/guides/How-to-build.md | 155 +++++++++++---------- .../oap/server/core/alarm/provider/AlarmRule.java | 2 + .../core/alarm/provider/AlarmRulesWatcher.java | 3 + .../oap/server/core/alarm/provider/Rules.java | 1 + .../server/core/alarm/provider/RunningRule.java | 66 +++++++++ .../src/test/resources/log4j2-test.xml | 36 +++++ .../profile/analyze/ProfileAnalyzeCollector.java | 6 +- .../core/profile/analyze/ProfileAnalyzer.java | 6 +- .../core/profile/analyze/ProfileStackNode.java | 29 ++-- .../core/query/entity/ProfileAnalyzation.java | 7 +- .../core/query/entity/ProfileStackElement.java | 12 +- ...ofileAnalyzation.java => ProfileStackTree.java} | 9 +- .../core/profile/bean/ProfileStackAnalyze.java | 6 +- .../profile/bean/ProfileStackElementMatcher.java | 57 +++++--- .../oap/query/graphql/resolver/ProfileQuery.java | 2 +- skywalking-ui | 2 +- 16 files changed, 271 insertions(+), 128 deletions(-) diff --cc oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java index 513eff3,e944377..aefef29 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java @@@ -18,12 -18,8 +18,13 @@@ package org.apache.skywalking.oap.server.core.alarm.provider; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.Getter; + import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.alarm.AlarmModule; diff --cc skywalking-ui index 9ad81a0,2cb2305..b911f4f --- a/skywalking-ui +++ b/skywalking-ui @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 9ad81a05a2f2969420c1f75769c2b4def42819e4 -Subproject commit 2cb2305af5b2a787fbf877fd0f0092a960b956c2 ++Subproject commit b911f4f4adffa704257b118013b8d9e1d0a57fef