Skip to content

Commit de8d597

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 de8d597

1 file changed

Lines changed: 0 additions & 112 deletions

File tree

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

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -57,116 +57,4 @@ messages:
5757
value: CRITICAL
5858
- key: receivers
5959
value: zhangsan
60-
- scopeId: 1
61-
scope: SERVICE
62-
name: e2e-service-provider
63-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
64-
id1: ""
65-
ruleName: service_resp_time_rule
66-
alarmMessage: Response time of service e2e-service-provider is increase/decrease in 1 minutes of last 10 minutes.
67-
startTime: {{ gt .startTime 0 }}
68-
recoveryTime: {{ le .recoveryTime 0 }}
69-
tags:
70-
- key: level
71-
value: WARNING
72-
- key: receivers
73-
value: lisi
74-
- scopeId: 1
75-
scope: SERVICE
76-
name: e2e-service-provider
77-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
78-
id1: ""
79-
ruleName: service_percentile_rule
80-
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.
81-
startTime: {{ gt .startTime 0 }}
82-
recoveryTime: {{ le .recoveryTime 0 }}
83-
tags:
84-
- key: level
85-
value: WARNING
86-
- key: receivers
87-
value: lisi
88-
- scopeId: 1
89-
scope: SERVICE
90-
name: e2e-service-provider
91-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
92-
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%.
151-
startTime: {{ gt .startTime 0 }}
152-
recoveryTime: {{ le .recoveryTime 0 }}
153-
tags:
154-
- key: level
155-
value: CRITICAL
156-
- key: receivers
157-
value: zhangsan
158-
- scopeId: 1
159-
scope: SERVICE
160-
name: e2e-service-provider
161-
id0: ZTJlLXNlcnZpY2UtcHJvdmlkZXI=.1
162-
id1: ""
163-
ruleName: comp_rule
164-
alarmMessage: Service e2e-service-provider response time is more than 100ms and sla is more than 1%.
165-
startTime: {{ gt .startTime 0 }}
166-
recoveryTime: {{ le .recoveryTime 0 }}
167-
tags:
168-
- key: level
169-
value: CRITICAL
170-
- key: receivers
171-
value: zhangsan
17260
{{- end }}

0 commit comments

Comments
 (0)