Skip to content

[fortinet] Make event.original optional in fortinet#1075

Merged
marc-gr merged 1 commit intoelastic:masterfrom
marc-gr:fortinet-eventoriginal
Jun 3, 2021
Merged

[fortinet] Make event.original optional in fortinet#1075
marc-gr merged 1 commit intoelastic:masterfrom
marc-gr:fortinet-eventoriginal

Conversation

@marc-gr
Copy link
Copy Markdown
Contributor

@marc-gr marc-gr commented Jun 3, 2021

What does this PR do?

Makes event.original optional

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
    - [] If I'm introducing a new feature, I have modified the Kibana version constraint in my package's manifest.yml file to point to the latest Elastic stack release (e.g. ^7.13.0).

Related issues

Screenshots

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Jun 3, 2021

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@marc-gr marc-gr force-pushed the fortinet-eventoriginal branch 2 times, most recently from 5dd8a19 to 707d74d Compare June 3, 2021 12:26
@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Jun 3, 2021 •
edited
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: Pull request #1075 updated

  • Start Time: 2021-06-03T12:48:17.087+0000

  • Duration: 30 min 58 sec

  • Commit: 4ca5622

Test stats 🧪

Test Results
Failed 0
Passed 25
Skipped 0
Total 25

Trends 🧪

Image of Build Times

Image of Tests

@marc-gr marc-gr force-pushed the fortinet-eventoriginal branch from 707d74d to 4ca5622 Compare June 3, 2021 12:47
@marc-gr marc-gr mentioned this pull request Jun 3, 2021
Closed
43 tasks
P1llus
P1llus approved these changes Jun 3, 2021
View reviewed changes
Copy link
Copy Markdown
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.

LGTM, just a quick comment you should check first.

packages/fortinet/data_stream/firewall/agent/stream/tcp.yml.hbs
{{#if internal_interfaces.length}}
{{else}}
{{#if external_interfaces.length}}
processors:
Copy link
Copy Markdown
Member

@P1llus P1llus Jun 3, 2021

Choose a reason for hiding this comment

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

Is processors meant to be twice here?

packages/fortinet/data_stream/firewall/agent/stream/udp.yml.hbs
{{#if internal_interfaces.length}}
{{else}}
{{#if external_interfaces.length}}
processors:
Copy link
Copy Markdown
Member

@P1llus P1llus Jun 3, 2021

Choose a reason for hiding this comment

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

Is processors meant to be twice here?

Copy link
Copy Markdown
Contributor Author

@marc-gr marc-gr Jun 3, 2021

Choose a reason for hiding this comment

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

It is added only once, in case any of internal_interfaces and external_interfaces are set, otherwise processors can be empty and it was breaking the system tests. This if else if is needed since handlebars lacks an || operator.

@marc-gr marc-gr merged commit bd52635 into elastic:master Jun 3, 2021
@marc-gr marc-gr deleted the fortinet-eventoriginal branch June 3, 2021 14:25
@andrewkroh andrewkroh mentioned this pull request Jul 26, 2021
Closed
26 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@P1llus P1llus P1llus approved these changes

Assignees

No one assigned

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@marc-gr @elasticmachine @P1llus