Skip to content

apply a quick hotfix for having main working properly#32934

Merged
paolafrancesca merged 2 commits intoelastic:mainfrom
paolafrancesca:quick-hotfix-dev
Sep 1, 2022
Merged

apply a quick hotfix for having main working properly#32934
paolafrancesca merged 2 commits intoelastic:mainfrom
paolafrancesca:quick-hotfix-dev

Conversation

@paolafrancesca
Copy link

@paolafrancesca paolafrancesca commented Aug 31, 2022

Bug

What does this PR do?

Quick hotfix for having main working properly around #32888
The proper refactoring to be released is taking place at #32921

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@paolafrancesca paolafrancesca self-assigned this Aug 31, 2022
@paolafrancesca paolafrancesca requested a review from a team as a code owner August 31, 2022 08:41
@paolafrancesca paolafrancesca requested review from faec and leehinman and removed request for a team August 31, 2022 08:41
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 31, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 31, 2022

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @aspacca? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@paolafrancesca paolafrancesca added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Aug 31, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 31, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 31, 2022 •
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: 2022-08-31T09:14:27.309+0000

  • Duration: 118 min 45 sec

Test stats 🧪

Test Results
Failed 0
Passed 9202
Skipped 549
Total 9751

💚 Flaky test report

Tests succeeded.

🤖 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!)

kaiyan-sheng
kaiyan-sheng approved these changes Aug 31, 2022
View reviewed changes
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

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

besides missing a changelog, looks good!

@kaiyan-sheng kaiyan-sheng added the backport-v8.4.0 Automated backport with mergify label Aug 31, 2022
@paolafrancesca paolafrancesca removed the backport-v8.4.0 Automated backport with mergify label Sep 1, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 1, 2022

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @aspacca? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@paolafrancesca
Copy link
Author

paolafrancesca commented Sep 1, 2022

@kaiyan-sheng we should not backport to 8.4 :)

this is just an hotfix to have main back to a working status, in 8.4 we should backport only #32921

@paolafrancesca paolafrancesca merged commit ee82bc3 into elastic:main Sep 1, 2022
v1v added a commit to v1v/beats that referenced this pull request Sep 1, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/heartbeat-p…
a884d74 
…ackaging

* upstream/main: (109 commits)
  Add cap_net_raw requirements to heartbeat docs (elastic#32816)
  apply a quick hotfix for having main working properly (elastic#32934)
  action: checks for x-pack/libbeat and libbeat (elastic#32754)
  Update to Go 1.18 in go.mod. (elastic#32940)
  [heartbeat] disable browser code on windows via build tags (elastic#32939)
  action: checks for heartbeat and x-pack/heartbeat (elastic#32749)
  Make event acknowledgment asynchronous in shipper output (elastic#32785)
  [Automation] Update elastic stack version to 8.5.0-fedc3e60 for testing (elastic#32930)
  Preallocate memory to reduce GC load (elastic#32905)
  [Automation] Update elastic stack version to 8.5.0-440e0896 for testing (elastic#32919)
  Skip broken ceph tests. (elastic#32912)
  Use non-deprecated docker image for testing jolokia (elastic#32885)
  update ironbank image product name (elastic#32867)
  ci: pre-commit stage within Jenkins (elastic#32839)
  Fix a couple of bugs in the logic for how AWS metric periods are calculated (elastic#32724)
  [Filebeat] [httpjson] Add support for single string containing multiple relation-types in getRFC5988Link (elastic#32811)
  [Heartbeat] Update HB k8s template to use <Mi> metric (elastic#32801)
  action: checks for metricbeat and x-pack/metricbeat (elastic#32748)
  action: checks for filebeat and x-pack/filebeat (elastic#32746)
  allow for json/ndjson content type with charset (elastic#32767)
  ...
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@chrisberkhout
apply a quick hotfix for having main working properly (#32934)
0236b5e 
* apply a quick hotfix for having main working properly

* fix test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

@tommyers-elastic tommyers-elastic Awaiting requested review from tommyers-elastic

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

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

Assignees

@paolafrancesca paolafrancesca

Labels

bugfix Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@paolafrancesca @elasticmachine @kaiyan-sheng