Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 16, 2025

Type of change

  • Bug

Proposed commit message

Currently content-type "text/csv" did not have official filtering
support even though we support  csv decoding. This made blobs having this
content type defined were not picked up for processing. This PR as a "bugfix",
adds support for explicit "text/csv" content-type filtering in the
scheduler. 

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #44824 done by [Mergify](https://mergify.com).

#44824)

Currently content-type "text/csv" did not have official filtering
support even though we support  csv decoding. This made blobs having this
content type defined were not picked up for processing. This PR as a "bugfix",
adds support for explicit "text/csv" content-type filtering in the
scheduler.

(cherry picked from commit fba3749)

# Conflicts:
#	x-pack/filebeat/input/azureblobstorage/input_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 16, 2025
@mergify mergify bot requested a review from a team as a code owner June 16, 2025 11:08
@mergify
Copy link
Contributor Author

mergify bot commented Jun 16, 2025

Cherry-pick of fba3749 has failed:

On branch mergify/bp/8.19/pr-44824
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit fba374986.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/input/azureblobstorage/mock/data_files.go
	modified:   x-pack/filebeat/input/azureblobstorage/mock/mock.go
	new file:   x-pack/filebeat/input/azureblobstorage/testdata/txn1.csv
	modified:   x-pack/filebeat/input/azureblobstorage/types.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/azureblobstorage/input_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 16, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 16, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

updated for backward compatibility
@mergify
Copy link
Contributor Author

mergify bot commented Jun 17, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-44824 upstream/mergify/bp/8.19/pr-44824
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-44824

@ShourieG ShourieG removed the conflicts There is a conflict in the backported pull request label Jun 17, 2025
@ShourieG ShourieG merged commit f65bd08 into 8.19 Jun 17, 2025
29 of 32 checks passed
@ShourieG ShourieG deleted the mergify/bp/8.19/pr-44824 branch June 17, 2025 10:49
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