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 support for configurable retry options #12103

Merged
merged 4 commits into from
Dec 16, 2024

Conversation

ShourieG
Copy link
Contributor

Type of change

  • Enhancement

Proposed commit message

Added support for configurable retry options which was introduced in 8.16.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.
  • I have verified that any added dashboard complies with Kibana's Dashboard good practices

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

Screenshot 2024-12-13 at 10 06 49 PM

@ShourieG ShourieG requested a review from a team as a code owner December 13, 2024 17:05
@ShourieG ShourieG self-assigned this Dec 13, 2024
@ShourieG ShourieG added the Team:Security-Service Integrations Security Service Integrations Team [elastic/security-service-integrations] label Dec 13, 2024
@elasticmachine
Copy link

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@ShourieG ShourieG added integration Label used for meta issues tracking each integration enhancement New feature or request Integration:proofpoint_on_demand Proofpoint On Demand labels Dec 13, 2024
@elastic-vault-github-plugin-prod

🚀 Benchmarks report

To see the full report comment with /test benchmark fullreport

@@ -4,10 +4,19 @@ redact:
fields: ~
program: |
bytes(state.response).decode_json().as(body,{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should work without the bytes conversion.

Come to think of it, this program is equivalent (in the happy path) to the (very much cheaper) {"events":{"message":string(state.response)}}. This will not find invalid JSON, but that will be caught in ingest. (/cc @andrewkroh)

However, I'm unclear why this is being changed here.

Copy link
Contributor Author

@ShourieG ShourieG Dec 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@efd6, I missed this, will update. I was playing around with a couple of things but forgot to checkout.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted those changes, did not make any other changes here since it's out of scope for this PR.

@elasticmachine
Copy link

💚 Build Succeeded

History

cc @ShourieG

Copy link
Contributor

@efd6 efd6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits only

- name: min_wait_time
type: text
title: Minimum Wait Time
description: "The minimum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost. \nThis is a time duration value. Examples, 1s, 1m, 1h.\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: "The minimum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost. \nThis is a time duration value. Examples, 1s, 1m, 1h.\n"
description: |-
The minimum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost.
This is a time duration value. Examples, 1s, 1m, 1h.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elastic package format auto formats this. I had it similarly to your suggestion initially. Since I run a combined command for build this always happens.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

- name: max_wait_time
type: text
title: Maximum Wait Time
description: "The maximum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost. \nThis is a time duration value. Examples, 1s, 1m, 1h.\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: "The maximum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost. \nThis is a time duration value. Examples, 1s, 1m, 1h.\n"
description: |-
The maximum amount of time the agent will wait before attempting to reconnect to the websocket endpoint if the connection is lost.
This is a time duration value. Examples, 1s, 1m, 1h.

@ShourieG ShourieG merged commit 9b83436 into elastic:main Dec 16, 2024
5 checks passed
@ShourieG ShourieG deleted the proofpoint_demand/add_retry branch December 16, 2024 04:53
@elastic-vault-github-plugin-prod

Package proofpoint_on_demand - 1.2.0 containing this change is available at https://epr.elastic.co/package/proofpoint_on_demand/1.2.0/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Integration:proofpoint_on_demand Proofpoint On Demand integration Label used for meta issues tracking each integration Team:Security-Service Integrations Security Service Integrations Team [elastic/security-service-integrations]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants