This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a change to branch remove-h2
in repository https://gitbox.apache.org/repos/asf/skywalking.git
from 7213c24b65 trying to fix E2E
add d3d3ee8abd Alarm: Support store and query the metrics snapshot when
the alarm is triggered (#12910)
add e6196c2988 Merge branch 'master' into remove-h2
No new revisions were added by this update.
Summary of changes:
docs/en/changes/changes.md | 2 +
.../apache/skywalking/mqe/rt/MQEVisitorBase.java | 8 ++--
.../mqe/rt/operation/AggregateLabelsOp.java | 6 +--
.../skywalking/mqe/rt/operation/AggregationOp.java | 8 ++--
.../skywalking/mqe/rt/operation/BinaryOp.java | 2 +-
.../skywalking/mqe/rt/operation/CompareOp.java | 2 +-
.../apache/skywalking/mqe/rt/operation/LROp.java | 8 ++--
.../mqe/rt/operation/LogicalFunctionOp.java | 8 ++--
.../mqe/rt/operation/MathematicalFunctionOp.java | 2 +-
.../mqe/rt/operation/SortLabelValuesOp.java | 4 +-
.../skywalking/mqe/rt/operation/SortValuesOp.java | 4 +-
.../skywalking/mqe/rt/operation/TrendOp.java | 4 +-
.../skywalking/mqe/rt/AggregateLabelsOpTest.java | 4 +-
.../skywalking/mqe/rt/AggregationOpTest.java | 4 +-
.../org/apache/skywalking/mqe/rt/BinaryOpTest.java | 4 +-
.../apache/skywalking/mqe/rt/CompareOPTest.java | 4 +-
.../skywalking/mqe/rt/LogicalFunctionOpTest.java | 2 +-
.../mqe/rt/MathematicalFunctionOpTest.java | 4 +-
.../org/apache/skywalking/mqe/rt/MockData.java | 10 ++--
.../skywalking/mqe/rt/SortLabelValuesOpTest.java | 2 +-
.../apache/skywalking/mqe/rt/SortValuesOpTest.java | 2 +-
.../org/apache/skywalking/mqe/rt/TrendOpTest.java | 4 +-
.../oap/server/core/alarm/provider/AlarmRule.java | 4 +-
.../core/alarm/provider/AlarmRulesWatcher.java | 2 +-
.../server/core/alarm/provider/RunningRule.java | 11 +++--
.../provider/expr/rt/AlarmMQEVerifyVisitor.java | 8 ++--
.../alarm/provider/expr/rt/AlarmMQEVisitor.java | 29 ++++++++----
.../oap/server/core/alarm/AlarmMessage.java | 4 +-
.../oap/server/core/alarm/AlarmRecord.java | 10 ++--
.../AlarmSnapshotRecord.java} | 10 ++--
.../core/alarm/AlarmStandardPersistence.java | 5 +-
.../server/core/query/mqe}/ExpressionResult.java | 2 +-
.../core/query/mqe}/ExpressionResultType.java | 2 +-
.../oap/server/core/query/mqe/MQEMetric.java} | 10 ++--
.../oap/server/core/query/mqe}/MQEValue.java | 2 +-
.../oap/server/core/query/mqe}/MQEValues.java | 2 +-
.../oap/server/core/query/mqe}/Metadata.java | 2 +-
.../oap/server/core/query/type/AlarmMessage.java | 2 +
...filerTaskListResult.java => AlarmSnapshot.java} | 13 +++--
.../oap/server/core/query/type/AlarmTrend.java | 33 -------------
.../server/core/storage/query/IAlarmQueryDAO.java | 55 ++++++++++++++++++++--
.../oap/query/graphql/mqe/rt/MQEVisitor.java | 8 ++--
.../oap/query/graphql/resolver/AlarmQuery.java | 21 +++++++--
.../graphql/resolver/MetricsExpressionQuery.java | 4 +-
.../src/main/resources/query-protocol | 2 +-
.../oap/query/debug/DebuggingHTTPHandler.java | 2 +-
.../oap/query/debug/mqe/DebuggingMQERsp.java | 4 +-
.../banyandb/stream/BanyanDBAlarmQueryDAO.java | 16 ++-----
.../elasticsearch/query/AlarmQueryEsDAO.java | 14 ++----
.../plugin/jdbc/common/dao/JDBCAlarmQueryDAO.java | 21 ++++-----
50 files changed, 213 insertions(+), 183 deletions(-)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{query/type/AsyncProfilerAnalyzation.java
=> alarm/AlarmSnapshotRecord.java} (81%)
rename oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type =>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe}/ExpressionResult.java
(95%)
rename oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type =>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe}/ExpressionResultType.java
(95%)
copy
oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type/MQEValues.java
=>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe/MQEMetric.java}
(81%)
rename oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type =>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe}/MQEValue.java
(95%)
rename oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type =>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe}/MQEValues.java
(94%)
rename oap-server/{mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/type =>
server-core/src/main/java/org/apache/skywalking/oap/server/core/query/mqe}/Metadata.java
(95%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/{AsyncProfilerTaskListResult.java
=> AlarmSnapshot.java} (81%)
delete mode 100644
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/AlarmTrend.java
