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

filebeat/module/{iis,o365}: Fix uri_parts ingest pipeline processor output wrong extension #38216

Merged
merged 8 commits into from
Mar 13, 2024
Merged

filebeat/module/{iis,o365}: Fix uri_parts ingest pipeline processor output wrong extension #38216

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
829d677
Fix incorrect values in url-extensions
muthu-mps Mar 7, 2024
ac306a9
add changelog entry
muthu-mps Mar 7, 2024
f3a4708
Merge branch 'main' into url-extension-value-fix
muthu-mps Mar 7, 2024
42c867d
updated the effected version in snapshots.yml
apmmachine Mar 8, 2024
07480b2
Merge branch 'main' into url-extension-value-fix
muthu-mps Mar 11, 2024
defd660
Merge branch 'main' into url-extension-value-fix
muthu-mps Mar 12, 2024
5404033
Merge branch 'main' into url-extension-value-fix
muthu-mps Mar 13, 2024
8c88e40
Update CHANGELOG.next.asciidoc
muthu-mps Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ fields added to events containing the Beats version. {pull}37553[37553]
- Prevent HTTPJSON holding response bodies between executions. {issue}35219[35219] {pull}38116[38116]
- Fix "failed processing S3 event for object key" error on aws-s3 input when key contains the "+" character {issue}38012[38012] {pull}38125[38125]
- Fix duplicated addition of regexp extension in CEL input. {pull}38181[38181]
- Fix the incorrect values generated by url_parts processor. {pull}38216[38216]
muthu-mps marked this conversation as resolved.
Show resolved Hide resolved

*Heartbeat*

Expand Down
4 changes: 1 addition & 3 deletions filebeat/module/iis/error/test/iis_error_url.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"source.geo.region_name": "England",
"source.ip": "81.2.69.145",
"source.port": 12345,
"url.extension": "1",
"url.original": "12.2.1",
"url.path": "12.2.1"
},
Expand Down Expand Up @@ -83,7 +82,6 @@
"source.geo.region_name": "England",
"source.ip": "81.2.69.145",
"source.port": 12345,
"url.extension": "/",
"url.original": "./././././../../../../../../../../",
"url.path": "./././././../../../../../../../../"
},
Expand Down Expand Up @@ -343,4 +341,4 @@
"url.original": "/fee&fie=foe",
"url.path": "/fee&fie=foe"
}
]
]
6 changes: 3 additions & 3 deletions testing/environments/snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-74a79bf3-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-b9699c81-SNAPSHOT
# When extend is used it merges healthcheck.tests, see:
# https://github.com/docker/compose/issues/8962
# healthcheck:
Expand Down Expand Up @@ -31,7 +31,7 @@ services:
- "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"

logstash:
image: docker.elastic.co/logstash/logstash:8.14.0-74a79bf3-SNAPSHOT
image: docker.elastic.co/logstash/logstash:8.14.0-b9699c81-SNAPSHOT
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
Expand All @@ -44,7 +44,7 @@ services:
- 5055:5055

kibana:
image: docker.elastic.co/kibana/kibana:8.14.0-74a79bf3-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.14.0-b9699c81-SNAPSHOT
environment:
- "ELASTICSEARCH_USERNAME=kibana_system_user"
- "ELASTICSEARCH_PASSWORD=testing"
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/module/o365/audit/test/13-dlp-exchange.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@
"forwarded"
],
"url.domain": "example.net",
"url.extension": "com/sharepoint",
"url.original": "https://example.net/testsiem2.onmicrosoft.com/sharepoint",
"url.path": "/testsiem2.onmicrosoft.com/sharepoint",
"url.scheme": "https",
Expand All @@ -801,4 +800,4 @@
"user.id": "[email protected]",
"user.name": "alice"
}
]
]
Loading