Skip to content

[Filebeat] Removing duplicate modules (aliases) Observability#27919

Merged
P1llus merged 8 commits intoelastic:masterfrom
P1llus:remove_duplicate_observability_modules
Sep 16, 2021
Merged

[Filebeat] Removing duplicate modules (aliases) Observability#27919
P1llus merged 8 commits intoelastic:masterfrom
P1llus:remove_duplicate_observability_modules

Conversation

@P1llus
Copy link
Copy Markdown
Member

@P1llus P1llus commented Sep 14, 2021 •
edited
Loading

What does this PR do?

DO NOT BACKPORT, 8.0 change only
Removes old observability module aliases as part of 8.0 breaking changes.

Why is it important?

Removes unnecessary files.

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.

@P1llus P1llus added the Team:Integrations Label for the Integrations team label Sep 14, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 14, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Sep 14, 2021
mtojek
mtojek reviewed Sep 14, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@mtojek mtojek left a comment

Choose a reason for hiding this comment

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

Not sure how much stuff you want to remove, but there are some other references. I don't know if that code is still used:
https://github.com/elastic/beats/blob/23e4403ae093fcc8f7905345cad2c7ad256976d8/dev-tools/ecs-migration.yml

and tests:
https://github.com/elastic/beats/blob/23e4403ae093fcc8f7905345cad2c7ad256976d8/libbeat/conditions/matcher_test.go
https://github.com/elastic/beats/blob/b061836bcebf7ae055b2184924f634fba1cf2232/filebeat/autodiscover/builder/hints/logs_test.go

@P1llus
Copy link
Copy Markdown
Member Author

P1llus commented Sep 14, 2021

Thanks @mtojek !
Yeah I want to remove all references. Currently I am trying to remove anything related to docs as well, as there was some references to that.

Will look at your test files as well!

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 14, 2021 •
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: 2021-09-16T10:49:00.220+0000

  • Duration: 147 min 28 sec

  • Commit: be8906e

Test stats 🧪

Test Results
Failed 0
Passed 53951
Skipped 5327
Total 59278

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 53951
Skipped 5327
Total 59278

@P1llus P1llus requested a review from jsoriano September 14, 2021 13:41
@P1llus P1llus mentioned this pull request Sep 14, 2021
Closed
19 tasks
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 15, 2021

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 remove_duplicate_observability_modules upstream/remove_duplicate_observability_modules
git merge upstream/master
git push upstream remove_duplicate_observability_modules

@mtojek mtojek self-requested a review September 15, 2021 11:05
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 15, 2021

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 remove_duplicate_observability_modules upstream/remove_duplicate_observability_modules
git merge upstream/master
git push upstream remove_duplicate_observability_modules

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 16, 2021

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 remove_duplicate_observability_modules upstream/remove_duplicate_observability_modules
git merge upstream/master
git push upstream remove_duplicate_observability_modules

@P1llus P1llus merged commit b4d8ace into elastic:master Sep 16, 2021
v1v added a commit to v1v/beats that referenced this pull request Sep 20, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/e2e-fleet
10d1617 
* upstream/master: (658 commits)
  Add complete k8s metadata through composable provider (elastic#27691)
  Revert "Fix issue where --insecure didn't propogate to Fleet Server ES connection (elastic#27969)" (elastic#27997)
  Remove deprecated kafka fields (elastic#27938)
  [Filebeat] Add Base64 encoded HMAC & UUID template functions to httpjson input (elastic#27873)
  Improve httpjson template function join (elastic#27996)
  Remove kubernetes.container.image alias (elastic#27898)
  [Elastic Agent] Golden files for program tests (elastic#27862)
  [Elastic Agent] Disable modules.d in metricbeat (elastic#27860)
  libbeat/common/seccomp: provide default policy for linux arm64 (elastic#27955)
  Fix logger statement in aws-s3 input (elastic#27982)
  Fix wrong merge (elastic#27976)
  Fix issue where --insecure didn't propogate to Fleet Server ES connection (elastic#27969)
  Forward-port 7.14.2 changelog to master (elastic#27975)
  [Filebeat] Removing duplicate modules (aliases) Observability (elastic#27919)
  Fix path in vagrant windows script (elastic#27966)
  [Filebeat] Removing duplicate modules (aliases) and Cyberark (elastic#27915)
  No changelog for 8.0.0-alpha2 (elastic#27961)
  Add write access to 'url.value' from 'request.transforms'. (elastic#27937)
  Docker: remove deprecated fields (elastic#27933)
  Filebeat: Make all filesets disabled in default configuration (elastic#27762)
  ...
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@P1llus
[Filebeat] Removing duplicate modules (aliases) Observability (elasti…
3be3eac 
…c#27919)

* [Filebeat] Removing duplicate modules (aliases) Observability

* update changelog

* removing more references and fixing some old wrong documentation

* reverting regex test
@jsoriano jsoriano mentioned this pull request Nov 3, 2021
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

+1 more reviewer

@mtojek mtojek mtojek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@P1llus @elasticmachine @jsoriano @mtojek