Skip to content

Commit

Permalink
adding timeout options to cisco umbrella and fixing the missing confi…
Browse files Browse the repository at this point in the history
…g options in module config.yml (#22295)
  • Loading branch information
P1llus authored Oct 30, 2020
1 parent 77882fc commit b18b333
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 0 deletions.
9 changes: 9 additions & 0 deletions filebeat/docs/modules/cisco.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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!:
Expand Down
15 changes: 15 additions & 0 deletions x-pack/filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 15 additions & 0 deletions x-pack/filebeat/module/cisco/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions x-pack/filebeat/module/cisco/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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!:
Expand Down
2 changes: 2 additions & 0 deletions x-pack/filebeat/module/cisco/umbrella/config/input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}

Expand Down
4 changes: 4 additions & 0 deletions x-pack/filebeat/module/cisco/umbrella/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 15 additions & 0 deletions x-pack/filebeat/modules.d/cisco.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b18b333

Please sign in to comment.