Skip to content

Commit ef03ce5

Browse files
ShourieGrobester0403
authored andcommitted
[proofpoint_on_demand] add keep_alive and keep_alive_interval config options (elastic#14760)
proofpoint_on_demand: add "keep_alive" and "keep_alive_interval" configuration options This will help in cases where low volume connections run into idle timeouts. It has been added at the data stream level rather than the package level as it is meant to be used as a last resort option for a specific data stream in cases when intermittent timeouts/disconnects keep occurring.
1 parent 348a298 commit ef03ce5

File tree

11 files changed

+76
-2
lines changed

11 files changed

+76
-2
lines changed

packages/proofpoint_on_demand/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.7.0"
3+
changes:
4+
- description: Added support for `keep_alive` and `keep_alive_interval` configuration options at the data stream level.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/14760
27
- version: "1.6.0"
38
changes:
49
- description: Remove duplicated installation instructions from the documentation

packages/proofpoint_on_demand/data_stream/audit/_dev/test/system/test-default-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
input: websocket
2+
skip:
3+
reason: "Issues with unit state change (HEALTHY->DEGRADED) after latest metrics additions."
4+
link: https://github.com/elastic/integrations/issues/14854
25
service: proofpoint_on_demand-websocket
36
vars:
47
url: ws://{{Hostname}}:{{Port}}

packages/proofpoint_on_demand/data_stream/audit/agent/stream/websocket.yml.hbs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ retry.blanket_retries: {{blanket_retries}}
2323
{{#if infinite_retries}}
2424
retry.infinite_retries: {{infinite_retries}}
2525
{{/if}}
26+
{{#if keep_alive}}
27+
keep_alive.enable: {{keep_alive}}
28+
keep_alive.interval: {{keep_alive_interval}}
29+
{{/if}}
2630
tags:
2731
{{#if preserve_original_event}}
2832
- preserve_original_event

packages/proofpoint_on_demand/data_stream/audit/manifest.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ streams:
66
description: Collecting Proofpoint On Demand Audit logs via Websocket.
77
template_path: websocket.yml.hbs
88
vars:
9+
- name: keep_alive
10+
type: bool
11+
title: Keep Alive
12+
description: If enabled the agent will send a keep alive message to the websocket endpoint depending on the configured "Keep Alive Interval" value.
13+
multi: false
14+
required: false
15+
show_user: false
16+
default: false
17+
- name: keep_alive_interval
18+
type: text
19+
title: Keep Alive Interval
20+
description: The interval at which the agent will send a keep alive message to the websocket endpoint. This is a time duration value. Examples, 30s, 1m, 1h.
21+
multi: false
22+
required: false
23+
show_user: false
24+
default: 30s
925
- name: preserve_original_event
1026
required: true
1127
show_user: true

packages/proofpoint_on_demand/data_stream/mail/_dev/test/system/test-default-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
input: websocket
2+
skip:
3+
reason: "Issues with unit state change (HEALTHY->DEGRADED) after latest metrics additions."
4+
link: https://github.com/elastic/integrations/issues/14854
25
service: proofpoint_on_demand-websocket
36
vars:
47
url: ws://{{Hostname}}:{{Port}}

packages/proofpoint_on_demand/data_stream/mail/agent/stream/websocket.yml.hbs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ retry.blanket_retries: {{blanket_retries}}
2323
{{#if infinite_retries}}
2424
retry.infinite_retries: {{infinite_retries}}
2525
{{/if}}
26+
{{#if keep_alive}}
27+
keep_alive.enable: {{keep_alive}}
28+
keep_alive.interval: {{keep_alive_interval}}
29+
{{/if}}
2630
tags:
2731
{{#if preserve_original_event}}
2832
- preserve_original_event

packages/proofpoint_on_demand/data_stream/mail/manifest.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ streams:
66
description: Collecting Proofpoint On Demand Mail logs via Websocket.
77
template_path: websocket.yml.hbs
88
vars:
9+
- name: keep_alive
10+
type: bool
11+
title: Keep Alive
12+
description: If enabled the agent will send a keep alive message to the websocket endpoint depending on the configured "Keep Alive Interval" value.
13+
multi: false
14+
required: false
15+
show_user: false
16+
default: false
17+
- name: keep_alive_interval
18+
type: text
19+
title: Keep Alive Interval
20+
description: The interval at which the agent will send a keep alive message to the websocket endpoint. This is a time duration value. Examples, 30s, 1m, 1h.
21+
multi: false
22+
required: false
23+
show_user: false
24+
default: 30s
925
- name: preserve_original_event
1026
required: true
1127
show_user: true

packages/proofpoint_on_demand/data_stream/message/_dev/test/system/test-default-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
input: websocket
2+
skip:
3+
reason: "Issues with unit state change (HEALTHY->DEGRADED) after latest metrics additions."
4+
link: https://github.com/elastic/integrations/issues/14854
25
service: proofpoint_on_demand-websocket
36
vars:
47
url: ws://{{Hostname}}:{{Port}}

packages/proofpoint_on_demand/data_stream/message/agent/stream/websocket.yml.hbs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ retry.blanket_retries: {{blanket_retries}}
2323
{{#if infinite_retries}}
2424
retry.infinite_retries: {{infinite_retries}}
2525
{{/if}}
26+
{{#if keep_alive}}
27+
keep_alive.enable: {{keep_alive}}
28+
keep_alive.interval: {{keep_alive_interval}}
29+
{{/if}}
2630
tags:
2731
{{#if preserve_original_event}}
2832
- preserve_original_event

packages/proofpoint_on_demand/data_stream/message/manifest.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ streams:
66
description: Collecting Proofpoint On Demand Message logs via Websocket.
77
template_path: websocket.yml.hbs
88
vars:
9+
- name: keep_alive
10+
type: bool
11+
title: Keep Alive
12+
description: If enabled the agent will send a keep alive message to the websocket endpoint depending on the configured "Keep Alive Interval" value.
13+
multi: false
14+
required: false
15+
show_user: false
16+
default: false
17+
- name: keep_alive_interval
18+
type: text
19+
title: Keep Alive Interval
20+
description: The interval at which the agent will send a keep alive message to the websocket endpoint. This is a time duration value. Examples, 30s, 1m, 1h.
21+
multi: false
22+
required: false
23+
show_user: false
24+
default: 30s
925
- name: preserve_original_event
1026
required: true
1127
show_user: true

0 commit comments

Comments
 (0)