Skip to content

Commit c6a8021

Browse files
committed
Merge remote-tracking branch 'origin/bugfix/10.7.1/alerts-stopping-tag-rules-exception' into bugfix/10.7.1/alerts-stopping-tag-rules-exception
# Conflicts: # frontend/src/app/data-management/alert-management/alert-rules/alert-rules.component.html # frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts
2 parents d7cc7df + 3afb2b8 commit c6a8021

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

frontend/src/app/data-management/alert-management/alert-rules/alert-rules.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import {AlertRuleCreateComponent} from '../shared/components/alert-rule-create/a
1414
import {AlertRulesService} from '../shared/services/alert-rules.service';
1515
import {AlertTagService} from '../shared/services/alert-tag.service';
1616
import {AlertRuleType} from './alert-rule.type';
17+
import {AlertRuleCreateComponent} from '../shared/components/alert-rule-create/alert-rule-create.component';
18+
import {FALSE_POSITIVE_OBJECT} from '../../../shared/constants/alert/alert-field.constant';
1719

1820
@Component({
1921
selector: 'app-rules',

0 commit comments

Comments
 (0)