Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Add config fields + defaults to the Elasticsearch output#246

Merged
faec merged 8 commits intoelastic:mainfrom
faec:es-config
Feb 21, 2023
Merged

Add config fields + defaults to the Elasticsearch output#246
faec merged 8 commits intoelastic:mainfrom
faec:es-config

Conversation

@faec
Copy link
Copy Markdown
Contributor

@faec faec commented Feb 14, 2023 •
edited
Loading

Support more timeout / retry options in the Elasticsearch shipper output and make the existing defaults more explicit, per #151.

Resolves #151

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.md or CHANGELOG-developer.md.

@faec faec requested a review from a team as a code owner February 14, 2023 18:38
@faec faec requested review from belimawr and rdner and removed request for a team February 14, 2023 18:38
@mergify mergify bot assigned faec Feb 14, 2023
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 14, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @faec? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@faec faec requested a review from leehinman February 14, 2023 18:40
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 14, 2023 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-02-16T17:25:47.134+0000

  • Duration: 19 min 42 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 15, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b es-config upstream/es-config
git merge upstream/main
git push upstream es-config

@faec
Copy link
Copy Markdown
Contributor Author

faec commented Feb 16, 2023

/test

@faec faec merged commit bbe6db2 into elastic:main Feb 21, 2023
@faec faec deleted the es-config branch February 21, 2023 15:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman

1 more reviewer

@belimawr belimawr belimawr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@faec faec

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Allow configuring the Elasticsearch output's timeouts and retry strategy

3 participants

@faec @elasticmachine @belimawr