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

[8.5](backport #1286) Fix: Windows Agent Left Unhealthy After Removing Endpoint Integration #1598

Merged
merged 2 commits into from
Oct 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2022

This is an automatic backport of pull request #1286 done by Mergify.
Cherry-pick of a8ad2da has failed:

On branch mergify/bp/8.5/pr-1286
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit a8ad2da852.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1666611696-fix_service_stop_timeout.yaml
	modified:   internal/pkg/agent/operation/monitoring.go
	modified:   internal/pkg/agent/operation/monitoring_test.go
	modified:   internal/pkg/agent/program/spec.go
	modified:   internal/pkg/agent/program/spec_test.go
	modified:   internal/pkg/core/plugin/service/app.go
	modified:   internal/spec/endpoint.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/program/supported.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#1286)

* Add stop timeout to the endpoint spec
* Service watcher
* Wire in the service watcher
* Remove waiting on the service stop since Endpoint should not be stopped

(cherry picked from commit a8ad2da)

# Conflicts:
#	internal/pkg/agent/program/supported.go
@mergify mergify bot requested a review from a team as a code owner October 24, 2022 18:27
@mergify mergify bot requested review from aleksmaus and michalpristas and removed request for a team October 24, 2022 18:27
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 24, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 24, 2022

💚 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: 2022-10-24T19:16:12.033+0000

  • Duration: 18 min 39 sec

Test stats 🧪

Test Results
Failed 0
Passed 4991
Skipped 17
Total 5008

💚 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.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

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

@elasticmachine
Copy link
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 97.333% (73/75) 👍
Files 67.797% (160/236) 👍
Classes 68.182% (315/462) 👍
Methods 52.471% (892/1700) 👍
Lines 38.748% (9608/24796) 👎 -0.028
Conditionals 100.0% (0/0) 💚

@aleksmaus aleksmaus merged commit 2375a6e into 8.5 Oct 25, 2022
@aleksmaus aleksmaus deleted the mergify/bp/8.5/pr-1286 branch October 25, 2022 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants