diff --git a/CHANGELOG.md b/CHANGELOG.md index 8beadadb..1354cdd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add Slack slash command allowing to trigger a direct page via a manually created alert group +- Remove resolved and acknowledged filters as we switched to status ([#1201](https://github.com/grafana/oncall/pull/1201)) - Add sync with grafana on /users and /teams api calls from terraform plugin ### Changed diff --git a/engine/apps/api/views/alert_group.py b/engine/apps/api/views/alert_group.py index 1dc8f281..d2457a4f 100644 --- a/engine/apps/api/views/alert_group.py +++ b/engine/apps/api/views/alert_group.py @@ -91,8 +91,6 @@ class AlertGroupFilter(DateRangeFilterMixin, ModelFieldFilterMixin, filters.Filt model = AlertGroup fields = [ "id__in", - "resolved", - "acknowledged", "started_at_gte", "started_at_lte", "resolved_at_lte", diff --git a/grafana-plugin/src/models/alertgroup/alertgroup.ts b/grafana-plugin/src/models/alertgroup/alertgroup.ts index bf332635..8705e3a4 100644 --- a/grafana-plugin/src/models/alertgroup/alertgroup.ts +++ b/grafana-plugin/src/models/alertgroup/alertgroup.ts @@ -314,8 +314,6 @@ export class AlertGroupStore extends BaseStore { const result = await makeRequest(`${this.path}stats/`, { params: { ...this.incidentFilters, - resolved: false, - acknowledged: false, status: [IncidentStatus.New], }, }); @@ -327,8 +325,6 @@ export class AlertGroupStore extends BaseStore { const result = await makeRequest(`${this.path}stats/`, { params: { ...this.incidentFilters, - resolved: false, - acknowledged: true, status: [IncidentStatus.Acknowledged], }, }); @@ -341,7 +337,6 @@ export class AlertGroupStore extends BaseStore { const result = await makeRequest(`${this.path}stats/`, { params: { ...this.incidentFilters, - resolved: true, status: [IncidentStatus.Resolved], }, }); @@ -354,7 +349,6 @@ export class AlertGroupStore extends BaseStore { const result = await makeRequest(`${this.path}stats/`, { params: { ...this.incidentFilters, - silenced: true, status: [IncidentStatus.Silenced], }, });