Remove fargate from aws module config (#27575) (#27587)

(cherry picked from commit 4af52fc) Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
elastic · Aug 25, 2021 · 03c0648 · 03c0648
1 parent 64b4eed
commit 03c0648
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 177 deletions.
diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml
@@ -402,65 +402,6 @@ filebeat.modules:
     # The maximum number of messages to return from SQS. Valid values: 1 to 10.
     #var.max_number_of_messages: 5
 
-- module: aws
-  fargate:
-    enabled: false
-
-    # Filename of AWS credential file
-    # If not set "$HOME/.aws/credentials" is used on Linux/Mac
-    # "%UserProfile%\.aws\credentials" is used on Windows
-    #var.shared_credential_file: /etc/filebeat/aws_credentials
-
-    # Profile name for aws credential
-    # If not set the default profile is used
-    #var.credential_profile_name: fb-aws
-
-    # Use access_key_id, secret_access_key and/or session_token instead of shared credential file
-    #var.access_key_id: access_key_id
-    #var.secret_access_key: secret_access_key
-    #var.session_token: session_token
-
-    # The duration that the received messages are hidden from ReceiveMessage request
-    # Default to be 300s
-    #var.visibility_timeout: 300s
-
-    # Maximum duration before AWS API request will be interrupted
-    # Default to be 120s
-    #var.api_timeout: 120s
-
-    # Custom endpoint used to access AWS APIs
-    #var.endpoint: amazonaws.com
-
-    # AWS IAM Role to assume
-    #var.role_arn: arn:aws:iam::123456789012:role/test-mb
-
-    # ARN of the log group to collect logs from
-    #var.log_group_arn: arn:aws:logs:us-east-1:123456789012:log-group:test:*
-
-    # Name of the log group to collect logs from
-    #var.log_group_name: /ecs/test-log-group
-
-    # Region that the specified log group belongs to
-    #var.region_name: us-east-1
-
-    # A list of strings of log streams names that Filebeat collect log events from
-    #var.log_streams: ["/ecs/test-log-group/test-log-stream"]
-
-    # A string to filter the results to include only log events from log streams that have names starting with this prefix
-    #var.log_stream_prefix: /ecs/test-log-group/
-
-    # Specify if Filebeat should read log files from the beginning or from the end
-    # Default start_position is beginning
-    #var.start_position: beginning
-
-    # How often Filebeat checks for new log events from the specified log group
-    # Default scan_frequency is 1 minute
-    #var.scan_frequency: 1m
-
-    # Time used to sleep between AWS FilterLogEvents API calls inside the same collection period
-    # Default api_sleep is 200 ms
-    #var.api_sleep: 200ms
-
 #----------------------------- AWS Fargate Module -----------------------------
 - module: awsfargate
   log:

diff --git a/x-pack/filebeat/module/aws/_meta/config.yml b/x-pack/filebeat/module/aws/_meta/config.yml
@@ -304,62 +304,3 @@
 
     # The maximum number of messages to return from SQS. Valid values: 1 to 10.
     #var.max_number_of_messages: 5
-
-- module: aws
-  fargate:
-    enabled: false
-
-    # Filename of AWS credential file
-    # If not set "$HOME/.aws/credentials" is used on Linux/Mac
-    # "%UserProfile%\.aws\credentials" is used on Windows
-    #var.shared_credential_file: /etc/filebeat/aws_credentials
-
-    # Profile name for aws credential
-    # If not set the default profile is used
-    #var.credential_profile_name: fb-aws
-
-    # Use access_key_id, secret_access_key and/or session_token instead of shared credential file
-    #var.access_key_id: access_key_id
-    #var.secret_access_key: secret_access_key
-    #var.session_token: session_token
-
-    # The duration that the received messages are hidden from ReceiveMessage request
-    # Default to be 300s
-    #var.visibility_timeout: 300s
-
-    # Maximum duration before AWS API request will be interrupted
-    # Default to be 120s
-    #var.api_timeout: 120s
-
-    # Custom endpoint used to access AWS APIs
-    #var.endpoint: amazonaws.com
-
-    # AWS IAM Role to assume
-    #var.role_arn: arn:aws:iam::123456789012:role/test-mb
-
-    # ARN of the log group to collect logs from
-    #var.log_group_arn: arn:aws:logs:us-east-1:123456789012:log-group:test:*
-
-    # Name of the log group to collect logs from
-    #var.log_group_name: /ecs/test-log-group
-
-    # Region that the specified log group belongs to
-    #var.region_name: us-east-1
-
-    # A list of strings of log streams names that Filebeat collect log events from
-    #var.log_streams: ["/ecs/test-log-group/test-log-stream"]
-
-    # A string to filter the results to include only log events from log streams that have names starting with this prefix
-    #var.log_stream_prefix: /ecs/test-log-group/
-
-    # Specify if Filebeat should read log files from the beginning or from the end
-    # Default start_position is beginning
-    #var.start_position: beginning
-
-    # How often Filebeat checks for new log events from the specified log group
-    # Default scan_frequency is 1 minute
-    #var.scan_frequency: 1m
-
-    # Time used to sleep between AWS FilterLogEvents API calls inside the same collection period
-    # Default api_sleep is 200 ms
-    #var.api_sleep: 200ms
diff --git a/x-pack/filebeat/modules.d/aws.yml.disabled b/x-pack/filebeat/modules.d/aws.yml.disabled
@@ -307,62 +307,3 @@
 
     # The maximum number of messages to return from SQS. Valid values: 1 to 10.
     #var.max_number_of_messages: 5
-
-- module: aws
-  fargate:
-    enabled: false
-
-    # Filename of AWS credential file
-    # If not set "$HOME/.aws/credentials" is used on Linux/Mac
-    # "%UserProfile%\.aws\credentials" is used on Windows
-    #var.shared_credential_file: /etc/filebeat/aws_credentials
-
-    # Profile name for aws credential
-    # If not set the default profile is used
-    #var.credential_profile_name: fb-aws
-
-    # Use access_key_id, secret_access_key and/or session_token instead of shared credential file
-    #var.access_key_id: access_key_id
-    #var.secret_access_key: secret_access_key
-    #var.session_token: session_token
-
-    # The duration that the received messages are hidden from ReceiveMessage request
-    # Default to be 300s
-    #var.visibility_timeout: 300s
-
-    # Maximum duration before AWS API request will be interrupted
-    # Default to be 120s
-    #var.api_timeout: 120s
-
-    # Custom endpoint used to access AWS APIs
-    #var.endpoint: amazonaws.com
-
-    # AWS IAM Role to assume
-    #var.role_arn: arn:aws:iam::123456789012:role/test-mb
-
-    # ARN of the log group to collect logs from
-    #var.log_group_arn: arn:aws:logs:us-east-1:123456789012:log-group:test:*
-
-    # Name of the log group to collect logs from
-    #var.log_group_name: /ecs/test-log-group
-
-    # Region that the specified log group belongs to
-    #var.region_name: us-east-1
-
-    # A list of strings of log streams names that Filebeat collect log events from
-    #var.log_streams: ["/ecs/test-log-group/test-log-stream"]
-
-    # A string to filter the results to include only log events from log streams that have names starting with this prefix
-    #var.log_stream_prefix: /ecs/test-log-group/
-
-    # Specify if Filebeat should read log files from the beginning or from the end
-    # Default start_position is beginning
-    #var.start_position: beginning
-
-    # How often Filebeat checks for new log events from the specified log group
-    # Default scan_frequency is 1 minute
-    #var.scan_frequency: 1m
-
-    # Time used to sleep between AWS FilterLogEvents API calls inside the same collection period
-    # Default api_sleep is 200 ms
-    #var.api_sleep: 200ms