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.

Sign up for GitHub

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

Jump to bottom

Winlogbeat/Windows Services: changed default keystore path to program files #37237

Merged
merged 5 commits into from
Jan 2, 2024
Merged

Winlogbeat/Windows Services: changed default keystore path to program files #37237

merged 5 commits into from
Jan 2, 2024

Conversation

gustavofbreunig
Copy link
Contributor

Proposed commit message

If the user install winlogbeat accordingly the official documentation (executing install-service-winlogbeat.ps1), winlogbeat service will search for the keystore file into ProgramData (C:\ProgramData\winlogbeat), but, to create a keystore, it is expected to execute winlogbeat.exe keystore add inside Program Files, so, winlogbeat put the keystore into .\data (C:\Program Files\data)

Setting keystore path to $workdir (c:\program files) for any beats running as Windows Services solves this problem and don't affect users who do not use a keystore.

Version:
winlogbeat version 8.11.1 (amd64), libbeat 8.11.1

O.S: Windows

Related to issue #12315, which is stalled for many years.

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.

How to test this PR locally

mage package

Related issues

#12315

@gustavofbreunig gustavofbreunig requested a review from a team as a code owner November 29, 2023 16:34
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 29, 2023
@cla-checker-service CLA Checker Service
Copy link

cla-checker-service bot commented Nov 29, 2023 •
edited
Loading

💚 CLA has been signed

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 29, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @gustavofbreunig? 🙏.
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

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

Expand to view the summary

Build stats

  • Duration: 5 min 36 sec

🤖 GitHub comments

Expand to view the 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!)

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

Expand to view the summary

Build stats

  • Duration: 5 min 3 sec

🤖 GitHub comments

Expand to view the 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!)

@gustavofbreunig
Copy link
Contributor Author

/test

@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Nov 29, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 29, 2023
@gustavofbreunig
Copy link
Contributor Author

❌ Author of the following commits did not sign a Contributor Agreement: f99bef7, 1ce200e, eff72e8,

Please, read and sign the above mentioned agreement if you want to contribute to this project

Already signed the contributor agreement, not sure what I've done wrong

leehinman
leehinman requested changes Nov 30, 2023
View reviewed changes
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

Expand to view the summary

Build stats

  • Duration: 5 min 4 sec

🤖 GitHub comments

Expand to view the 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!)

@leehinman
Copy link
Contributor

/test

@leehinman
Copy link
Contributor

Already signed the contributor agreement, not sure what I've done wrong

did the email address you signed with match the email address in GitHub? That is the most common problem.

@elasticmachine
Copy link
Collaborator

💚 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-11-30T19:38:08.885+0000

  • Duration: 165 min 50 sec

Test stats 🧪

Test Results
Failed 0
Passed 28694
Skipped 2015
Total 30709

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@gustavofbreunig
Copy link
Contributor Author

/test

@gustavofbreunig
Copy link
Contributor Author

Already signed the contributor agreement, not sure what I've done wrong

did the email address you signed with match the email address in GitHub? That is the most common problem.

Thanks, all done.

@pierrehilbert
Copy link
Collaborator

@leehinman is it ready to be merged? (from what I can observe yes but prefer to double check).

@leehinman leehinman merged commit 204f37c into elastic:main Jan 2, 2024
113 checks passed
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
@gustavofbreunig @leehinman @Scholar-Li
Winlogbeat/Windows Services: changed default keystore path to program…
5d93143 
… files (elastic#37237)

* added keystore.path config to Windows service

---------

Co-authored-by: Gustavo Freddo Breunig <[email protected]>
Co-authored-by: Lee E Hinman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leehinman leehinman leehinman approved these changes

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

Assignees

@gustavofbreunig gustavofbreunig

Labels
Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gustavofbreunig @elasticmachine @leehinman @pierrehilbert