Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[proofpoint_on_demand] - Added new advanced config options for blanket & infinite retries and updated default retry values #12419

Merged
merged 2 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/proofpoint_on_demand/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.4.0"
changes:
- description: Added new advanced config options for blanket & infinite retries while updating default retry values.
type: enhancement
link: https://github.com/elastic/integrations/pull/12419
- version: "1.3.1"
changes:
- description: Defensively copy list parameters in 'Set ECS categorization fields' script.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ retry.wait_min: {{min_wait_time}}
{{#if max_wait_time}}
retry.wait_max: {{max_wait_time}}
{{/if}}
{{#if blanket_retries}}
retry.blanket_retries: {{blanket_retries}}
{{/if}}
{{#if infinite_retries}}
retry.infinite_retries: {{infinite_retries}}
{{/if}}
tags:
{{#if preserve_original_event}}
- preserve_original_event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ retry.wait_min: {{min_wait_time}}
{{#if max_wait_time}}
retry.wait_max: {{max_wait_time}}
{{/if}}
{{#if blanket_retries}}
retry.blanket_retries: {{blanket_retries}}
{{/if}}
{{#if infinite_retries}}
retry.infinite_retries: {{infinite_retries}}
{{/if}}
tags:
{{#if preserve_original_event}}
- preserve_original_event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ retry.wait_min: {{min_wait_time}}
{{#if max_wait_time}}
retry.wait_max: {{max_wait_time}}
{{/if}}
{{#if blanket_retries}}
retry.blanket_retries: {{blanket_retries}}
{{/if}}
{{#if infinite_retries}}
retry.infinite_retries: {{infinite_retries}}
{{/if}}
tags:
{{#if preserve_original_event}}
- preserve_original_event
Expand Down
24 changes: 20 additions & 4 deletions packages/proofpoint_on_demand/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
format_version: 3.1.4
name: proofpoint_on_demand
title: Proofpoint On Demand
version: 1.3.1
version: 1.4.0
description: Collect logs from Proofpoint On Demand with Elastic Agent.
type: integration
categories:
- security
conditions:
kibana:
version: ^8.16.0
version: "^8.16.3 || ^8.17.1"
elastic:
subscription: basic
icons:
Expand Down Expand Up @@ -69,7 +69,7 @@ policy_templates:
multi: false
required: false
show_user: true
default: 5
default: 10
- name: min_wait_time
type: text
title: Minimum Wait Time
Expand All @@ -85,7 +85,23 @@ policy_templates:
multi: false
required: false
show_user: true
default: 180s
default: 1h
- name: blanket_retries
type: bool
title: Blanket Retries
description: If enabled the agent will retry connection attempts irrespective of the type of connection/network error.
multi: false
required: false
show_user: false
default: false
- name: infinite_retries
type: bool
title: Infinite Retries
description: If enabled the agent will retry connection attempts indefinitely irrespective of the "Maximum Reconnect Attempts" value.
multi: false
required: false
show_user: false
default: false
owner:
github: elastic/security-service-integrations
type: elastic