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

Jump to bottom

fix : Fix continuous trigger threshold not effective #329

Merged
merged 2 commits into from
Jul 27, 2023
Merged

fix : Fix continuous trigger threshold not effective #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d7bb3
fix : Fix continuous trigger threshold not effective
wzh425 Jul 26, 2023
1bbb0b6
fix : Optimize indicator alarm rule card display
wzh425 Jul 26, 2023
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
7 changes: 2 additions & 5 deletions ...pplication/Masa.Alert.Application/AlarmHistories/EventHandler/TriggerAlarmEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ public class TriggerAlarmEventHandler
{
private readonly IAlarmHistoryRepository _repository;
private readonly IAlarmRuleRepository _alarmRulerepository;
private readonly IEventBus _eventBus;

public TriggerAlarmEventHandler(IAlarmHistoryRepository repository
, IAlarmRuleRepository alarmRulerepository
, IEventBus eventBus)
, IAlarmRuleRepository alarmRulerepository)
{
_repository = repository;
_alarmRulerepository = alarmRulerepository;
_eventBus = eventBus;
}

[EventHandler]
Expand All @@ -31,7 +28,7 @@ public async Task HandleEventAsync(TriggerAlarmEvent eto)
if (alarm == null || alarm.RecoveryTime.HasValue)
{
alarm = new AlarmHistory(eto.AlarmRuleId, eto.AlertSeverity, isNotification, eto.TriggerRuleItems);
alarm.AddAlarmRuleRecord(eto.ExcuteTime, eto.AggregateResult, true, 1, eto.TriggerRuleItems);
alarm.AddAlarmRuleRecord(eto.ExcuteTime, eto.AggregateResult, true, eto.ConsecutiveCount, eto.TriggerRuleItems);
alarm.SetIsNotification(isNotification, isSilence);
await _repository.AddAsync(alarm);
}
Expand Down
5 changes: 2 additions & 3 deletions src/Domain/Masa.Alert.Domain/AlarmRules/Aggregates/AlarmRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,9 @@ public void RecoveryAlarm(DateTimeOffset excuteTime, ConcurrentDictionary<string
AddDomainEvent(new RecoveryAlarmEvent(Id, excuteTime, aggregateResult, ruleResult));
}

public bool IsTrigger(List<RuleResultItem> ruleResult, int consecutiveCount)
public bool IsRuleValid(List<RuleResultItem> ruleResult)
{
var isValid = ruleResult.Any(x => x.IsValid);
return isValid && consecutiveCount > ContinuousTriggerThreshold;
return ruleResult.Any(x => x.IsValid);
}

public void SkipCheck(DateTimeOffset excuteTime)
Expand Down
12 changes: 9 additions & 3 deletions src/Domain/Masa.Alert.Domain/AlarmRules/Services/AlarmRuleDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public async Task CheckRuleAsync(DateTimeOffset excuteTime, AlarmRule alarmRule,
var cacheKey = $"{AlarmCacheKeys.ALARM_CONSECUTIVE_COUNT}_{alarmRule.Id}";
var consecutiveCount = Convert.ToInt32(await _cacheClient.HashIncrementAsync(cacheKey));

var isTrigger = alarmRule.IsTrigger(ruleResult, consecutiveCount);
var isRuleValid = alarmRule.IsRuleValid(ruleResult);
var isTrigger = isRuleValid && consecutiveCount >= alarmRule.ContinuousTriggerThreshold;

if (isTrigger)
{
Expand All @@ -61,8 +62,13 @@ public async Task CheckRuleAsync(DateTimeOffset excuteTime, AlarmRule alarmRule,
}
else
{
alarmRule.AddAggregateResult(excuteTime, aggregateResult, false, 0, ruleResult);
await _cacheClient.RemoveAsync<long>(cacheKey);
if (!isRuleValid)
{
consecutiveCount = 0;
await _cacheClient.RemoveAsync<long>(cacheKey);
}

alarmRule.AddAggregateResult(excuteTime, aggregateResult, false, consecutiveCount, ruleResult);
}

await _repository.UpdateAsync(alarmRule);
Expand Down
4 changes: 2 additions & 2 deletions src/Web/Masa.Alert.Web.Admin/Pages/AlarmRules/Modules/AlarmRuleCard.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
{
foreach (var item in _metricMonitorItems)
{
<MChip Class="rounded-3 body2 default-tag mr-3 mt-3" Color="emphasis2" Outlined Style="max-width: 98px;">
@item.Aggregation.Name
<MChip Class="rounded-3 body2 default-tag mr-3 mt-3" Color="emphasis2" Outlined>
<EllipsisText>@item.Aggregation.Name</EllipsisText>
</MChip>
}
}
Expand Down