diff --git a/docs/sources/alert-behavior/outgoing-webhooks/index.md b/docs/sources/alert-behavior/outgoing-webhooks/index.md index 7931f6ea..74237bbf 100644 --- a/docs/sources/alert-behavior/outgoing-webhooks/index.md +++ b/docs/sources/alert-behavior/outgoing-webhooks/index.md @@ -38,14 +38,26 @@ the first alert in the alert group: `alert_payload` is always the first level of any variable you want to call. -The following is an example of an entry in the **Data** field that might return an alert name and description. +The following is an example of an entry in the **Data** field that would return an alert name and description. - ```json { "name": "{{ alert_payload.labels.alertname }}", "message": "{{ alert_payload.annotations.description }}" } - ``` + +The following is an example would return an alert name and the alert's labels. + + { + "alertname" : "{{ alert_payload.labels.alertname }}", + "labels" : "{{ alert_payload.labels }}" + } + +By default, this will return labels in a list format. If you'd like your labels to be sent in formatted JSON, please use `| tojson()` in your data. For example: + + { + "alertname" : "{{ alert_payload.labels.alertname }}", + "labels" : "{{ alert_payload.labels | tojson() }}" + } > **NOTE:** If you receive an error message and cannot create an outgoing webhook, verify that your JSON is > formatted correctly. diff --git a/docs/sources/calendar-schedules/web-schedule/create-schedule/index.md b/docs/sources/calendar-schedules/web-schedule/create-schedule/index.md index 02220c77..d2856451 100644 --- a/docs/sources/calendar-schedules/web-schedule/create-schedule/index.md +++ b/docs/sources/calendar-schedules/web-schedule/create-schedule/index.md @@ -22,6 +22,8 @@ your schedule, add users, reorder users, and reference teammates' time zones. To learn more, see [On-call schedules]({{< relref "../../../calendar-schedules" >}}) which provides the fundamental concepts for this task. +>**Note:** User working hours are currently hardcoded and cannot be changed. Profile settings to configure this and other options will be added in a future release. + ## Before you begin - Users with Admin or Editor roles can create, edit and delete schedules. diff --git a/engine/apps/slack/slack_client/slack_client.py b/engine/apps/slack/slack_client/slack_client.py index 8d0c4736..4c72f7a4 100644 --- a/engine/apps/slack/slack_client/slack_client.py +++ b/engine/apps/slack/slack_client/slack_client.py @@ -77,7 +77,12 @@ class SlackClientWithErrorHandling(SlackClient): if response["error"] == "is_archived": raise SlackAPIChannelArchivedException(exception_text, response=response) - if response["error"] == "rate_limited" or response["error"] == "ratelimited": + if ( + response["error"] == "rate_limited" + or response["error"] == "ratelimited" + or response["error"] == "message_limit_exceeded" + # "message_limit_exceeded" is related to the limit on post messages for free Slack workspace + ): if "headers" in response and response["headers"].get("Retry-After") is not None: delay = int(response["headers"]["Retry-After"]) else: diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml index 5431284c..5d65a126 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.1.37 -appVersion: v1.1.37 +version: 1.2.8 +appVersion: v1.2.8 dependencies: - name: cert-manager version: v1.8.0