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

chore(release): merge develop into main branch #838

Merged
merged 6 commits into from
May 15, 2024
Merged

chore(release): merge develop into main branch #838

merged 6 commits into from
May 15, 2024

Conversation

artemrys
Copy link
Member

Making a new release of PSA.

harshilgajera-crest and others added 6 commits April 19, 2024 16:43
There was a bug in PSA where if in splunk_ingest_data first worker
errors out or throws exception then it does not write to a file, now
other workers would be waiting indefinitely for the file to be present,
So the execution would continue in infinitly.

To handle this scenario, we can handle the exception thrown by the first
worker and make sure that in any case it writes to a file, so that other
workers don't wait indefinitly
## [5.2.6-beta.1](v5.2.5...v5.2.6-beta.1) (2024-04-19)

### Bug Fixes

* handling infinite loop ([#812](#812)) ([d3111a6](d3111a6))
At the end of the test suite file _event is deleted, but _event.lock is
not. This PR fixes it
Current regex for data models support only basic ipv6 regex.

Support for advanced representation of ipv6 is required, hence this pr
supports that.

ref: ipv6 represenation -
https://en.wikipedia.org/wiki/IPv6#Address_representation

Tested it with gcp addon which as combination of ipv4 and v6 samples in
host fields, also tested it on
splunk/splunk-add-on-for-okta-identity-cloud#261
where advanced ipv6 represenation is present

Added e2e test which tests extraction of some ipv6 formats using src_ip
and dest_ip fields in network_traffic data model

Tested regex with below samples:
Regex :
`(?:(?:::ffff:)|(?:[0-9a-fA-F]{1,4}:){6}ffff:)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|(?>([a-f0-9]{1,4})(?>:(?1)){7}|(?!(?:.[a-f0-9](?>:|$)){8,})^((?1)(?>:(?1)){0,6})?::(?2)?(?!(?:.[a-f0-9](?>:|$))))|(?>(?>(?1)(?>:(?1)){5}:|(?!(?:.*[a-f0-9]:){6,})(?3)?::(?>((?1)(?>:(?1)){0,4}):)?)?(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(?>\.(?4)){3})`

1234::
2001:db8::
::1334
::
::1325
2001:0db8::1:2:3456
2001::1:2:3
2001:db8::1:2
::ffff:192.168.1.1
::
::ffff:192.168.1.112
::1
2001:0db8::1:2:3
0000:0000:0000:0000:0000:0000:0000:0001
ff02:0000:0000:0000:0000:0000:0000:0001
fe80:0000:0000:0000:a299:9bff:fe18:50d1
2001:0db8:1111:000a:00b0:0000:9000:0200
2001:0db8:0000:0000:abcd:0000:0000:1234
2001:0db8:cafe:0001:0000:0000:0000:0100
2001:0db8:cafe:0001:0000:0000:0000:0200
2001:db80:1000:a000:0000:bc00:abcd:d0b0
1:2:3:4:5:6:7::
fe80::a299:9bff:fe18:50d1
::3212
::1212
2001::abcd::1234
2001:db80:1000:a000:0000:bc00:abcd:d0b0
2001::abcd
2001:0000:0000:0000:abcd:0000:0000:1234
2001:0000:0000:abcd:0000:0000:0000:1234
2001:0000:abcd:0000:0000:0000:0000:1234
2001:db8:1111:a:b0:0:9000:200
fe80:0:0:0:a299:9bff:fe18:50d1
0:0:0:0:0:0:0:1
0000:0000:0000:0000:0000:0000:0000:0001
0:0:0:0:0:0:ffff:192.168.10.10
2001:0000:0000:0000:0000:abcd:0000:1
::ffff:192.168.10.10
2001:0db8::1:2:3
@artemrys artemrys marked this pull request as ready for review May 15, 2024 06:54
@artemrys artemrys requested review from a team as code owners May 15, 2024 06:54
@artemrys artemrys merged commit fe1d31d into main May 15, 2024
66 of 69 checks passed
@artemrys artemrys deleted the develop branch May 15, 2024 07:46
@github-actions github-actions bot locked and limited conversation to collaborators May 15, 2024
@github-actions github-actions bot locked and limited conversation to collaborators May 15, 2024
@srv-rr-github-token
Copy link
Contributor

🎉 This PR is included in version 5.2.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants