Skip to content

Commit 88e9f0e

Browse files
committed
Fix alarm silence-after-webhook expected for distinct contains matching
Reduce duplicate expected entries from 11 (2x resp_time + 2x percentile + 7x comp_rule) to 3 (1 of each rule). The previous expected relied on the old buggy contains behavior where one actual item could satisfy multiple expected entries.
1 parent f6c8f6c commit 88e9f0e

1 file changed

Lines changed: 4 additions & 88 deletions

File tree

test/e2e-v2/cases/alarm/expected/silence-after-webhook.yml

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,6 @@ messages:
2929
value: WARNING
3030
- key: receivers
3131
value: lisi
32-
- scopeId: 1
33-
scope: SERVICE
34-
name: e2e-service-provider
35-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
36-
id1: ""
37-
ruleName: service_percentile_rule
38-
alarmMessage: Percentile response time of service e2e-service-provider alarm in 3 minutes of last 10 minutes, due to more than one condition of p50 > 100, p75 > 100, p90 > 100, p95 > 100, p99 > 100.
39-
startTime: {{ gt .startTime 0 }}
40-
recoveryTime: {{ le .recoveryTime 0 }}
41-
tags:
42-
- key: level
43-
value: WARNING
44-
- key: receivers
45-
value: lisi
46-
- scopeId: 1
47-
scope: SERVICE
48-
name: e2e-service-provider
49-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
50-
id1: ""
51-
ruleName: comp_rule
52-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
53-
startTime: {{ gt .startTime 0 }}
54-
recoveryTime: {{ le .recoveryTime 0 }}
55-
tags:
56-
- key: level
57-
value: CRITICAL
58-
- key: receivers
59-
value: zhangsan
6032
- scopeId: 1
6133
scope: SERVICE
6234
name: e2e-service-provider
@@ -90,71 +62,15 @@ messages:
9062
name: e2e-service-provider
9163
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
9264
id1: ""
93-
ruleName: comp_rule
94-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
95-
startTime: {{ gt .startTime 0 }}
96-
recoveryTime: {{ le .recoveryTime 0 }}
97-
tags:
98-
- key: level
99-
value: CRITICAL
100-
- key: receivers
101-
value: zhangsan
102-
- scopeId: 1
103-
scope: SERVICE
104-
name: e2e-service-provider
105-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
106-
id1: ""
107-
ruleName: comp_rule
108-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
109-
startTime: {{ gt .startTime 0 }}
110-
recoveryTime: {{ le .recoveryTime 0 }}
111-
tags:
112-
- key: level
113-
value: CRITICAL
114-
- key: receivers
115-
value: zhangsan
116-
- scopeId: 1
117-
scope: SERVICE
118-
name: e2e-service-provider
119-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
120-
id1: ""
121-
ruleName: comp_rule
122-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
123-
startTime: {{ gt .startTime 0 }}
124-
recoveryTime: {{ le .recoveryTime 0 }}
125-
tags:
126-
- key: level
127-
value: CRITICAL
128-
- key: receivers
129-
value: zhangsan
130-
- scopeId: 1
131-
scope: SERVICE
132-
name: e2e-service-provider
133-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
134-
id1: ""
135-
ruleName: comp_rule
136-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
137-
startTime: {{ gt .startTime 0 }}
138-
recoveryTime: {{ le .recoveryTime 0 }}
139-
tags:
140-
- key: level
141-
value: CRITICAL
142-
- key: receivers
143-
value: zhangsan
144-
- scopeId: 1
145-
scope: SERVICE
146-
name: e2e-service-provider
147-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
148-
id1: ""
149-
ruleName: comp_rule
150-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
65+
ruleName: service_percentile_rule
66+
alarmMessage: Percentile response time of service e2e-service-provider alarm in 3 minutes of last 10 minutes, due to more than one condition of p50 > 100, p75 > 100, p90 > 100, p95 > 100, p99 > 100.
15167
startTime: {{ gt .startTime 0 }}
15268
recoveryTime: {{ le .recoveryTime 0 }}
15369
tags:
15470
- key: level
155-
value: CRITICAL
71+
value: WARNING
15672
- key: receivers
157-
value: zhangsan
73+
value: lisi
15874
- scopeId: 1
15975
scope: SERVICE
16076
name: e2e-service-provider

0 commit comments

Comments
 (0)