Skip to content

[filebeat][winlog] implement status reporter for winlog input#40163

Merged
marc-gr merged 8 commits intoelastic:mainfrom
VihasMakwana:winlog-input-statusreporter
Jul 11, 2024
Merged

[filebeat][winlog] implement status reporter for winlog input#40163
marc-gr merged 8 commits intoelastic:mainfrom
VihasMakwana:winlog-input-statusreporter

Conversation

@VihasMakwana
Copy link
Copy Markdown
Contributor

@VihasMakwana VihasMakwana commented Jul 10, 2024 •
edited
Loading

Proposed commit message

Add StatusReporter for winlog input.

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.

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 10, 2024
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 10, 2024

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

@VihasMakwana VihasMakwana added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 10, 2024
@VihasMakwana VihasMakwana changed the title [DRAFT] implement status reporter for winlog [filebeat][winlog] implement status reporter for winlog input Jul 10, 2024
@VihasMakwana VihasMakwana marked this pull request as ready for review July 10, 2024 13:27
@VihasMakwana VihasMakwana requested a review from a team as a code owner July 10, 2024 13:27
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 10, 2024

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@VihasMakwana VihasMakwana requested a review from leehinman July 10, 2024 13:27
marc-gr
marc-gr reviewed Jul 10, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@marc-gr marc-gr left a comment

Choose a reason for hiding this comment

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

In the switch at https://github.com/elastic/beats/pull/40163/files#diff-6a618961acc22d5887cb9fd1844390de34b37bcf90b6ec247799b94d047b5d90L113 there are some non recoverable errors, should we also update the status in those cases?

Also a nit: we could reuse the error message as it is the same all along

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 10, 2024

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 winlog-input-statusreporter upstream/winlog-input-statusreporter
git merge upstream/main
git push upstream winlog-input-statusreporter

@VihasMakwana
Copy link
Copy Markdown
Contributor Author

VihasMakwana commented Jul 10, 2024

In the switch at https://github.com/elastic/beats/pull/40163/files#diff-6a618961acc22d5887cb9fd1844390de34b37bcf90b6ec247799b94d047b5d90L113 there are some non recoverable errors, should we also update the status in those cases?

Yes. I've updated the PR

Also a nit: we could reuse the error message as it is the same all along

you mean to create a variable and reuse?

@VihasMakwana VihasMakwana requested a review from marc-gr July 10, 2024 14:22
@marc-gr
Copy link
Copy Markdown
Contributor

marc-gr commented Jul 10, 2024

you mean to create a variable and reuse?

Yup

@VihasMakwana
Copy link
Copy Markdown
Contributor Author

VihasMakwana commented Jul 10, 2024

you mean to create a variable and reuse?

Yup

Done!

marc-gr
marc-gr approved these changes Jul 11, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@marc-gr marc-gr left a comment

Choose a reason for hiding this comment

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

disregard my last comment, misread the bit of code.

LGTM

@marc-gr marc-gr merged commit 5e4e7e5 into elastic:main Jul 11, 2024
@pierrehilbert pierrehilbert added the backport-8.15 Automated backport to the 8.15 branch with mergify label Jul 11, 2024
mergify bot pushed a commit that referenced this pull request Jul 11, 2024
@VihasMakwana @mergify
[filebeat][winlog] implement status reporter for winlog input (#40163)
8b30593 
* chore: implement status reporter for winlog

* fix: remove test file, add changelog

* chore: update changelog, add status reporting to swtich

* fix: lint

* chore: reuse same errors

* fix the error

(cherry picked from commit 5e4e7e5)
@mergify mergify bot mentioned this pull request Jul 11, 2024
Closed
6 tasks
@bjmcnic bjmcnic mentioned this pull request Oct 21, 2024
Closed
cmacknz added a commit to cmacknz/beats that referenced this pull request Oct 28, 2024
@cmacknz
Revert "[filebeat][winlog] implement status reporter for winlog input (…
1636258 
…elastic#40163)"

This reverts commit 5e4e7e5.
cmacknz added a commit that referenced this pull request Oct 28, 2024
@cmacknz
[8.16] Revert "[filebeat][winlog] implement status reporter for winlo…
05125a9 
…g input… (#41468)

* Revert "[filebeat][winlog] implement status reporter for winlog input (#40163)"

This reverts commit 5e4e7e5.

* Remove changelog entry.
mergify bot pushed a commit that referenced this pull request Nov 18, 2024
@cmacknz @mergify
[8.16] Revert "[filebeat][winlog] implement status reporter for winlo…
f0c5caa 
…g input… (#41468)

* Revert "[filebeat][winlog] implement status reporter for winlog input (#40163)"

This reverts commit 5e4e7e5.

* Remove changelog entry.

(cherry picked from commit 05125a9)
mergify bot pushed a commit that referenced this pull request Nov 18, 2024
@cmacknz @mergify
[8.16] Revert "[filebeat][winlog] implement status reporter for winlo…
cef4c5b 
…g input… (#41468)

* Revert "[filebeat][winlog] implement status reporter for winlog input (#40163)"

This reverts commit 5e4e7e5.

* Remove changelog entry.

(cherry picked from commit 05125a9)
cmacknz added a commit that referenced this pull request Nov 18, 2024
@mergify @cmacknz
[8.x](backport #41468) [8.16] Revert "[filebeat][winlog] implement st…
5316b5d 
…atus reporter for winlog input… (#41666)

* [8.16] Revert "[filebeat][winlog] implement status reporter for winlog input… (#41468)

* Revert "[filebeat][winlog] implement status reporter for winlog input (#40163)"

This reverts commit 5e4e7e5.

* Remove changelog entry.

(cherry picked from commit 05125a9)

* Fix changelog merge conflicts

* Restore accidentally removed entries

* Restore whitespace

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
cmacknz added a commit that referenced this pull request Nov 18, 2024
@mergify @cmacknz
[main](backport #41468) [8.16] Revert "[filebeat][winlog] implement s…
5d37c99 
…tatus reporter for winlog input… (#41665)

* [8.16] Revert "[filebeat][winlog] implement status reporter for winlog input… (#41468)

* Revert "[filebeat][winlog] implement status reporter for winlog input (#40163)"

This reverts commit 5e4e7e5.

* Remove changelog entry.

(cherry picked from commit 05125a9)

* Fix changelog merge conflicts

* Restore accidentally removed entries

* Remove correct changelog entry.

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marc-gr marc-gr marc-gr approved these changes

@leehinman leehinman Awaiting requested review from leehinman

Assignees

@VihasMakwana VihasMakwana

Labels

backport-8.15 Automated backport to the 8.15 branch with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Elastic Agent] The winlog input should report itself as Degraded when it encounters a permissions error

4 participants

@VihasMakwana @elasticmachine @marc-gr @pierrehilbert