Direct paging improvements #2537

vstpme · 2023-07-14T14:52:17Z

What this PR does

Deprecates /oncall Slack command in favour of /esalate (direct paging) + fixes a regression bug in both commands
Unifies direct paging UX across Slack & Web UI (or at least makes an attempt to make things more similar). Kudos to @iskhakov for all the great work on this recently!
A bunch of minor changes that hopefully make direct paging more usable
TODO: documentation updates will be added in a separate PR

Screenshots

No issues scenario

Slack:

Web UI:

Not configured scenario

Slack:

Web UI:

`/oncall` deprecation warning

Which issue(s) this PR fixes

#2442

Checklist

Unit, integration, and e2e (if applicable) tests updated
Documentation added (or pr:no public docs PR label added if not required)
CHANGELOG.md updated (or pr:no changelog PR label added if not required)

engine/apps/alerts/paging.py

iskhakov · 2023-07-17T09:26:07Z

grafana-plugin/src/components/ManualAlertGroup/ManualAlertGroup.tsx

              <ul className={cx('responders-list')}>
                <li>
                  <HorizontalGroup justify="space-between">
                    <HorizontalGroup>
-                      {escalationChainsExist && (


why is this removed?

This is related to #2537 (comment), the PR udpates which integrations are considered "bad" or non-configured, and now this tooltip doesn't convey any additional information, so I removed it.

vstpme · 2023-07-14T22:11:06Z

engine/apps/alerts/paging.py

@@ -42,7 +42,7 @@ def _trigger_alert(
        deleted_at=None,
        defaults={
            "author": from_user,
-            "verbal_name": "Direct paging",
+            "verbal_name": f"Direct paging ({team.name if team else 'No'} team)",


I want to return team name to integration name, this way it's easier to filter by integration on the alert groups page.
It also makes things more consistent with other platforms where it's not possible to provide a team widget alongside integration name (e.g. Slack).

not sure it is a good practice to hardcode it lake that. We should use the value from teams table in the places you mentioned

vstpme · 2023-07-14T22:17:39Z

engine/apps/alerts/paging.py

@@ -90,7 +90,7 @@ def _trigger_alert(
    return alert.group


-def check_user_availability(user: User, team: Team) -> list[dict[str, Any]]:
+def check_user_availability(user: User) -> list[dict[str, Any]]:


I made so that user availability doesn't depend on the selected team. My reasoning is the following:

Imagine this scenario: I want to page some team + some other person

This other person is probably from some other team, because why would I want to page two people from the same team? My assumption here is that most of the times when I want to notify additional responders, I want these responders to be from a different team (e.g. for alert groups relevant for multiple teams).

So I'd think it makes sense to check availability across all teams, not only the selected one.

vstpme · 2023-07-14T22:19:06Z

engine/apps/api/serializers/paging.py

@@ -49,7 +49,7 @@ class DirectPagingSerializer(serializers.Serializer):
    alert_group = serializers.HiddenField(default=None)  # set in DirectPagingSerializer.validate

    title = serializers.CharField(required=False, default=None)
-    message = serializers.CharField(required=False, default=None)
+    message = serializers.CharField(required=False, default=None, allow_null=True)


The frontend treats an empty message as null, updating the backend to support this.

vstpme · 2023-07-14T22:20:12Z

engine/apps/slack/scenarios/manual_incident.py

@@ -20,6 +20,7 @@
 class StartCreateIncidentFromSlashCommand(scenario_step.ScenarioStep):
    """
    StartCreateIncidentFromSlashCommand triggers creation of a manual incident from the slack message via slash command
+    THIS FEATURE IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE


Deprecating /oncall Slack command, so the only way to create alerts is /escalate

vstpme · 2023-07-14T22:21:53Z

engine/apps/slack/views.py

@@ -300,7 +300,8 @@ def post(self, request):
                # Open pop-up to inform user why OnCall bot doesn't work if any action was triggered
                self._open_warning_window_if_needed(payload, slack_team_identity, warning_text)
                return Response(status=200)
-        elif organization is None and payload_type_is_block_actions:
+        # direct paging / manual incident dialogs don't require organization to be set
+        elif organization is None and payload_type_is_block_actions and not payload.get("view"):


Allowing modal views to bypass organization check, since there's an organization select input in the direct paging view itself.

vstpme · 2023-07-14T22:22:57Z

grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx

@@ -52,10 +52,11 @@ const GrafanaTeamSelect = observer(({ onSelect, onHide, withoutModal, defaultVal

  const select = (
    <GSelect
+      showSearch


Allowing searching by name in team select, this was disabled for some reason

vstpme · 2023-07-14T22:28:11Z

grafana-plugin/src/components/ManualAlertGroup/ManualAlertGroup.tsx

@@ -200,22 +203,11 @@ const ManualAlertGroup: FC<ManualAlertGroupProps> = (props) => {
    );
  };

-  const submitButtonDisabled = !(


Changed this to disabled={!selectedTeamId} so it's easier for a team to create a direct paging integration (so the team can create an alert group without choosing additional responders to get their direct paging integration created automatically)

vstpme · 2023-07-14T22:35:16Z

grafana-plugin/src/components/ManualAlertGroup/ManualAlertGroup.tsx

@@ -169,29 +160,41 @@ const ManualAlertGroup: FC<ManualAlertGroupProps> = (props) => {
                  </HorizontalGroup>
                </li>
              </ul>
-
-              {(escalationChainsExist || !chatOpsAvailableChannels) && (


Removed check for chatOpsAvailableChannels, so an integration is considered "bad" only when it doesn't have linked escalation chains. Imagine an integration that has an escalation chain but doesn't have a Slack channel, I think no warnings should be displayed for such integration, but lmk if there's a strong reason for checking ChatOps too.

@iskhakov

# What this PR does - Deprecates `/oncall` Slack command in favour of `/esalate` (direct paging) + fixes a regression bug in both commands - Unifies direct paging UX across Slack & Web UI (or at least makes an attempt to make things more similar). Kudos to @iskhakov for all the great work on this recently! - A bunch of minor changes that hopefully make direct paging more usable - TODO: documentation updates will be added in a separate PR ## Screenshots ### No issues scenario Slack: <img width="522" alt="Screenshot 2023-07-14 at 23 53 11" src="https://github.com/grafana/oncall/assets/20116910/ec15a18f-d817-4177-b1f2-6b89d79bb361"> Web UI: <img width="1172" alt="Screenshot 2023-07-14 at 23 52 25" src="https://github.com/grafana/oncall/assets/20116910/813f967c-2fdd-4868-9287-487dbfa7cea6"> ### Not configured scenario Slack: <img width="519" alt="Screenshot 2023-07-14 at 23 45 22" src="https://github.com/grafana/oncall/assets/20116910/932fa05c-81ea-42ca-be80-41b05f767d3e"> Web UI: <img width="1172" alt="Screenshot 2023-07-14 at 23 47 31" src="https://github.com/grafana/oncall/assets/20116910/6bcb07e4-2e50-4120-9fac-be8b0277e181"> ### `/oncall` deprecation warning <img width="521" alt="Screenshot 2023-07-17 at 10 31 56" src="https://github.com/grafana/oncall/assets/20116910/4ff28337-1693-4af0-81d9-9eda90099c1b"> ## Which issue(s) this PR fixes #2442 ## 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] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)

vstpme added 27 commits July 12, 2023 15:00

fix direct paging dialog not changing values

af013db

Merge branch 'dev' into vadimkerr/deprecate-oncall-slash-commands

25253b7

deprecate /oncall

135b1b4

update Slack direct paging

8e90539

remove escalation chain stuff

2c8a065

hide org select if only one org is available

563cf32

Merge branch 'dev' into vadimkerr/deprecate-oncall-slash-commands

7ab6dd6

no team preselected

9ab0e6a

unify wording

a33cdf5

web UI wording

b5a2b36

web UI wording + allow null message

01650dd

web UI wording

295fbbb

web UI wording

2c482eb

web UI wording

201b761

web UI wording

0af6ce7

more unification

303a511

show search

baa0db5

return link to alert group

10b769b

add some margin between channels

708f466

fix chatOpsAvailableChannels

9a75f17

optional

517373c

tests

dbb2378

tests

c52c340

bring back team name to integration

1014502

tests

be132c2

Merge branch 'dev' into vadimkerr/deprecate-oncall-slash-commands

daa0722

changelog

bd06987

vstpme added the pr:no public docs Added to a PR that does not require public documentation updates label Jul 17, 2023

vstpme marked this pull request as ready for review July 17, 2023 09:17

vstpme requested a review from a team July 17, 2023 09:17

vstpme requested review from a team and iskhakov July 17, 2023 09:17

iskhakov reviewed Jul 17, 2023

View reviewed changes

engine/apps/alerts/paging.py Show resolved Hide resolved

iskhakov reviewed Jul 17, 2023

View reviewed changes

vstpme commented Jul 17, 2023

View reviewed changes

iskhakov approved these changes Jul 17, 2023

View reviewed changes

vstpme requested a review from a team July 17, 2023 10:05

Ukochka approved these changes Jul 17, 2023

View reviewed changes

vstpme added 2 commits July 17, 2023 14:21

Merge branch 'dev' into vadimkerr/deprecate-oncall-slash-commands

9e3aafa

changelog

c575605

vstpme merged commit 69bafb6 into dev Jul 17, 2023

vstpme deleted the vadimkerr/deprecate-oncall-slash-commands branch July 17, 2023 13:21

This was referenced Jul 17, 2023

/escalate Slack command does not work #2439

Closed

Slack /escalate command doesn't show the correct Escalation Chains for a Team #2126

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Direct paging improvements #2537

Direct paging improvements #2537

vstpme commented Jul 14, 2023 •

edited

Loading

iskhakov Jul 17, 2023

vstpme Jul 17, 2023 •

edited

Loading

vstpme Jul 14, 2023

iskhakov Jul 17, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

vstpme Jul 14, 2023

Direct paging improvements #2537

Direct paging improvements #2537

Conversation

vstpme commented Jul 14, 2023 • edited Loading

What this PR does

Screenshots

No issues scenario

Not configured scenario

/oncall deprecation warning

Which issue(s) this PR fixes

Checklist

Choose a reason for hiding this comment

vstpme Jul 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vstpme commented Jul 14, 2023 •

edited

Loading

`/oncall` deprecation warning

vstpme Jul 17, 2023 •

edited

Loading