Skip to content

Commit f409ed7

Browse files
authored
Remove the always-on alarm-to-event conversion (EventHookCallback) (#13925)
A triggered alarm is no longer synthesized into the events pipeline as an Alarm/AlarmRecovery event; events now originate only from real event sources (agents, SkyWalking CLI, Kubernetes Event Exporter). Alarms remain available through the alarm store (getAlarm/queryAlarms) and the configured alarm hooks. - Delete EventHookCallback and its unconditional registration in NotifyHandler. - Delete EventHookCallbackTest. - Drop the now-dead event-analyzer dependency from server-alarm-plugin. - Remove the 'Alarm' Known-Event row from event.md; update the e2e guide recipe. - Update the alarm/baseline e2e expected files to assert 'events: []' — the alarm now correlates no synthetic event (swctl 'alarm ls' still projects the events field, so the expectation must assert the empty list). - Add a CHANGES entry.
1 parent 799bb76 commit f409ed7

12 files changed

Lines changed: 8 additions & 476 deletions

File tree

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#### Project
44

5+
* Remove the always-on alarm-to-event conversion (`EventHookCallback`). A triggered alarm is no longer synthesized into the events pipeline as an `Alarm`/`AlarmRecovery` event; events now originate only from real event sources (agents, SkyWalking CLI, Kubernetes Event Exporter). Alarms remain available through the alarm store (`getAlarm`/`queryAlarms`) and the configured alarm hooks. This drops a documented "Known Event" and removes 1-2 synthetic event records per alarm fire.
56
* **New `queryAlarms` GraphQL query — entity / layer / rule filters for alarms.** Adds
67
a comprehensive alarm query API alongside the legacy `getAlarm`. The new
78
`queryAlarms(condition: AlarmQueryCondition!): Alarms` accepts a single input type

docs/en/concepts-and-designs/event.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ service / instance / endpoint.
6666
| :----: | :----: | :-----| :---- |
6767
| Start | Normal | When your Java Application starts with SkyWalking Agent installed, the `Start` Event will be created. | Reported from SkyWalking agent. |
6868
| Shutdown | Normal | When your Java Application stops with SkyWalking Agent installed, the `Shutdown` Event will be created. | Reported from SkyWalking agent. |
69-
| Alarm | Error | When the Alarm is triggered, the corresponding `Alarm` Event will is created. | Reported from internal SkyWalking OAP. |
7069

7170
The following events are all reported
7271
by [Kubernetes Event Exporter](http://github.com/apache/skywalking-kubernetes-event-exporter), in order to see these

oap-server/server-alarm-plugin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
<artifactId>library-util</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
41-
<dependency>
42-
<groupId>org.apache.skywalking</groupId>
43-
<artifactId>event-analyzer</artifactId>
44-
<version>${project.version}</version>
45-
</dependency>
4641
<dependency>
4742
<groupId>org.apache.skywalking</groupId>
4843
<artifactId>mqe-rt</artifactId>

oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java

Lines changed: 0 additions & 194 deletions
This file was deleted.

oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ public void init(AlarmCallback... callbacks) {
241241
allCallbacks.add(new WechatHookCallback(alarmRulesWatcher));
242242
allCallbacks.add(new DingtalkHookCallback(alarmRulesWatcher));
243243
allCallbacks.add(new FeishuHookCallback(alarmRulesWatcher));
244-
allCallbacks.add(new EventHookCallback(this.manager));
245244
allCallbacks.add(new WeLinkHookCallback(alarmRulesWatcher));
246245
allCallbacks.add(new PagerDutyHookCallback(alarmRulesWatcher));
247246
allCallbacks.add(new DiscordHookCallback(alarmRulesWatcher));

0 commit comments

Comments
 (0)