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

Cherry-pick #17166 to 7.7: [Filebeat] Use s3.yml as config name to match config/{{.input}}.yml in manifest.yml #17266

Merged
merged 1 commit into from
Mar 26, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Mar 26, 2020

Cherry-pick of PR #17166 to 7.7 branch. Original message:

This PR is to replace ec2/config/ec2.yml to ec2/config/s3.yml.

Without the change, if you run ./filebeat -e with filebeat.yml look like below:

filebeat.modules:
  - module: aws
    cloudtrail:
      enabled: true
      var.queue_url: https://sqs.us-east-1.amazonaws.com/428152502467/test-fb-ks
      var.credential_profile_name: elastic-beats
      var.visibility_timeout: 300s
      var.endpoint: amazonaws.com

output.elasticsearch:
  hosts: ["localhost:9200"]

You will get an error message:

2020-03-20T14:57:07.048-0600    ERROR   instance/beat.go:920    Exiting: Error getting config for fileset aws/ec2: Error reading input file config/s3.yml: open /Users/kaiyansheng/go/src/github.com/elastic/beats/x-pack/filebeat/module/aws/ec2/config/s3.yml: no such file or directory
Exiting: Error getting config for fileset aws/ec2: Error reading input file config/s3.yml: open /Users/kaiyansheng/go/src/github.com/elastic/beats/x-pack/filebeat/module/aws/ec2/config/s3.yml: no such file or directory

In this PR, I also replaced cloudtrail.yml and cloudwatch.yml with s3.yml so it matches config/{{.input}}.yml in manifest.yml file to be consistent with the rest of the filesets in aws.

@kaiyan-sheng kaiyan-sheng self-assigned this Mar 26, 2020
@kaiyan-sheng kaiyan-sheng added the Team:Platforms Label for the Integrations - Platforms team label Mar 26, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@kaiyan-sheng kaiyan-sheng merged commit 19c141a into elastic:7.7 Mar 26, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_17166_7.7 branch March 26, 2020 18:16
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport review Team:Platforms Label for the Integrations - Platforms team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants