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](backport #31001) Filesystem refactor #33022

Merged
merged 11 commits into from
Sep 19, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 8, 2022

This is an automatic backport of pull request #31001 done by Mergify.
Cherry-pick of 1d4a7ca has failed:

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

You are currently cherry-picking commit 1d4a7ca00e.
  (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:   CHANGELOG.next.asciidoc
	modified:   metricbeat/docs/fields.asciidoc
	modified:   metricbeat/module/system/filesystem/_meta/docs.asciidoc
	deleted:    metricbeat/module/system/filesystem/helper_test.go
	modified:   metricbeat/module/system/fsstat/_meta/data.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.sum
	both modified:   metricbeat/module/system/fields.go
	both modified:   metricbeat/module/system/filesystem/_meta/fields.yml
	both modified:   metricbeat/module/system/filesystem/filesystem.go
	both modified:   metricbeat/module/system/filesystem/filesystem_test.go
	deleted by them: metricbeat/module/system/filesystem/helper.go
	both modified:   metricbeat/module/system/fsstat/fsstat.go
	both modified:   metricbeat/module/system/test_system.py

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

* first pass at filesystem refactoring

* cleanup code

* final cleanup

* cleanup, docs

* license headers

* make linter happy

* try to hack around linter platform issues

* fix function sig

* minor fixes, formatting

* try to make linter happy

* more linter fixes

* hopefully the last linter cleanup

* try to fix unit tests

* fix tests

* refactor after merges from elastic-agent libs

* make linter happy

* try to update deps

* okay, try that

* fix merge

* add changelog, revert opt changes

* fix broken merge

* mage update

(cherry picked from commit 1d4a7ca)

# Conflicts:
#	go.sum
#	metricbeat/module/system/fields.go
#	metricbeat/module/system/filesystem/_meta/fields.yml
#	metricbeat/module/system/filesystem/filesystem.go
#	metricbeat/module/system/filesystem/filesystem_test.go
#	metricbeat/module/system/filesystem/helper.go
#	metricbeat/module/system/fsstat/fsstat.go
#	metricbeat/module/system/test_system.py
@mergify mergify bot requested a review from a team as a code owner September 8, 2022 12:52
@mergify mergify bot requested review from cmacknz and faec and removed request for a team September 8, 2022 12:52
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 8, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2022
@cmacknz cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 8, 2022
@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 Sep 8, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 8, 2022

💔 Build Failed

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-09-15T23:34:20.074+0000

  • Duration: 209 min 15 sec

Test stats 🧪

Test Results
Failed 0
Passed 21614
Skipped 1436
Total 23050

Steps errors 1

Expand to view the steps failures

Building Beats » Beats Packaging » PR-33022
  • Took 116 min 16 sec . View more details here
  • Description: null

💚 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 Sep 9, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.17/pr-31001 upstream/mergify/bp/7.17/pr-31001
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-31001

@mergify
Copy link
Contributor Author

mergify bot commented Sep 12, 2022

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

@fearful-symmetry
Copy link
Contributor

Tests are still failing, not quite sure why.

@fearful-symmetry
Copy link
Contributor

Alright, tested this manually. If there's still dependency issues I'm just gonna merge this

@mergify
Copy link
Contributor Author

mergify bot commented Sep 19, 2022

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

@cmacknz cmacknz merged commit 296b380 into 7.17 Sep 19, 2022
@cmacknz cmacknz deleted the mergify/bp/7.17/pr-31001 branch September 19, 2022 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request 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.

3 participants