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

Jump to bottom

[Filebeat] Add Cloudflare R2 to provider list #32620

Merged
merged 3 commits into from
Aug 23, 2022
Merged

[Filebeat] Add Cloudflare R2 to provider list #32620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
446912e
Add Cloudflare R2 to provider list in AWS S3 input
legoguy1000 Aug 7, 2022
1bfcdca
update unit tests
legoguy1000 Aug 7, 2022
a0ade6e
update changelog
legoguy1000 Aug 7, 2022
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 @@ -119,6 +119,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
- Checkpoint module: add authentication operation outcome enrichment. {issue}32230[32230] {pull}32431[32431]
- add documentation for decode_xml_wineventlog processor field mappings. {pull}32456[32456]
- httpjson input: Add request tracing logger. {issue}32402[32402] {pull}32412[32412]
- Add cloudflare R2 to provider list in AWS S3 input. {pull}32620[32620]

*Auditbeat*

Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/input/awss3/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ func getProviderFromDomain(endpoint string, ProviderOverride string) string {
"c2s.ic.gov": "aws",
"amazonaws.com.cn": "aws",
"backblazeb2.com": "backblaze",
"cloudflarestorage.com": "cloudflare",
"wasabisys.com": "wasabi",
"digitaloceanspaces.com": "digitalocean",
"dream.io": "dreamhost",
Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/input/awss3/input_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ func TestGetProviderFromDomain(t *testing.T) {
assert.Equal(t, "aws", getProviderFromDomain("c2s.ic.gov", ""))
assert.Equal(t, "aws", getProviderFromDomain("amazonaws.com.cn", ""))
assert.Equal(t, "backblaze", getProviderFromDomain("https://backblazeb2.com", ""))
assert.Equal(t, "cloudflare", getProviderFromDomain("https://1234567890.r2.cloudflarestorage.com", ""))
assert.Equal(t, "wasabi", getProviderFromDomain("https://wasabisys.com", ""))
assert.Equal(t, "digitalocean", getProviderFromDomain("https://digitaloceanspaces.com", ""))
assert.Equal(t, "dreamhost", getProviderFromDomain("https://dream.io", ""))
Expand Down