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

Add vars in modules.d/aws.yml.disabled #27454

Merged
merged 4 commits into from
Aug 18, 2021
Merged

Add vars in modules.d/aws.yml.disabled #27454

merged 4 commits into from
Aug 18, 2021

Conversation

aspacca
Copy link

@aspacca aspacca commented Aug 18, 2021 •
edited
Loading

What does this PR do?

Adds new variables introduced in #27332 to aws.yml.disabled
It also adds missing/faulty metadata (bucket, region in s3 url) for the event when using S3 bucket listing directly

Why is it important?

In order to give visibility to the users about the availability of the new variables.

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@aspacca aspacca added the Team:Integrations Label for the Integrations team label Aug 18, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 18, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 18, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-08-18T10:50:50.649+0000

  • Duration: 112 min 22 sec

  • Commit: 3beb880

Test stats 🧪

Test Results
Failed 0
Passed 15155
Skipped 2313
Total 17468

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 15155
Skipped 2313
Total 17468

@aspacca aspacca requested a review from kaiyan-sheng August 18, 2021 08:19
@aspacca aspacca added backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify labels Aug 18, 2021
jsoriano
jsoriano approved these changes Aug 18, 2021
View reviewed changes
x-pack/filebeat/filebeat.reference.yml Outdated Show resolved Hide resolved
@aspacca aspacca merged commit b4ecc29 into elastic:master Aug 18, 2021
mergify bot pushed a commit that referenced this pull request Aug 18, 2021
Add vars in modules.d/aws.yml.disabled (#27454)
d92490f 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn

(cherry picked from commit b4ecc29)
@mergify mergify bot mentioned this pull request Aug 18, 2021
Merged
@ruflin ruflin added the backport-v7.14.0 Automated backport with mergify label Aug 18, 2021
@ruflin
Copy link
Collaborator

ruflin commented Aug 18, 2021

@kvch 7.14 branch has been created, please make sure the backport also happens there.

mergify bot pushed a commit that referenced this pull request Aug 18, 2021
Add vars in modules.d/aws.yml.disabled (#27454)
9357f95 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn

(cherry picked from commit b4ecc29)

# Conflicts:
#	filebeat/docs/modules/aws.asciidoc
#	x-pack/filebeat/input/awss3/acker.go
#	x-pack/filebeat/input/awss3/config.go
#	x-pack/filebeat/input/awss3/config_test.go
#	x-pack/filebeat/input/awss3/input.go
#	x-pack/filebeat/input/awss3/input_benchmark_test.go
#	x-pack/filebeat/input/awss3/input_integration_test.go
#	x-pack/filebeat/input/awss3/s3.go
#	x-pack/filebeat/input/awss3/s3_objects.go
#	x-pack/filebeat/input/awss3/s3_test.go
#	x-pack/filebeat/module/aws/_meta/docs.asciidoc
#	x-pack/filebeat/module/aws/cloudtrail/config/aws-s3.yml
#	x-pack/filebeat/module/aws/cloudtrail/manifest.yml
#	x-pack/filebeat/module/aws/cloudwatch/config/aws-s3.yml
#	x-pack/filebeat/module/aws/cloudwatch/manifest.yml
#	x-pack/filebeat/module/aws/ec2/config/aws-s3.yml
#	x-pack/filebeat/module/aws/ec2/manifest.yml
#	x-pack/filebeat/module/aws/elb/config/aws-s3.yml
#	x-pack/filebeat/module/aws/elb/manifest.yml
#	x-pack/filebeat/module/aws/s3access/config/aws-s3.yml
#	x-pack/filebeat/module/aws/s3access/manifest.yml
#	x-pack/filebeat/module/aws/vpcflow/config/input.yml
#	x-pack/filebeat/module/aws/vpcflow/manifest.yml
@mergify mergify bot mentioned this pull request Aug 18, 2021
Closed
mergify bot pushed a commit that referenced this pull request Aug 18, 2021
Add vars in modules.d/aws.yml.disabled (#27454)
e5b9c0e 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn

(cherry picked from commit b4ecc29)
@mergify mergify bot mentioned this pull request Aug 18, 2021
Merged
@aspacca aspacca removed the backport-v7.14.0 Automated backport with mergify label Aug 18, 2021
aspacca pushed a commit that referenced this pull request Aug 18, 2021
@mergify
Add vars in modules.d/aws.yml.disabled (#27454) (#27466)
ebe3921 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn

(cherry picked from commit b4ecc29)

Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>
aspacca pushed a commit that referenced this pull request Aug 18, 2021
@mergify
Add vars in modules.d/aws.yml.disabled (#27454) (#27462)
56156d9 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn

(cherry picked from commit b4ecc29)

Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
Add vars in modules.d/aws.yml.disabled (elastic#27454)
0019f24 
* Add vars in modules.d/aws.yml.disabled
* missing metadata
* rename bucket to bucket_arn
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

@kaiyan-sheng kaiyan-sheng Awaiting requested review from kaiyan-sheng

Assignees
No one assigned
Labels
backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aspacca @elasticmachine @ruflin @jsoriano