conditionally enable searching for alert groups via env var (#4287)
# What this PR does re-enables the search for alert groups ## Which issue(s) this PR closes Closes #2232 <!-- *Note*: if you have more than one GitHub issue that this PR closes, be sure to preface each issue link with a [closing keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue). This ensures that the issue(s) are auto-closed once the PR has been merged. --> ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] Added the relevant release notes label (see labels prefixed w/ `release:`). These labels dictate how your PR will show up in the autogenerated release notes. --------- Co-authored-by: Joey Orlando <joey.orlando@grafana.com> Co-authored-by: Joey Orlando <joseph.t.orlando@gmail.com>
This commit is contained in:
parent
2f1ffcf2ff
commit
0acb66bd1a
3 changed files with 8 additions and 1 deletions
|
|
@ -1,5 +1,6 @@
|
|||
import typing
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.db.models import Count, Max, Q
|
||||
from django_filters import rest_framework as filters
|
||||
|
|
@ -275,6 +276,11 @@ class AlertGroupView(
|
|||
pagination_class = AlertGroupCursorPaginator
|
||||
|
||||
filter_backends = [SearchFilter, filters.DjangoFilterBackend]
|
||||
search_fields = (
|
||||
["=public_primary_key", "=inside_organization_number", "web_title_cache"]
|
||||
if settings.FEATURE_ALERT_GROUP_SEARCH_ENABLED
|
||||
else []
|
||||
)
|
||||
filterset_class = AlertGroupFilter
|
||||
|
||||
def get_serializer_class(self):
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ GRAFANA_CLOUD_NOTIFICATIONS_ENABLED = getenv_boolean("GRAFANA_CLOUD_NOTIFICATION
|
|||
FEATURE_LABELS_ENABLED_FOR_ALL = getenv_boolean("FEATURE_LABELS_ENABLED_FOR_ALL", default=False)
|
||||
# Enable labels feature for organizations from the list. Use OnCall organization ID, for this flag
|
||||
FEATURE_LABELS_ENABLED_PER_ORG = getenv_list("FEATURE_LABELS_ENABLED_PER_ORG", default=list())
|
||||
FEATURE_ALERT_GROUP_SEARCH_ENABLED = getenv_boolean("FEATURE_ALERT_GROUP_SEARCH_ENABLED", default=False)
|
||||
|
||||
TWILIO_API_KEY_SID = os.environ.get("TWILIO_API_KEY_SID")
|
||||
TWILIO_API_KEY_SECRET = os.environ.get("TWILIO_API_KEY_SECRET")
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ export class AlertGroupStore {
|
|||
params: {
|
||||
query: {
|
||||
...incidentFilters,
|
||||
search,
|
||||
search: incidentFilters?.search || search,
|
||||
perpage: this.alertsSearchResult?.page_size,
|
||||
cursor: this.incidentsCursor,
|
||||
is_root: true,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue