Skip to content

Commit d3d3ee8

Browse files
wankai123wankai123
authored
Alarm: Support store and query the metrics snapshot when the alarm is triggered (#12910)
1 parent f8f5fa5 commit d3d3ee8

File tree

50 files changed

+287
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+287
-165
lines changed

‎docs/en/changes/changes.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
* Add protection for dynamic config change propagate chain.
4545
* Add Ruby component IDs.
4646
* Add component ID(160) for Caffeine.
47+
* Alarm: Support store and query the metrics snapshot when the alarm is triggered.
48+
* Alarm: Remove unused `Alarm Trend` query.
4749

4850
#### UI
4951

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/MQEVisitorBase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import org.apache.skywalking.mqe.rt.operation.SortLabelValuesOp;
3636
import org.apache.skywalking.mqe.rt.operation.SortValuesOp;
3737
import org.apache.skywalking.mqe.rt.operation.TrendOp;
38-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
38+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
3939
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
40-
import org.apache.skywalking.mqe.rt.type.ExpressionResultType;
41-
import org.apache.skywalking.mqe.rt.type.MQEValue;
42-
import org.apache.skywalking.mqe.rt.type.MQEValues;
40+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResultType;
41+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValue;
42+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
4343
import org.apache.skywalking.oap.server.core.Const;
4444
import org.apache.skywalking.oap.server.core.query.enumeration.Step;
4545
import org.apache.skywalking.oap.server.core.query.type.KeyValue;

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/AggregateLabelsOp.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import java.util.List;
2323
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2424
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
25-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
26-
import org.apache.skywalking.mqe.rt.type.MQEValue;
27-
import org.apache.skywalking.mqe.rt.type.MQEValues;
25+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
26+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValue;
27+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
2828
import org.apache.skywalking.mqe.rt.operation.aggregatelabels.AggregateLabelsFunc;
2929
import org.apache.skywalking.mqe.rt.operation.aggregatelabels.AggregateLabelsFuncFactory;
3030
import org.apache.skywalking.mqe.rt.operation.aggregatelabels.AvgAggregateLabelsFunc;

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/AggregationOp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import java.util.function.Function;
2828
import java.util.stream.DoubleStream;
2929
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
30-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
30+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
3131
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
32-
import org.apache.skywalking.mqe.rt.type.ExpressionResultType;
33-
import org.apache.skywalking.mqe.rt.type.MQEValue;
34-
import org.apache.skywalking.mqe.rt.type.MQEValues;
32+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResultType;
33+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValue;
34+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
3535

3636
public class AggregationOp {
3737
public static ExpressionResult doAggregationOp(ExpressionResult result,

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/BinaryOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2222
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
23-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
23+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
2424

2525
public class BinaryOp {
2626
public static ExpressionResult doBinaryOp(ExpressionResult left,

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/CompareOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2222
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
23-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
23+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
2424

2525
public class CompareOp {
2626
public static ExpressionResult doCompareOP(ExpressionResult left,

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/LROp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import java.util.Map;
2525
import java.util.Set;
2626
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
27-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
28-
import org.apache.skywalking.mqe.rt.type.ExpressionResultType;
29-
import org.apache.skywalking.mqe.rt.type.MQEValue;
30-
import org.apache.skywalking.mqe.rt.type.MQEValues;
27+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
28+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResultType;
29+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValue;
30+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
3131
import org.apache.skywalking.oap.server.core.query.type.KeyValue;
3232

3333
@FunctionalInterface

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/LogicalFunctionOp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2222
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
2323
import org.apache.skywalking.mqe.rt.grammar.MQEParserBaseVisitor;
24-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
25-
import org.apache.skywalking.mqe.rt.type.ExpressionResultType;
26-
import org.apache.skywalking.mqe.rt.type.MQEValue;
27-
import org.apache.skywalking.mqe.rt.type.MQEValues;
24+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
25+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResultType;
26+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValue;
27+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
2828
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
2929

3030
import java.util.Objects;

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/MathematicalFunctionOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.function.Function;
2424
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2525
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
26-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
26+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
2727

2828
public class MathematicalFunctionOp {
2929
public static ExpressionResult doFunction0Op(ExpressionResult expResult,

‎oap-server/mqe-rt/src/main/java/org/apache/skywalking/mqe/rt/operation/SortLabelValuesOp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import lombok.extern.slf4j.Slf4j;
2626
import org.apache.skywalking.mqe.rt.exception.IllegalExpressionException;
2727
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
28-
import org.apache.skywalking.mqe.rt.type.ExpressionResult;
29-
import org.apache.skywalking.mqe.rt.type.MQEValues;
28+
import org.apache.skywalking.oap.server.core.query.mqe.ExpressionResult;
29+
import org.apache.skywalking.oap.server.core.query.mqe.MQEValues;
3030
import org.apache.skywalking.oap.server.core.query.type.KeyValue;
3131
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
3232

0 commit comments

Comments
 (0)