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

Update Deployment and Devices integrations to ECS 8.17.0 (part 3) #12572

Merged
merged 8 commits into from
Feb 4, 2025

Conversation

taylor-swanson
Copy link
Contributor

@taylor-swanson taylor-swanson commented Feb 3, 2025

Proposed commit message

Updates the following integrations to ECS 8.17.0:

  • juniper_srx
  • modsecurity
  • netflow
  • osquery
  • panw
  • pfsense
  • proxysg

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.
  • I have verified that Kibana version constraints are current according to guidelines.
  • [ ] I have verified that any added dashboard complies with Kibana's Dashboard good practices

Related issues

@taylor-swanson taylor-swanson added enhancement New feature or request Integration:panw Palo Alto Next-Gen Firewall Integration:juniper_srx Juniper SRX Integration:netflow NetFlow Records Integration:modsecurity ModSecurity Audit Integration:pfsense pfSense Team:Security-Deployment and Devices Deployment and Devices Security team [elastic/sec-deployment-and-devices] Integration:osquery Osquery Logs Integration:proxysg Broadcom ProxySG labels Feb 3, 2025
@taylor-swanson taylor-swanson self-assigned this Feb 3, 2025
@taylor-swanson taylor-swanson marked this pull request as ready for review February 3, 2025 18:13
@taylor-swanson taylor-swanson requested a review from a team as a code owner February 3, 2025 18:13
@elasticmachine
Copy link

Pinging @elastic/sec-deployment-and-devices (Team:Security-Deployment and Devices)

Copy link
Contributor

@dwhyrock dwhyrock left a comment

Choose a reason for hiding this comment

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

Couple minor questions, otherwise LGTM.

@@ -406,14 +406,14 @@
]
},
{
"@timestamp": "2024-06-13T20:53:49.000-04:00",
"@timestamp": "2025-06-13T20:53:49.000-04:00",
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious why the date year is being updated here, but not in the file below (packages/pfsense/data_stream/log/_dev/test/pipeline/test-pfsense-ipsec.log-expected.json), even though they are both part of the pfsense package?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@timestamp is a weird field when it comes to pipeline tests.

The main issue is that (most) of these logs don't contain a year, so when the expected file generates, it gets whatever year the current year is. This works fine until the new year comes, and then the test will fail, since the pipeline will generate a document with the new year, but this no longer matches what is in the expected file.

The "solution" is to mark the @timestamp as a dynamic field (see test-common-config.yml). That config takes a regex pattern. You could do .*, but to make it slightly more robust, some integrations do some form of regex against the RFC3339 format, although it tends to miss things like the time zone offset at the end. What this does it it will validate the value of @timestamp against the pattern, but not the value in the expected file. Why it updates some of the entries and not all of them, I'm not sure. Technically, it's not supposed to update any of the values if the field is marked as dynamic.

type: keyword
- name: access_security_policy_reason
type: keyword
- name: appliance_name
Copy link
Contributor

Choose a reason for hiding this comment

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

Did these have negative effects being at the same level as fields: ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Functionally, they are the same thing, just a formatting change.

@@ -204,7 +204,7 @@
type: keyword
- name: icap_status
type: keyword
- name: certificate_hostname
Copy link
Contributor

Choose a reason for hiding this comment

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

🥇

@taylor-swanson taylor-swanson added Integration:panw Palo Alto Next-Gen Firewall Integration:juniper_srx Juniper SRX Integration:netflow NetFlow Records Integration:modsecurity ModSecurity Audit Integration:pfsense pfSense Integration:osquery Osquery Logs Integration:proxysg Broadcom ProxySG and removed Team:Security-Service Integrations Security Service Integrations Team [elastic/security-service-integrations] Integration:abnormal_security Abnormal Security labels Feb 4, 2025
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/juniper_srx
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/modsecurity
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/netflow
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/osquery
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/panw
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/pfsense
ECS version in build manifest changed from [email protected] to [email protected]. The set
ecs.version processor in pipelines was changed 8.17.0. Previously the pipeline
was setting version 8.11.0. The ecs.version in sample_event.json files was
changed to 8.17.0. Previously sample_event.json files contained 8.11.0.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.17.0 [email protected] -pr=1 packages/proxysg
@elasticmachine
Copy link

💚 Build Succeeded

History

  • 💚 Build #21610 succeeded f4a06652c6be41dc2b85cc575b097b3a93905090
  • 💚 Build #21485 succeeded 7e3e78e4b17a0c988e22e85d09a3bafcfed2cea6

cc @taylor-swanson

@taylor-swanson taylor-swanson merged commit 60807db into elastic:main Feb 4, 2025
5 checks passed
@taylor-swanson taylor-swanson deleted the ecs/8.17-part3 branch February 4, 2025 21:04
@elastic-vault-github-plugin-prod

Package juniper_srx - 1.22.0 containing this change is available at https://epr.elastic.co/package/juniper_srx/1.22.0/

@elastic-vault-github-plugin-prod

Package modsecurity - 1.19.0 containing this change is available at https://epr.elastic.co/package/modsecurity/1.19.0/

@elastic-vault-github-plugin-prod

Package netflow - 2.21.0 containing this change is available at https://epr.elastic.co/package/netflow/2.21.0/

@elastic-vault-github-plugin-prod

Package osquery - 1.20.0 containing this change is available at https://epr.elastic.co/package/osquery/1.20.0/

@elastic-vault-github-plugin-prod

Package panw - 5.1.0 containing this change is available at https://epr.elastic.co/package/panw/5.1.0/

@elastic-vault-github-plugin-prod

Package pfsense - 1.21.0 containing this change is available at https://epr.elastic.co/package/pfsense/1.21.0/

@elastic-vault-github-plugin-prod

Package proxysg - 0.5.0 containing this change is available at https://epr.elastic.co/package/proxysg/0.5.0/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Integration:juniper_srx Juniper SRX Integration:modsecurity ModSecurity Audit Integration:netflow NetFlow Records Integration:osquery Osquery Logs Integration:panw Palo Alto Next-Gen Firewall Integration:pfsense pfSense Integration:proxysg Broadcom ProxySG Team:Security-Deployment and Devices Deployment and Devices Security team [elastic/sec-deployment-and-devices]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants