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][SophosXG Module] Renaming module and fileset #20396

Merged
merged 3 commits into from
Aug 3, 2020
Merged

[Filebeat][SophosXG Module] Renaming module and fileset #20396

merged 3 commits into from
Aug 3, 2020

Conversation

P1llus
Copy link
Member

@P1llus P1llus commented Aug 3, 2020 •
edited
Loading

What does this PR do?

Renaming module from SophosXG to Sophos, and fileset from firewall to XG.

This allows us to easier add more fileset under the more generally named Sophos module

Why is it important?

Makes adding new filesets to Sophos easier and cleaner.

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

Module already has a PR Changelog entry, and has not been released yet, so removing the checkbox for changelog

Updated golden files with:

MODULES_PATH=$PWD/module GENERATE=1 INTEGRATION_TESTS=1 BEAT_STRICT_PERMS=false TESTING_FILEBEAT_MODULES=sophos nosetests -v -s tests/system/test_xpack_modules.py

@P1llus P1llus requested a review from adriansr August 3, 2020 10:41
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@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 Aug 3, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 3, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20396 updated]

  • Start Time: 2020-08-03T15:54:29.574+0000

  • Duration: 55 min 4 sec

Test stats 🧪

Test Results
Failed 0
Passed 5516
Skipped 840
Total 6356

@P1llus
Copy link
Member Author

P1llus commented Aug 3, 2020

jenkins run the tests please

andrewkroh
andrewkroh reviewed Aug 3, 2020
View reviewed changes
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM

adriansr
adriansr approved these changes Aug 3, 2020
View reviewed changes
x-pack/filebeat/filebeat.reference.yml Outdated
@@ -1355,9 +1355,9 @@ filebeat.modules:
# The port to listen for syslog traffic. Defaults to 9004.
#var.syslog_port: 9005

# firewall default hostanme
# firewall default hostanme
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo: hostname

@adriansr adriansr merged commit 778a92f into elastic:master Aug 3, 2020
@P1llus P1llus deleted the rename_sophosxg_module branch August 3, 2020 17:14
adriansr pushed a commit to adriansr/beats that referenced this pull request Aug 3, 2020
@P1llus @adriansr
[Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)
f5edbed 
renaming sophosxg module to sophos, and renaming fileset to better support future filesets

(cherry picked from commit 778a92f)
@adriansr adriansr mentioned this pull request Aug 3, 2020
Merged
5 tasks
@adriansr adriansr mentioned this pull request Aug 3, 2020
Merged
5 tasks
adriansr pushed a commit to adriansr/beats that referenced this pull request Aug 3, 2020
@P1llus @adriansr
[Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)
8e299a5 
renaming sophosxg module to sophos, and renaming fileset to better support future filesets

(cherry picked from commit 778a92f)
@adriansr adriansr added the v7.9.0 label Aug 3, 2020
adriansr added a commit that referenced this pull request Aug 4, 2020
@adriansr @P1llus
Cherry-pick #20396 to 7.x: [Filebeat][SophosXG Module] Renaming modul…
637e7cf 
…e and fileset (#20408)

renaming sophosxg module to sophos, and renaming fileset to better support future filesets

(cherry picked from commit 778a92f)

Co-authored-by: Marius Iversen <pillus@chasenet.org>
adriansr added a commit that referenced this pull request Aug 4, 2020
@adriansr @P1llus
[Filebeat][SophosXG Module] Renaming module and fileset (#20396) (#20409
34ee591 
)

renaming sophosxg module to sophos, and renaming fileset to better support future filesets

(cherry picked from commit 778a92f)

Co-authored-by: Marius Iversen <pillus@chasenet.org>
v1v added a commit to v1v/beats that referenced this pull request Aug 6, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/ci-pipeli…
6fa6d3a 
…ne-2.0

* upstream/master:
  [docs] Promote ingest management to beta (elastic#20295)
  Upgrade elasticsearch client library used in tests (elastic#20405)
  Disable logging when pulling on python integration tests (elastic#20397)
  Remove pillow from testing requirements.txt (elastic#20407)
  [Filebeat][ATP Module]Setting user agent field required by the API (elastic#20440)
  [Ingest Manager] Send datastreams fields (elastic#20402)
  Add event.ingested to all Filebeat modules (elastic#20386)
  [Elastic Agent] Fix agent control socket path to always be less than 107 characters (elastic#20426)
  Improve cgroup_regex docs with examples (elastic#20425)
  Makes `metrics` config option required in app_insights (elastic#20406)
  Ensure install scripts only install if needed (elastic#20349)
  Update container name for the azure filesets (elastic#19899)
  Group same timestamp metrics values in app_insights metricset (elastic#20403)
  add_process_metadata processor adds container id even if process metadata not accessible (elastic#19767)
  Support "cluster" scope in Metricbeat elasticsearch module (elastic#18547)
  [Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)
  Update Suricata dashboards (elastic#20394)
  [Elastic Agent] Improve version, restart, enroll CLI commands (elastic#20359)
  Prepare home directories for docker images in a different stage (elastic#20356)
v1v added a commit to v1v/beats that referenced this pull request Aug 6, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into fix/ci-tools-inst…
6b99d98 
…allation

* upstream/master: (23 commits)
  [docs] Promote ingest management to beta (elastic#20295)
  Upgrade elasticsearch client library used in tests (elastic#20405)
  Disable logging when pulling on python integration tests (elastic#20397)
  Remove pillow from testing requirements.txt (elastic#20407)
  [Filebeat][ATP Module]Setting user agent field required by the API (elastic#20440)
  [Ingest Manager] Send datastreams fields (elastic#20402)
  Add event.ingested to all Filebeat modules (elastic#20386)
  [Elastic Agent] Fix agent control socket path to always be less than 107 characters (elastic#20426)
  Improve cgroup_regex docs with examples (elastic#20425)
  Makes `metrics` config option required in app_insights (elastic#20406)
  Ensure install scripts only install if needed (elastic#20349)
  Update container name for the azure filesets (elastic#19899)
  Group same timestamp metrics values in app_insights metricset (elastic#20403)
  add_process_metadata processor adds container id even if process metadata not accessible (elastic#19767)
  Support "cluster" scope in Metricbeat elasticsearch module (elastic#18547)
  [Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)
  Update Suricata dashboards (elastic#20394)
  [Elastic Agent] Improve version, restart, enroll CLI commands (elastic#20359)
  Prepare home directories for docker images in a different stage (elastic#20356)
  New multiline mode in Filebeat: while_pattern (elastic#19662)
  ...
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@P1llus @melchiormoulin
[Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)
9126b08 
renaming sophosxg module to sophos, and renaming fileset to better support future filesets
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@adriansr @P1llus
[Filebeat][SophosXG Module] Renaming module and fileset (elastic#20396)…
098eb8a 
… (elastic#20409)

renaming sophosxg module to sophos, and renaming fileset to better support future filesets

(cherry picked from commit 584223c)

Co-authored-by: Marius Iversen <pillus@chasenet.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh left review comments

@adriansr adriansr adriansr approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@P1llus @elasticmachine @andrewkroh @adriansr