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.

Sign up for GitHub

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

[bug]fix the monitor status is abnormal #2070

Merged
merged 4 commits into from
Jun 24, 2024
Merged

[bug]fix the monitor status is abnormal #2070

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91ac0d4
[bug]：fix alert bug
Yanshuming1 Jun 7, 2024
6cd7d17
[bug]：fix the monitor status is abnormal
Yanshuming1 Jun 7, 2024
bf12e9d
[bug]：fix the monitor status is abnormal
Yanshuming1 Jun 8, 2024
6c2f130
Merge branch 'master' into fixAlertBug
tomsun28 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,33 @@ public AlarmConvergeReduce(AlertConvergeDao alertConvergeDao) {
@SuppressWarnings("unchecked")
public boolean filterConverge(Alert currentAlert) {
// ignore monitor status auto recover notice
if (currentAlert.getTags() != null && currentAlert.getTags().containsKey(CommonConstants.IGNORE)) {
return true;
}
if (currentAlert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
if ((currentAlert.getTags() != null && currentAlert.getTags().containsKey(CommonConstants.IGNORE))
|| currentAlert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
Comment on lines +58 to +59
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if ((currentAlert.getTags() != null && currentAlert.getTags().containsKey(CommonConstants.IGNORE))
|| currentAlert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
if (currentAlert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {

status always is the ALERT_STATUS_CODE_RESTORED when tags has CommonConstants.IGNORE

Copy link
Member Author

Choose a reason for hiding this comment

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

In both cases, the data in the map needs to be deleted，if remove （|| currentAlert . getStatus () == CommonConstants . ALERT_STATUS_CODE_RESTORED ），So when the label is not IGNORE，Unable to clear cache

// restored alert
boolean isHasIgnore = false;
Map<String, String> tags = currentAlert.getTags();
if (tags.containsKey(CommonConstants.IGNORE)) {
isHasIgnore = true;
tags.remove(CommonConstants.IGNORE);
}
int alertHash = Objects.hash(CommonConstants.ALERT_PRIORITY_CODE_CRITICAL)
+ Arrays.hashCode(currentAlert.getTags().keySet().toArray(new String[0]))
+ Arrays.hashCode(currentAlert.getTags().values().toArray(new String[0]));
+ Arrays.hashCode(tags.keySet().toArray(new String[0]))
+ Arrays.hashCode(tags.values().toArray(new String[0]));
converageAlertMap.remove(alertHash);
alertHash = Objects.hash(CommonConstants.ALERT_PRIORITY_CODE_EMERGENCY)
+ Arrays.hashCode(currentAlert.getTags().keySet().toArray(new String[0]))
+ Arrays.hashCode(currentAlert.getTags().values().toArray(new String[0]));
+ Arrays.hashCode(tags.keySet().toArray(new String[0]))
+ Arrays.hashCode(tags.values().toArray(new String[0]));
converageAlertMap.remove(alertHash);
alertHash = Objects.hash(CommonConstants.ALERT_PRIORITY_CODE_WARNING)
+ Arrays.hashCode(currentAlert.getTags().keySet().toArray(new String[0]))
+ Arrays.hashCode(currentAlert.getTags().values().toArray(new String[0]));
+ Arrays.hashCode(tags.keySet().toArray(new String[0]))
+ Arrays.hashCode(tags.values().toArray(new String[0]));
converageAlertMap.remove(alertHash);
if (isHasIgnore) {
tags.put(CommonConstants.IGNORE, CommonConstants.IGNORE);
}
return true;
}

CommonCacheService<String, Object> convergeCache = CacheFactory.getAlertConvergeCache();
List<AlertConverge> alertConvergeList = (List<AlertConverge>) convergeCache.get(CommonConstants.CACHE_ALERT_CONVERGE);
if (alertConvergeList == null) {
Expand Down
Loading