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

[7.17] feat(slack): apm-server (backport #13307) #13344

Merged
merged 4 commits into from
Jun 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2024

Motivation/summary

No more vault access but GitHub secrets

Need to support thread-timestamp

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


This is an automatic backport of pull request #13307 done by [Mergify](https://mergify.com).

* feat(slack): apm-server

* fix name

* Apply suggestions from code review

(cherry picked from commit 055c3a5)

# Conflicts:
#	.github/workflows/benchmarks.yml
#	.github/workflows/run-minor-release.yml
#	.github/workflows/run-patch-release.yml
#	.github/workflows/smoke-tests-schedule.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 5, 2024
@mergify mergify bot assigned v1v Jun 5, 2024
Copy link
Contributor Author

mergify bot commented Jun 5, 2024

Cherry-pick of 055c3a5 has failed:

On branch mergify/bp/7.17/pr-13307
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 055c3a56d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/prepare-release/action.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/benchmarks.yml
	both modified:   .github/workflows/run-minor-release.yml
	both modified:   .github/workflows/run-patch-release.yml
	deleted by us:   .github/workflows/smoke-tests-schedule.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

.github/workflows/run-patch-release.yml Outdated Show resolved Hide resolved
.github/workflows/run-minor-release.yml Outdated Show resolved Hide resolved
.github/workflows/run-minor-release.yml Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jun 6, 2024
@@ -0,0 +1,233 @@
name: benchmarks
Copy link
Member

Choose a reason for hiding this comment

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

question: why add this ? We don't run benchmarks for 7.17 so I'm not sure we need this

Copy link
Member

Choose a reason for hiding this comment

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

That's how mergify works when there is an automated backport, and includes the conflict label:

In this particular case, .github/workflows/benchmarks.yml was not backported originally in the past, but since it was changes among some other things in #13307, when backporting it does create the file from scratch with the conflict label.

We can delete it or keep it - it won't run for 7.17 at all, schedule only works for the default branch, in this particular case main.

@kruskall
Copy link
Member

kruskall commented Jun 9, 2024

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Jun 9, 2024

update

✅ Branch has been successfully updated

@kruskall kruskall enabled auto-merge (squash) June 9, 2024 16:38
@kruskall kruskall disabled auto-merge June 9, 2024 16:38
@mergify mergify bot merged commit 8f3028f into 7.17 Jun 9, 2024
12 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-13307 branch June 9, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants