From 971ef576aea5ed721677faf2cb4a217df13a564e Mon Sep 17 00:00:00 2001 From: Matvey Kukuy Date: Wed, 7 Jun 2023 07:14:21 +0300 Subject: [PATCH] Main to dev (#2108) Co-authored-by: Innokentii Konstantinov Co-authored-by: GitHub Actions Co-authored-by: Michael Derynck Co-authored-by: eldin <33036213+nikoalch@users.noreply.github.com> Co-authored-by: Matias Bordese Co-authored-by: chrisharbro <102977229+chrisharbro@users.noreply.github.com> Co-authored-by: Joey Orlando Co-authored-by: Ildar Iskhakov --- docs/sources/get-started/_index.md | 2 +- docs/sources/integrations/_index.md | 2 +- engine/apps/api/views/alert_group.py | 2 +- helm/oncall/Chart.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sources/get-started/_index.md b/docs/sources/get-started/_index.md index f36267e5..ac4ac21b 100644 --- a/docs/sources/get-started/_index.md +++ b/docs/sources/get-started/_index.md @@ -20,7 +20,7 @@ OnCall helps ensure that alert notifications reach the right people, at the righ The following diagram details an example alert workflow with Grafana OnCall: - + These procedures introduce you to initial Grafana OnCall configuration steps, including monitoring system integration, how to set up escalation chains, and how to set up calendar for on-call scheduling. diff --git a/docs/sources/integrations/_index.md b/docs/sources/integrations/_index.md index 822df7e6..842b9df6 100644 --- a/docs/sources/integrations/_index.md +++ b/docs/sources/integrations/_index.md @@ -21,7 +21,7 @@ within integrations. You could check pre-configured templates in the list of avaliable integrations (Integrations -> "New integration to receive alerts"), create your own or adjust existing. -Read more about Jinja2 templating used in OnCall [here]({{< relref "jinja2-templating" >}}). +Read more about Jinja2 templating used in OnCall [here]({{< relref "../jinja2-templating" >}}). Alert flow within integration: diff --git a/engine/apps/api/views/alert_group.py b/engine/apps/api/views/alert_group.py index 78fe1447..4442e8dd 100644 --- a/engine/apps/api/views/alert_group.py +++ b/engine/apps/api/views/alert_group.py @@ -308,7 +308,7 @@ class AlertGroupView( pagination_class = TwentyFiveCursorPaginator filter_backends = [SearchFilter, AlertGroupFilterBackend] - search_fields = ["public_primary_key", "inside_organization_number", "web_title_cache"] + # search_fields = ["=public_primary_key", "=inside_organization_number", "web_title_cache"] filterset_class = AlertGroupFilter diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml index e9ba6dcf..44c975eb 100644 --- a/helm/oncall/Chart.yaml +++ b/helm/oncall/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: oncall description: Developer-friendly incident response with brilliant Slack integration type: application -version: 1.2.28 -appVersion: v1.2.28 +version: 1.2.36 +appVersion: v1.2.36 dependencies: - name: cert-manager version: v1.8.0