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

Align elastic-agent-standalone manifest with the kubernetes package changes #29595

Conversation

tetianakravchenko
Copy link
Contributor

Signed-off-by: Tetiana Kravchenko [email protected]

What does this PR do?

In kubernetes package were added some data-streams configuration adjustments. This PR backports those changes to elastic-agent standalone manifest.

Why is it important?

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 23, 2021
@mergify
Copy link
Contributor

mergify bot commented Dec 23, 2021

This pull request does not have a backport label. Could you fix it @tetianakravchenko? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 23, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 23, 2021

💚 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: 2021-12-23T12:06:19.232+0000

  • Duration: 58 min 39 sec

  • Commit: 0040823

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Signed-off-by: Tetiana Kravchenko <[email protected]>
type: logs
prospector.scanner.symlinks: true
parsers:
- container:
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe we should keep the manifest as simple as possible and leave the defaults with not comments. The extra fields are documented for anyone who wants to change settings. I would just leave

parsers:
        - container: ~

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Defaults are all streams and auto format. See in https://github.com/elastic/integrations/blob/master/packages/kubernetes/data_stream/container_logs/manifest.yml#L27.
For filestream input if we don't set them like

- container: ~

it takes the defaults.
For additionalParsersConfig we just added the possibility for a user to add another parser via advanced options.
The default is still commented out.

Copy link
Contributor Author

@tetianakravchenko tetianakravchenko Dec 23, 2021

Choose a reason for hiding this comment

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

ah, ok, I understood what do you mean, I thought to set it the same way as done in the package, but you are right - in the end it is the same.
setting default values implicitly - 7c00ce9

@@ -482,7 +547,7 @@ spec:
- name: ES_PASSWORD
value: ""
- name: ES_HOST
value: ""
value: "elastic-package-stack_elasticsearch_1"
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this change intentional ? This is a proposed manifest and I don't think elastic-package-stack_elasticsearch_1 is of any value to a customer.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've already removed it - it was used to test locally

@tetianakravchenko tetianakravchenko added the Team:Integrations Label for the Integrations team label Dec 23, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 23, 2021
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

Thanks for working on this! I left one small comment about the skip_older which is mostly to provide option for disabling this and hence we should better avoid exposing this with the default value.

deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml Outdated Show resolved Hide resolved
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

🚀

@tetianakravchenko tetianakravchenko added enhancement backport-v8.1.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Dec 23, 2021
@tetianakravchenko tetianakravchenko merged commit 9b19aae into elastic:master Dec 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.1.0 Automated backport with mergify enhancement Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace logfile input with filestream in elastic agent's standalone Kubernetes manifest
4 participants