[aws_logs] fix number_of_workers to be always passed in hbs template (#14416)

Author: mykola-elastic

packages/aws_logs/_dev/build/docs/README.md

@@ -14,7 +14,7 @@ expensive in terms of performance and costs and should be preferably used only
 when no SQS notification can be attached to the S3 buckets. This input 
 integration also supports S3 notification from SNS to SQS.
 
-You can enable SQS notification method by setting `queue_url` configuration value.
+You can enable SQS notification method by setting `queue_url` and `number_of_workers` configuration values.
 You can enable S3 bucket list polling method by setting `bucket_arn`, `access_point_arn`
 or `non_aws_bucket_name` configuration values and `number_of_workers` value.
 

packages/aws_logs/changelog.yml

@@ -1,3 +1,8 @@
+- version: "1.8.1"
+  changes:
+    - description: Fix handling of SQS worker count configuration.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/14416
 - version: "1.8.0"
   changes:
     - description: Add support to configure start_timestamp and ignore_older configurations for AWS S3 backed inputs.

packages/aws_logs/data_stream/generic/agent/stream/aws-cloudwatch.yml.hbs

@@ -20,9 +20,6 @@ log_group_name_prefix: {{ log_group_name_prefix }}
 {{#if include_linked_accounts_with_prefix }}
 include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
 {{/if}}
-{{#if number_of_workers }}
-number_of_workers: {{ number_of_workers }}
-{{/if}}
 {{/unless}}
 {{/unless}}
 
@@ -50,6 +47,10 @@ log_stream_prefix: {{ log_stream_prefix }}
 {{/if}}
 {{/unless}}
 
+{{#if number_of_workers }}
+number_of_workers: {{ number_of_workers }}
+{{/if}}
+
 {{#if start_position }}
 start_position: {{ start_position }}
 {{/if}}

packages/aws_logs/data_stream/generic/agent/stream/aws-s3.yml.hbs

@@ -27,9 +27,6 @@ When using an S3 bucket, you can specify only one of the following options:
 }}
 
 {{! shared S3 bucket polling options }}
-{{#if number_of_workers }}
-number_of_workers: {{ number_of_workers }}
-{{/if}}
 
 {{#if start_timestamp}}
 start_timestamp: {{start_timestamp}}
@@ -76,6 +73,10 @@ access_point_arn: {{ access_point_arn }}
 
 {{/unless}}{{! end S3 bucket polling }}
 
+{{! allows number of workers to be configured for SQS queue and S3 buckets}}
+{{#if number_of_workers }}
+number_of_workers: {{ number_of_workers }}
+{{/if}}
 {{#if buffer_size }}
 buffer_size: {{ buffer_size }}
 {{/if}}

packages/aws_logs/data_stream/generic/manifest.yml

@@ -179,12 +179,12 @@ streams:
         description: ARN of the AWS S3 Access Point that will be polled for list operation. (This is an alternative to the Bucket ARN, and required when `queue_url`, `bucket_arn` or `non_aws_bucket_name` are not set).
       - name: number_of_workers
         type: integer
-        title: Number of Workers
+        title: "[S3/SQS] Number of Workers"
         multi: false
         required: false
         default: 1
         show_user: true
-        description: Number of workers that will process the S3 objects listed. (Required when `bucket_arn` or `access_point_arn` are set).
+        description: Number of workers that will process the S3 objects listed.
       - name: start_timestamp
         type: text
         title: "Start Timestamp"

packages/aws_logs/docs/README.md

@@ -14,7 +14,7 @@ expensive in terms of performance and costs and should be preferably used only
 when no SQS notification can be attached to the S3 buckets. This input 
 integration also supports S3 notification from SNS to SQS.
 
-You can enable SQS notification method by setting `queue_url` configuration value.
+You can enable SQS notification method by setting `queue_url` and `number_of_workers` configuration values.
 You can enable S3 bucket list polling method by setting `bucket_arn`, `access_point_arn`
 or `non_aws_bucket_name` configuration values and `number_of_workers` value.
 

packages/aws_logs/manifest.yml

@@ -3,7 +3,7 @@ name: aws_logs
 title: Custom AWS Logs
 description: Collect raw logs from AWS S3 or CloudWatch with Elastic Agent.
 type: integration
-version: "1.8.0"
+version: "1.8.1"
 categories:
   - cloud
   - observability