Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

alerting: contact points - links #87955

Merged
merged 4 commits into from
May 16, 2024
Merged

alerting: contact points - links #87955

merged 4 commits into from
May 16, 2024

Conversation

tonypowa
Copy link
Contributor

@tonypowa tonypowa commented May 16, 2024

What is this feature?

In Grafana fundamentals tutorial:

  • updates instructions according to the minimal steps needed to trigger and alert in the new simplified routing feature. That means that steps regarding configuring or modifying a notification policy have been removed. There is no need to configure that part anymore. It is enough to select a contact in the alert rule configuration. There is also no need to change the default timing options to receive an alert (it should arrive within 1-2 min to the contact point)
  • updates linking format and add link to new contact point docs

In manage contact points page:

  • fixes a couple links

@tonypowa tonypowa added type/docs no-changelog Skip including change in changelog/release notes backport v11.0.x Mark PR for automatic backport to v11.0.x labels May 16, 2024
@tonypowa tonypowa requested a review from brendamuir as a code owner May 16, 2024 08:57
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 16, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@tonypowa tonypowa requested a review from Eve832 as a code owner May 16, 2024 09:43
@tonypowa tonypowa requested a review from mdcruz May 16, 2024 09:53
Copy link
Contributor

@tomglenn tomglenn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Reviewed and updated links working as intended. 👍

@tonypowa tonypowa merged commit 086def3 into main May 16, 2024
11 checks passed
@tonypowa tonypowa deleted the tonypowa/url branch May 16, 2024 10:19
Copy link
Contributor

The backport to v11.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-87955-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 086def3f57a107e102e57f310c5ec5c6e9046b37

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-87955-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87955 --json body --template 'Backport 086def3f57a107e102e57f310c5ec5c6e9046b37 from #87955{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] alerting: contact points - links" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v11.0.x --milestone 11.0.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-87955-to-v11.0.x

# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-87955-to-v11.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87955-to-v11.0.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label May 16, 2024
tonypowa added a commit that referenced this pull request May 16, 2024
* alerting: contact points - links

* fundamentals: alerting instructions update

* updated steps

* prettier

(cherry picked from commit 086def3)
tonypowa added a commit that referenced this pull request May 16, 2024
* alerting: contact points - links (#87955)

* alerting: contact points - links

* fundamentals: alerting instructions update

* updated steps

* prettier

(cherry picked from commit 086def3)

* pretty
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v11.0.x Mark PR for automatic backport to v11.0.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. no-changelog Skip including change in changelog/release notes type/docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants