adding timeout options to cisco umbrella and fixing the missing confi…

…g options in module config.yml (elastic#22295)

filebeat/docs/modules/cisco.asciidoc

@@ -432,6 +432,15 @@ The ID for the access key used to read from the SQS queue.
 
 The secret token used for authenticating to the SQS queue.
 
+*`var.visibility_timeout`*::
+
+The duration that the received messages are hidden from ReceiveMessage request.
+Default to be 300 seconds.
+
+*`var.api_timeout`*::
+
+Maximum duration before AWS API request will be interrupted. Default to be 120 seconds.
+
 :has-dashboards!:
 
 :fileset_ex!:

x-pack/filebeat/filebeat.reference.yml

@@ -559,6 +559,21 @@ filebeat.modules:
     # "+02:00" for GMT+02:00
     # var.tz_offset: local
 
+  umbrella:
+    enabled: true
+
+    #var.input: s3
+    # AWS SQS queue url
+    #var.queue_url: https://sqs.us-east-1.amazonaws.com/ID/CiscoQueue
+    # Access ID to authenticate with the S3 input
+    #var.access_key_id: 123456
+    # Access key to authenticate with the S3 input
+    #var.secret_access_key: PASSWORD
+    # The duration that the received messages are hidden from ReceiveMessage request
+    #var.visibility_timeout: 300s
+    # Maximum duration before AWS API request will be interrupted
+    #var.api_timeout: 120s
+
 #--------------------------- Citrix NetScaler Module ---------------------------
 - module: citrix
   netscaler:

x-pack/filebeat/module/cisco/_meta/config.yml

@@ -89,3 +89,18 @@
     # "local" (default) for system timezone.
     # "+02:00" for GMT+02:00
     # var.tz_offset: local
+
+  umbrella:
+    enabled: true
+
+    #var.input: s3
+    # AWS SQS queue url
+    #var.queue_url: https://sqs.us-east-1.amazonaws.com/ID/CiscoQueue
+    # Access ID to authenticate with the S3 input
+    #var.access_key_id: 123456
+    # Access key to authenticate with the S3 input
+    #var.secret_access_key: PASSWORD
+    # The duration that the received messages are hidden from ReceiveMessage request
+    #var.visibility_timeout: 300s
+    # Maximum duration before AWS API request will be interrupted
+    #var.api_timeout: 120s

x-pack/filebeat/module/cisco/_meta/docs.asciidoc

@@ -427,6 +427,15 @@ The ID for the access key used to read from the SQS queue.
 
 The secret token used for authenticating to the SQS queue.
 
+*`var.visibility_timeout`*::
+
+The duration that the received messages are hidden from ReceiveMessage request.
+Default to be 300 seconds.
+
+*`var.api_timeout`*::
+
+Maximum duration before AWS API request will be interrupted. Default to be 120 seconds.
+
 :has-dashboards!:
 
 :fileset_ex!:

x-pack/filebeat/module/cisco/umbrella/config/input.yml

@@ -4,6 +4,8 @@ type: s3
 queue_url: {{ .queue_url }}
 access_key_id: {{ .access_key_id }}
 secret_access_key: {{ .secret_access_key }}
+visibility_timeout: {{ .visibility_timeout }}
+api_timeout: {{ .api_timeout }}
 
 {{ else if eq .input "file" }}
 

x-pack/filebeat/module/cisco/umbrella/manifest.yml

@@ -3,6 +3,10 @@ module_version: "1.0"
 var:
   - name: tags
     default: [cisco-umbrella, forwarded]
+  - name: visibility_timeout
+    default: 300
+  - name: api_timeout
+    default: 120
 
 ingest_pipeline: ingest/pipeline.yml
 input: config/input.yml

x-pack/filebeat/modules.d/cisco.yml.disabled

@@ -92,3 +92,18 @@
     # "local" (default) for system timezone.
     # "+02:00" for GMT+02:00
     # var.tz_offset: local
+
+  umbrella:
+    enabled: true
+
+    #var.input: s3
+    # AWS SQS queue url
+    #var.queue_url: https://sqs.us-east-1.amazonaws.com/ID/CiscoQueue
+    # Access ID to authenticate with the S3 input
+    #var.access_key_id: 123456
+    # Access key to authenticate with the S3 input
+    #var.secret_access_key: PASSWORD
+    # The duration that the received messages are hidden from ReceiveMessage request
+    #var.visibility_timeout: 300s
+    # Maximum duration before AWS API request will be interrupted
+    #var.api_timeout: 120s