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

[Filebeat] Allow cisco/asa and cisco/ftd modules to override network directionality based off of zones #23068

Merged
merged 6 commits into from
Dec 10, 2020

Conversation

andrewstucki
Copy link
Contributor

@andrewstucki andrewstucki commented Dec 10, 2020

What does this PR do?

This adopts the same logic as #22998 by classifying internal/external/inbound/outbound traffic based off of zones. The implementation is similar to #23066 in that the zone-based classification is off by default, since the cisco logs already classify inbound/outbound for you.

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

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External 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 Dec 10, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 10, 2020

💚 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: Pull request #23068 updated

  • Start Time: 2020-12-10T20:28:27.978+0000

  • Duration: 56 min 53 sec

Test stats 🧪

Test Results
Failed 0
Passed 2422
Skipped 261
Total 2683

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2422
Skipped 261
Total 2683

@andrewstucki
Copy link
Contributor Author

Since there's no way of overriding the config on a per golden file basis. Here's a diff to demonstrate this working:

With the following configuration change

diff --git a/x-pack/filebeat/module/cisco/ftd/manifest.yml b/x-pack/filebeat/module/cisco/ftd/manifest.yml
index 31eb9659a..6c07bdf33 100644
--- a/x-pack/filebeat/module/cisco/ftd/manifest.yml
+++ b/x-pack/filebeat/module/cisco/ftd/manifest.yml
@@ -25,7 +25,9 @@ var:
   - name: internal_PREFIX
     default: FTD
   - name: external_zones
+    default: [ "output-zone" ]
   - name: internal_zones
+    default: [ "input-zone" ]

 ingest_pipeline: ../shared/ingest/asa-ftd-pipeline.yml
 input: config/input.yml

We see the following change:

diff --git a/x-pack/filebeat/module/cisco/ftd/test/dns.log-expected.json b/x-pack/filebeat/module/cisco/ftd/test/dns.log-expected.json
index 093665fca..b6a5aa94f 100644
--- a/x-pack/filebeat/module/cisco/ftd/test/dns.log-expected.json
+++ b/x-pack/filebeat/module/cisco/ftd/test/dns.log-expected.json
@@ -74,6 +74,7 @@
         "log.level": "alert",
         "log.offset": 0,
         "network.application": "dns client",
+        "network.direction": "outbound",
         "network.iana_number": 17,
         "network.protocol": "dns",
         "network.transport": "udp",

@andrewstucki andrewstucki merged commit 76b7c8c into elastic:master Dec 10, 2020
andrewstucki pushed a commit to andrewstucki/beats that referenced this pull request Dec 10, 2020
…directionality based off of zones (elastic#23068)

* [Filebeat] Allow cisco/asa and cisco/ftd modules to override network directionality based off of zones

* Add changelog entry

* Don't override categorization if no zone set

* regenerate golden files

(cherry picked from commit 76b7c8c)
andrewstucki pushed a commit that referenced this pull request Dec 10, 2020
…odules to override network directionality based off of zones (#23084)

* [Filebeat] Allow cisco/asa and cisco/ftd modules to override network directionality based off of zones (#23068)

* [Filebeat] Allow cisco/asa and cisco/ftd modules to override network directionality based off of zones

* Add changelog entry

* Don't override categorization if no zone set

* regenerate golden files

(cherry picked from commit 76b7c8c)

* Fix up changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants