From e83c38db2639dfce9f257648e8f5c384cd2148dc Mon Sep 17 00:00:00 2001
From: kaiyan-sheng <kaiyan.sheng@elastic.co>
Date: Thu, 9 Jul 2020 11:28:37 -0600
Subject: [PATCH] Add queue_url as a parameter for each individual log dataset

---
 packages/aws/dataset/cloudtrail/manifest.yml      | 8 ++++++++
 packages/aws/dataset/cloudwatch_logs/manifest.yml | 8 ++++++++
 packages/aws/dataset/ec2_logs/manifest.yml        | 8 ++++++++
 packages/aws/dataset/elb_logs/manifest.yml        | 8 ++++++++
 packages/aws/dataset/s3access/manifest.yml        | 8 ++++++++
 packages/aws/dataset/vpcflow/manifest.yml         | 8 ++++++++
 packages/aws/manifest.yml                         | 9 +--------
 7 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/packages/aws/dataset/cloudtrail/manifest.yml b/packages/aws/dataset/cloudtrail/manifest.yml
index d580bbfdc02..6d8978507fd 100644
--- a/packages/aws/dataset/cloudtrail/manifest.yml
+++ b/packages/aws/dataset/cloudtrail/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS CloudTrail logs
   description: Collect AWS CloudTrail logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
diff --git a/packages/aws/dataset/cloudwatch_logs/manifest.yml b/packages/aws/dataset/cloudwatch_logs/manifest.yml
index 2e422e7a90b..92d1e83edd6 100644
--- a/packages/aws/dataset/cloudwatch_logs/manifest.yml
+++ b/packages/aws/dataset/cloudwatch_logs/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS CloudWatch logs
   description: Collect AWS CloudWatch logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
\ No newline at end of file
diff --git a/packages/aws/dataset/ec2_logs/manifest.yml b/packages/aws/dataset/ec2_logs/manifest.yml
index ffbb9bd07da..49dfeff3752 100644
--- a/packages/aws/dataset/ec2_logs/manifest.yml
+++ b/packages/aws/dataset/ec2_logs/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS EC2 logs
   description: Collect AWS EC2 logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
\ No newline at end of file
diff --git a/packages/aws/dataset/elb_logs/manifest.yml b/packages/aws/dataset/elb_logs/manifest.yml
index ea68cbffba4..10a97bde23b 100644
--- a/packages/aws/dataset/elb_logs/manifest.yml
+++ b/packages/aws/dataset/elb_logs/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS ELB logs
   description: Collect AWS ELB logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
\ No newline at end of file
diff --git a/packages/aws/dataset/s3access/manifest.yml b/packages/aws/dataset/s3access/manifest.yml
index 0b1de6c258e..4ece87dcd81 100644
--- a/packages/aws/dataset/s3access/manifest.yml
+++ b/packages/aws/dataset/s3access/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS s3access logs
   description: Collect AWS s3access logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
\ No newline at end of file
diff --git a/packages/aws/dataset/vpcflow/manifest.yml b/packages/aws/dataset/vpcflow/manifest.yml
index 61d7ab60407..b764d129ea3 100644
--- a/packages/aws/dataset/vpcflow/manifest.yml
+++ b/packages/aws/dataset/vpcflow/manifest.yml
@@ -6,3 +6,11 @@ streams:
   template_path: s3.yml.hbs
   title: AWS vpcflow logs
   description: Collect AWS vpcflow logs using s3 input
+  vars:
+    - name: queue_url
+      type: text
+      title: Queue URL
+      multi: false
+      required: true
+      show_user: true
+      description: URL of the AWS SQS queue that messages will be received from.
\ No newline at end of file
diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
index c8026550e45..d3498ea7688 100644
--- a/packages/aws/manifest.yml
+++ b/packages/aws/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: aws
 title: AWS
-version: 0.1.1
+version: 0.1.2
 license: basic
 description: AWS Integration
 type: integration
@@ -133,13 +133,6 @@ config_templates:
     description: Collecting AWS CloudTrail, CloudWatch, EC2, ELB, S3 access logs and VPC flow logs
       logs
     vars:
-    - name: queue_url
-      type: text
-      title: Queue URL
-      multi: false
-      required: true
-      show_user: true
-      description: URL of the AWS SQS queue that messages will be received from.
     - name: visibility_timeout
       type: text
       title: Visibility Timeout