Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[alarm] refactor new alarm #2902

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

[alarm] refactor new alarm #2902

wants to merge 51 commits into from

Conversation

tomsun28
Copy link
Contributor

@tomsun28 tomsun28 commented Dec 25, 2024

What's changed?

Design: #2873

Task:

  • Unify the public label fields, complete the backend changes, and only the frontend changes are left.
    tags -> labels(Map<String,String>)

  • backend label update

  • frontend ui labels update, todo. Plan to implement a labels UI common component - support input labels, search switch labels.

  • Refer to promethes alertmanager to design and implement new alarm

  • alarm group, complete backend, need test, need frontend update AlertGroupConvergeComponent

  • alarm inhibit todo AlarmInhibitReduce AlertInhibitComponent

  • alarm slience, complete backend, need test, need frontend update AlarmSilenceReduce AlertSilenceComponent

  • alarm notify, need test AlertNoticeDispatch

  • alarm center ui todo AlertsController AlertCenterComponent

  • Support promql thrshold expr calculate

  • todo PeriodicAlertCalculator PeriodicAlertRuleScheduler

  • todo relate frontend ui AlertSettingComponent

image

Checklist

  • I have read the Contributing Guide
  • I have written the necessary doc or comment.
  • I have added the necessary unit tests and all cases have passed.

Add or update API

  • I have added the necessary e2e tests and all cases have passed.

# Conflicts:
#	hertzbeat-alerter/pom.xml
#	hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java
#	hertzbeat-manager/pom.xml
#	hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

license-eye has checked 2905 files.

Valid Invalid Ignored Fixed
1495 12 1398 0
Click to see the invalid file list
  • hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/PeriodicAlertCalculator.java
  • hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/PeriodicAlertRuleScheduler.java
  • hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmGroupReduce.java
  • hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/DataSourceService.java
  • hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/DataSourceServiceImpl.java
  • hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/reduce/AlarmInhibitReduceTest.java
  • hertzbeat-base/pom.xml
  • hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java
  • hertzbeat-manager/src/main/resources/templates/1-EmailTemplate.html
  • web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html
  • web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.spec.ts
  • web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts
Use this command to fix any missing license headers
```bash

docker run -it --rm -v $(pwd):/github/workspace apache/skywalking-eyes header fix

</details>

tomsun28 and others added 21 commits December 26, 2024 00:29
…culate/PeriodicAlertCalculator.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…uce/AlarmGroupReduce.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…ity/alerter/AlertInhibit.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…uce/AlarmInhibitReduceTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…culate/PeriodicAlertRuleScheduler.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…vice/DataSourceService.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…vice/DataSourceService.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…vice/impl/DataSourceServiceImpl.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…vice/impl/DataSourceServiceImpl.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…uce/AlarmInhibitReduceTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…ity/alerter/AlertInhibit.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…culate/PeriodicAlertCalculator.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…culate/PeriodicAlertRuleScheduler.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
…uce/AlarmGroupReduce.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
Signed-off-by: tomsun28 <[email protected]>
@github-actions github-actions bot added the e2e label Dec 26, 2024
@TJxiaobao
Copy link
Contributor

I want to try writing AlarmInhibitReduce and AlertInhibitComponent, please assign it to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants