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: integrations > small update #87538

Merged
merged 2 commits into from
May 9, 2024
Merged

alerting: integrations > small update #87538

merged 2 commits into from
May 9, 2024

Conversation

tonypowa
Copy link
Contributor

@tonypowa tonypowa commented May 9, 2024

What is this feature?

  • added links to the list of integrations
  • updated the heading of the email contact point

@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 9, 2024
@tonypowa tonypowa requested a review from brendamuir as a code owner May 9, 2024 08:52
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 9, 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 merged commit 3a2c9f4 into main May 9, 2024
20 of 21 checks passed
@tonypowa tonypowa deleted the tonypowa/integrations branch May 9, 2024 09:31
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-87538-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 3a2c9f4898cee953f8b689ef3488583955a15a6c

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-87538-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87538 --json body --template 'Backport 3a2c9f4898cee953f8b689ef3488583955a15a6c from #87538{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] alerting: integrations > small update" --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-87538-to-v11.0.x

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

# Remove the local backport branch
git switch main
git branch -D backport-87538-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 9, 2024
obetomuniz added a commit that referenced this pull request May 9, 2024
…-tracker

* gops-configuration-tracker: (51 commits)
  Reorganize hooks into separate folders/files for each app
  add aria and properties role for Progressbar
  Address pr review comments part1
  Update dependency @opentelemetry/semantic-conventions to v1.24.1 (#87544)
  update test
  Update dependency @grafana/scenes to v4.17.2
  fix logic behind default contact point check
  new yarn version
  Update Yarn to v4.2.2
  remove unnecessary AlertmanagerProvider
  alerting: integrations > small update (#87538)
  RBAC: Adding action set resolver for RBAC evaluation (#86801)
  Frontend: Improve barrel file detection in codemod (#87389)
  Unified Storage: Add SQL template package (#87524)
  Sql Expressions: use display name for sql tables (#87530)
  Azure Monitor: Update grafana-azure-sdk-go to v2.0.3 (#87480)
  Timeseries: Fix incorrect threshold style (#87521)
  GRPC Server: Add README (#87442)
  Ephemeral instances: update go version (#87526)
  Scopes: Add a /find query endpoint (#87457)
  ...
tonypowa added a commit that referenced this pull request May 11, 2024
* added links to list

* changed heading

(cherry picked from commit 3a2c9f4)
tonypowa added a commit that referenced this pull request May 13, 2024
alerting: integrations > small update (#87538)

* added links to list

* changed heading

(cherry picked from commit 3a2c9f4)
@kevinwcyu kevinwcyu modified the milestones: 11.1.x, 11.1.0 Jun 21, 2024
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

3 participants