From 5992fc3cdcce2621d215c1d8041dc0bc85f4699a Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Tue, 9 May 2023 11:17:27 -0600 Subject: [PATCH] Merge hotfix to dev (#1911) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions Co-authored-by: Joey Orlando Co-authored-by: Vadim Stepanov Co-authored-by: Ildar Iskhakov Co-authored-by: Matvey Kukuy Co-authored-by: Innokentii Konstantinov --- CHANGELOG.md | 6 ++++++ .../incident_appearance/templaters/alert_templater.py | 9 ++++++--- helm/oncall/Chart.yaml | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9a991f6..4f845ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix issue with how OnCall determines if a cloud Grafana Instance supports RBAC by @joeyorlando ([#1880](https://github.com/grafana/oncall/pull/1880)) - Fix issue trying to set maintenance mode for integrations belonging to non-current team +## v1.2.20 (2023-05-09) + +### Fixed + +- Hotfix perform notification task + ## v1.2.19 (2023-05-04) ### Fixed diff --git a/engine/apps/alerts/incident_appearance/templaters/alert_templater.py b/engine/apps/alerts/incident_appearance/templaters/alert_templater.py index 8740a9ab..b5074ef6 100644 --- a/engine/apps/alerts/incident_appearance/templaters/alert_templater.py +++ b/engine/apps/alerts/incident_appearance/templaters/alert_templater.py @@ -189,9 +189,12 @@ class AlertTemplater(ABC): if attr == "title" else settings.JINJA_RESULT_MAX_LENGTH ) - added_context[f"web_{attr}"] = apply_jinja_template( - added_attr_template, data, result_length_limit=result_length_limit, **context - ) + try: + added_context[f"web_{attr}"] = apply_jinja_template( + added_attr_template, data, result_length_limit=result_length_limit, **context + ) + except (JinjaTemplateError, JinjaTemplateWarning) as e: + added_context[f"web_{attr}"] = e.fallback_message else: added_context[f"web_{attr}"] = f"web_{attr} is not set" context = {**context, **added_context} diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml index 809aa47c..9257bfd4 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.10 -appVersion: v1.2.10 +version: 1.2.17 +appVersion: v1.2.17 dependencies: - name: cert-manager version: v1.8.0