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.

Sign up for GitHub

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

Jump to bottom

[7.17](backport #35551) [Heartbeat] Remove synthetics support for ironbank #35588

Merged
merged 5 commits into from
Jun 14, 2023
Merged

[7.17](backport #35551) [Heartbeat] Remove synthetics support for ironbank #35588

merged 5 commits into from
Jun 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2023 •
edited by zube bot
Loading

This is an automatic backport of pull request #35551 done by Mergify.
Cherry-pick of 3f5afa5 has failed:

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

You are currently cherry-picking commit 3f5afa5ef9.
  (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:
	deleted:    dev-tools/packaging/files/ironbank/heartbeat/signatures/RPM-GPG-KEY-CentOS-Official
	deleted:    dev-tools/packaging/files/ironbank/heartbeat/signatures/RPM-GPG-KEY-rockyofficial
	deleted:    dev-tools/packaging/files/ironbank/heartbeat/signatures/linux_signing_key.pub
	modified:   dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
	modified:   x-pack/heartbeat/ironbank/Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@emilioalvap @mergify
[Heartbeat] Remove synthetics support for ironbank (#35551)
3006b7f 
* [Heartbeat] Remove synthetics support for ironbank

* ci: remove heartbeat ironbank validation

* ci: remove heartbeat ironbank validation scheduler

* remove heartbeat ironbank

* avoid running it

* Revert "ironbank: support for heartbeat (#32954)"

This reverts commit 544cfd6.

* Revert "Revert "ironbank: support for heartbeat (#32954)""

This reverts commit 1e6b816.

* Revert "avoid running it"

This reverts commit 0c533e7.

* Revert "remove heartbeat ironbank"

This reverts commit afa51b7.

* Revert "ci: remove heartbeat ironbank validation scheduler"

This reverts commit e34fa74.

* Revert "ci: remove heartbeat ironbank validation"

This reverts commit b0e0ad0.

* update version

---------

Co-authored-by: Victor Martinez <VictorMartinezRubio@gmail.com>
(cherry picked from commit 3f5afa5)

# Conflicts:
#	dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
@mergify mergify bot requested review from a team as code owners May 26, 2023 08:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 26, 2023
@mergify mergify bot requested review from rdner and cmacknz and removed request for a team May 26, 2023 08:14
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 26, 2023
@emilioalvap emilioalvap added the Team:obs-ds-hosted-services Label for the Observability Hosted Services team label May 26, 2023
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 26, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 26, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-14T12:40:53.162+0000

  • Duration: 275 min 49 sec

Test stats 🧪

Test Results
Failed 0
Passed 22362
Skipped 1420
Total 23782

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented May 29, 2023

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

@emilioalvap
Copy link
Collaborator

/test

@emilioalvap
Copy link
Collaborator

/package

1 similar comment
@emilioalvap
Copy link
Collaborator

/package

@mergify
Copy link
Contributor Author

mergify bot commented Jun 5, 2023

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

@emilioalvap emilioalvap enabled auto-merge (squash) June 5, 2023 17:14
@mergify
Copy link
Contributor Author

mergify bot commented Jun 12, 2023

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

@emilioalvap emilioalvap enabled auto-merge (squash) June 12, 2023 16:09
@emilioalvap
Copy link
Collaborator

/test

@emilioalvap emilioalvap merged commit 2e6c25d into 7.17 Jun 14, 2023
@emilioalvap emilioalvap deleted the mergify/bp/7.17/pr-35551 branch June 14, 2023 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

@cmacknz cmacknz Awaiting requested review from cmacknz cmacknz is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@emilioalvap emilioalvap

Labels
backport conflicts There is a conflict in the backported pull request Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@elasticmachine @emilioalvap