Skip to content

Commit 8a799e0

Browse files
authored
Merge pull request #4 from gapitio/housekeeping
feat: remove expired and info delete from housekeeping
2 parents 975f6a4 + 1f6f386 commit 8a799e0

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

alertaclient/api.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -488,15 +488,9 @@ def delete_group(self, id):
488488
def mgmt_status(self):
489489
return self.http.get('/management/status')
490490

491-
def housekeeping(self, expired_delete_hours=None, info_delete_hours=None):
492-
# This endpoint isn't currently JSON-encoded.
491+
def housekeeping(self):
493492
url = self.http.endpoint + '/management/housekeeping'
494-
params = dict()
495-
if expired_delete_hours is not None:
496-
params['expired'] = expired_delete_hours
497-
if info_delete_hours is not None:
498-
params['info'] = info_delete_hours
499-
response = self.http.session.get(url, auth=self.http.auth, timeout=self.http.timeout, params=params)
493+
response = self.http.session.get(url, auth=self.http.auth, timeout=self.http.timeout)
500494
if response.status_code != 200:
501495
raise UnknownError(response.text)
502496

alertaclient/commands/cmd_housekeeping.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33

44
@click.command('housekeeping', short_help='Expired and clears old alerts.')
5-
@click.option('--expired', metavar='EXPIRED_DELETE_HOURS', required=False,
6-
help='Delete expired/closed alertas after this many hours.')
7-
@click.option('--info', metavar='INFO_DELETE_HOURS', required=False,
8-
help='Delete informational alerta after this many hours.')
95
@click.pass_obj
106
def cli(obj, expired=None, info=None):
117
"""Trigger the expiration and deletion of alerts."""
128
client = obj['client']
13-
client.housekeeping(expired_delete_hours=expired, info_delete_hours=info)
9+
client.housekeeping()

0 commit comments

Comments
 (0)