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

filebeat: add SSL options to checkpoint module #19560

Merged
merged 15 commits into from
Oct 19, 2020
Merged

filebeat: add SSL options to checkpoint module #19560

merged 15 commits into from
Oct 19, 2020

Conversation

hazcod
Copy link
Contributor

@hazcod hazcod commented Jul 1, 2020 •
edited
Loading

What does this PR do?

This adds a var.input type tls, which will use tcp + tls for mutual TLS authentication.

Why is it important?

Syslog udp is plaintext and does not guarantee CIA.

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.

Related issues

#17682
CC @P1llus @adriansr @andrewstucki

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2020
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

1 similar comment
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@hazcod hazcod mentioned this pull request Jul 1, 2020
Closed
6 tasks
@P1llus
Copy link
Member

P1llus commented Jul 1, 2020

Thanks for recreating the PR @hazcod . I know this is the second time around due to the issues with the last PR (including the merge from master most likely).

Will let you know how it goes, and also triggers a need to look a bit more deeper into where TLS should/should not be per default.

@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2020
@P1llus P1llus added Filebeat Filebeat needs_team Indicates that the issue/PR needs a Team:* label labels Jul 1, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2020
@P1llus P1llus added the review label Jul 1, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 1, 2020 •
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

Expand to view the summary

Build stats

  • Build Cause: [marc-gr commented: jenkins run tests]

  • Start Time: 2020-10-19T14:13:16.438+0000

  • Duration: 65 min 41 sec

Test stats 🧪

Test Results
Failed 0
Passed 4474
Skipped 561
Total 5035

@P1llus
Copy link
Member

P1llus commented Jul 1, 2020

jenkins test this please

@hazcod
Copy link
Contributor Author

hazcod commented Jul 2, 2020

I ran a mage build in x-pack/filebeat/, but not sure what the command should be here.

@P1llus
Copy link
Member

P1llus commented Jul 13, 2020 •
edited
Loading

It asks you to run "mage fmt update" in the x-pack/filebeat folder @hazcod . I will see if I can add a review to it

@hazcod
Copy link
Contributor Author

hazcod commented Aug 7, 2020

I've successfully ran mage fmt update @P1llus .

@hazcod
Copy link
Contributor Author

hazcod commented Aug 24, 2020

Ping.

@marc-gr
Copy link
Contributor

marc-gr commented Aug 24, 2020

jenkins run tests

marc-gr
marc-gr requested changes Aug 26, 2020
View reviewed changes
Copy link
Contributor

@marc-gr marc-gr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks for your patience and for submitting this again ❤️ ! Please add a CHANGELOG entry, and besides this I left some comments. If you wish, we can take over from this point and push the required changes to your branch., or you can do them yourself, whatever works best for you.

x-pack/filebeat/module/checkpoint/firewall/config/firewall.yml Outdated Show resolved Hide resolved
x-pack/filebeat/module/checkpoint/firewall/manifest.yml Outdated Show resolved Hide resolved
x-pack/filebeat/module/checkpoint/firewall/manifest.yml Outdated Show resolved Hide resolved
x-pack/filebeat/tests/system/test_http_endpoint.py Outdated Show resolved Hide resolved
@hazcod
Copy link
Contributor Author

hazcod commented Aug 27, 2020

I've pushed the requested changes @marc-gr

@hazcod hazcod requested a review from marc-gr August 27, 2020 09:18
@marc-gr
Copy link
Contributor

marc-gr commented Aug 27, 2020

jenkins run tests

@hazcod
Copy link
Contributor Author

hazcod commented Sep 8, 2020

@marc-gr: I've updated the CHANGELOG entry.

@marc-gr
Copy link
Contributor

marc-gr commented Sep 8, 2020

jenkins run tests

@marc-gr
Copy link
Contributor

marc-gr commented Sep 8, 2020

jenkins run tests

@hazcod
Copy link
Contributor Author

hazcod commented Sep 16, 2020

FYI @marc-gr / @P1llus you should have write access for this PR now too.

@marc-gr
Copy link
Contributor

marc-gr commented Sep 16, 2020

jenkins run tests

@marc-gr marc-gr changed the title filebeat: add TLS + pipeline options to checkpoint module filebeat: add SSL options to checkpoint module Sep 16, 2020
P1llus
P1llus reviewed Sep 16, 2020
View reviewed changes
Copy link
Member

@P1llus P1llus left a comment

Choose a reason for hiding this comment

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

LGMT, though should have another reviewer as well, to ensure there is nothing missing from the config entries, maybe compared to another one with TLS?

@marc-gr marc-gr requested a review from a team September 17, 2020 07:22
leehinman
leehinman approved these changes Oct 19, 2020
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@marc-gr
Copy link
Contributor

marc-gr commented Oct 19, 2020

jenkins run tests

@marc-gr marc-gr merged commit e29c3fa into elastic:master Oct 19, 2020
@marc-gr marc-gr deleted the patch-2 branch October 19, 2020 15:19
@marc-gr marc-gr mentioned this pull request Oct 19, 2020
Merged
6 tasks
@hazcod
Copy link
Contributor Author

hazcod commented Oct 19, 2020

Thank you all for the help!

v1v added a commit to v1v/beats that referenced this pull request Oct 21, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-10
91e9d54 
* upstream/master:
  feat: package aliases for snapshots (elastic#21960)
  [DOC] Add firewall as possible troubleshooting issue (elastic#21743)
  [Filebeat] Add max_number_of_messages config parameter for S3 input (elastic#21993)
  [Elastic Agent] Fix missing elastic_agent event data  (elastic#21994)
  Document auditbeat system process module config (elastic#21766)
  Update links (elastic#22012)
  dynamically find librpm (elastic#21936)
  Fix Istio docs (elastic#22019)
  [beats-tester][packaging] store packages in another location (elastic#21903)
  [Kubernetes] Remove redundant dockersock volume mount (elastic#22009)
  [Ingest Manager] Always try snapshot repo for agent upgrade (elastic#21951)
  Azure storage metricset values not inside the metricset name (elastic#21845)
  fix diskio and memory bugs under windows (elastic#21992)
  Fix TestDockerStart flaky test (elastic#21681)
  filebeat: add SSL options to checkpoint module (elastic#19560)
  Stop storing stateless kubernetes keystores (elastic#21880)
  [Elastic Agent] Fix named pipe communication on Windows 7 (elastic#21931)
  [Elastic Agent] Fix index for Agent monitoring to to elastic_agent. (elastic#21932)
marc-gr pushed a commit to marc-gr/beats that referenced this pull request Oct 28, 2020
@hazcod @marc-gr
filebeat: add SSL options to checkpoint module (elastic#19560)
6504b04 
* feat(firewall): add tls config

* feat(firewall): add vars to manifest

* chore(checkpoint): add tls to example

* chore(checkpoint): run mage fmt update

* cleanup(checkpoint): remove obsolete log_level

* refactor(checkpoint): move to .ssl

* chore(x-pack): revert ide fix

* chore(changelog): add f5 asm ref

* revert(changelog): remove f5 asm mod

* chore(changelog): add checkpoint tls

* chore: fix lint warnings

* Undo some changes and move docs to checkpoint

* Move changelog entry

Co-authored-by: Marc Guasch <marc.guasch@elastic.co>
(cherry picked from commit e29c3fa)
marc-gr added a commit that referenced this pull request Oct 28, 2020
@marc-gr @hazcod
filebeat: add SSL options to checkpoint module (#19560) (#21988)
400a90d 
* feat(firewall): add tls config

* feat(firewall): add vars to manifest

* chore(checkpoint): add tls to example

* chore(checkpoint): run mage fmt update

* cleanup(checkpoint): remove obsolete log_level

* refactor(checkpoint): move to .ssl

* chore(x-pack): revert ide fix

* chore(changelog): add f5 asm ref

* revert(changelog): remove f5 asm mod

* chore(changelog): add checkpoint tls

* chore: fix lint warnings

* Undo some changes and move docs to checkpoint

* Move changelog entry

Co-authored-by: Marc Guasch <marc.guasch@elastic.co>
(cherry picked from commit e29c3fa)

Co-authored-by: Niels Hofmans <hello@ironpeak.be>
@andrewkroh andrewkroh mentioned this pull request Dec 1, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@P1llus P1llus P1llus left review comments

@leehinman leehinman leehinman approved these changes

@marc-gr marc-gr marc-gr approved these changes

Assignees
No one assigned
Labels
enhancement Filebeat Filebeat review v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hazcod @elasticmachine @P1llus @marc-gr @leehinman