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

Make naming consistent with the main branch #36303

Merged
merged 2 commits into from
Aug 12, 2023

Conversation

rdner
Copy link
Member

@rdner rdner commented Aug 12, 2023

In #36065 a few fields were renamed in order to clarify their purpose. Unfortunately, this rename was a part of a new feature PR which was not supposed to be backported to 7.17.

However, backporting some other changes related to this code has now become challenging and results in build failures (note the fixing commits):

This PR makes the naming consistent with the main branch, so we can easily backport changes.

In elastic#36065 a few fields were
renamed in order to clarify their purpose. Unfortunately, this rename
was a part of a new feature PR which was not supposed to be backported
to 7.17.

However, backporting some other changes related to this code
has now become challenging and results in build failures (note the
fixing commits):

- elastic#36095
- elastic#36264

This PR makes the naming consistent with the main branch, so we can
easily backport changes.
@rdner rdner added enhancement Filebeat Filebeat Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Aug 12, 2023
@rdner rdner requested a review from a team as a code owner August 12, 2023 13:45
@rdner rdner self-assigned this Aug 12, 2023
@rdner rdner requested review from fearful-symmetry and leehinman and removed request for a team August 12, 2023 13:45
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 12, 2023
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 12, 2023
@rdner rdner enabled auto-merge (squash) August 12, 2023 13:46
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 12, 2023

💚 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-08-12T14:24:57.289+0000

  • Duration: 63 min 54 sec

Test stats 🧪

Test Results
Failed 0
Passed 6332
Skipped 533
Total 6865

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

@rdner rdner merged commit 5f156bd into elastic:7.17 Aug 12, 2023
7 checks passed
@rdner rdner deleted the make-renamed-field-consistent-with-8 branch August 12, 2023 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Filebeat Filebeat Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants