Skip to content

Commit

Permalink
Merge 3ae74c4 into 9235152
Browse files Browse the repository at this point in the history
  • Loading branch information
satterly committed Apr 16, 2020
2 parents 9235152 + 3ae74c4 commit 9806eb4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions alerta/models/alert.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def deduplicate(self, duplicate_of) -> 'Alert':
severity=self.severity,
status=status,
value=self.value,
text='duplicate alert (with value change)',
text=self.text,
change_type=ChangeType.value,
update_time=self.create_time,
user=g.login
Expand Down Expand Up @@ -387,7 +387,7 @@ def create(self) -> 'Alert':
severity=self.severity,
status=self.status,
value=self.value,
text='new alert',
text=self.text,
change_type=ChangeType.new,
update_time=self.create_time,
user=g.login
Expand Down Expand Up @@ -549,7 +549,7 @@ def housekeeping(expired_threshold: int = 2, info_threshold: int = 12) -> None:
id=last_receive_id,
event=event,
status='expired',
text='marked for deletion',
text='',
change_type=ChangeType.expired,
update_time=now,
user=g.login
Expand All @@ -562,7 +562,7 @@ def housekeeping(expired_threshold: int = 2, info_threshold: int = 12) -> None:
id=last_receive_id,
event=event,
status='open',
text='re-open after timeout',
text='',
change_type=ChangeType.timeout,
update_time=now,
user=g.login
Expand Down

0 comments on commit 9806eb4

Please sign in to comment.