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

[Improve]When multiple lines are returned, each alarm is triggered instead of only the first alarm #1797

Merged
merged 3 commits into from
Apr 21, 2024
Merged

[Improve]When multiple lines are returned, each alarm is triggered instead of only the first alarm #1797

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46b4d30
[Improve]When multiple lines are returned, each alarm is triggered in…
15613060203 Apr 20, 2024
ca08f87
Merge branch 'master' into multiline_alarm
15613060203 Apr 21, 2024
6885d69
Merge branch 'master' into multiline_alarm
tomsun28 Apr 21, 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
12 changes: 5 additions & 7 deletions alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private void calculate(CollectRep.MetricsData metricsData) {
} catch (Exception e) {
log.error(e.getMessage(), e);
}
} catch (Exception ignored) {}
} catch (Exception ignored) {}
}
for (CollectRep.ValueRow valueRow : metricsData.getValuesList()) {

Expand Down Expand Up @@ -220,15 +220,13 @@ private void calculate(CollectRep.MetricsData metricsData) {
if (match) {
// If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
afterThresholdRuleMatch(currentTimeMilli, monitorId, app, metrics, tagBuilder.toString(), fieldValueMap, define);
// if the threshold is triggered, ignore other data rows
break;
} else {
String alarmKey = String.valueOf(monitorId) + define.getId() + tagBuilder;
triggeredAlertMap.remove(alarmKey);
if (define.isRecoverNotice()) {
handleRecoveredAlert(currentTimeMilli, define, expr, alarmKey);
}
}
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
Expand Down Expand Up @@ -258,7 +256,7 @@ private void handleRecoveredAlert(long currentTimeMilli, AlertDefine define, Str
}
}

private void afterThresholdRuleMatch(long currentTimeMilli, long monitorId, String app, String metrics, String tagStr,
private void afterThresholdRuleMatch(long currentTimeMilli, long monitorId, String app, String metrics, String tagStr,
Map<String, Object> fieldValueMap, AlertDefine define) {
String alarmKey = String.valueOf(monitorId) + define.getId() + tagStr;
Alert triggeredAlert = triggeredAlertMap.get(alarmKey);
Expand Down Expand Up @@ -377,7 +375,7 @@ private void handlerAvailableMetrics(long monitorId, String app, CollectRep.Metr
notRecoveredAlertMap.put(notResolvedAlertKey, alertBuilder.build());
alarmCommonReduce.reduceAndSendAlarm(alertBuilder.build());
} else {
triggeredAlertMap.put(String.valueOf(monitorId), alertBuilder.build());
triggeredAlertMap.put(String.valueOf(monitorId), alertBuilder.build());
}
} else {
int times = preAlert.getTriggerTimes() + 1;
Expand Down Expand Up @@ -418,7 +416,7 @@ private void handlerAvailableMetrics(long monitorId, String app, CollectRep.Metr
.build();
alarmCommonReduce.reduceAndSendAlarm(resumeAlert);
Runnable updateStatusJob = () -> {
// todo update pre all type alarm status
// todo update pre all type alarm status
updateAvailabilityAlertStatus(monitorId, resumeAlert);
};
workerPool.executeJob(updateStatusJob);
Expand Down
Loading