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

Port "Improve shutdown logs" from 8.5 back to main #1930

Merged
merged 3 commits into from
Dec 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2022

This is an automatic backport of pull request #1627 done by Mergify.
Cherry-pick of 567f9e2 has failed:

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

You are currently cherry-picking commit 567f9e2dce.
  (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/1666789812-Improve-shutdown-logs.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/agent/application/actions/handlers/handler_action_settings.go
	both modified:   internal/pkg/agent/application/upgrade/upgrade.go
	both modified:   internal/pkg/agent/cmd/run.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

(cherry picked from commit 72a4f61)

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 567f9e2)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/agent/application/actions/handlers/handler_action_settings.go
#	internal/pkg/agent/application/upgrade/upgrade.go
#	internal/pkg/agent/cmd/run.go
@mergify mergify bot requested a review from a team as a code owner December 12, 2022 17:00
@mergify mergify bot removed the request for review from a team December 12, 2022 17:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 12, 2022
@mergify mergify bot requested review from aleksmaus and michalpristas December 12, 2022 17:00
@cmacknz
Copy link
Member

cmacknz commented Dec 12, 2022

We lost the changes in https://github.com/elastic/elastic-agent/pull/1618/files as part of the V2 merge. Bringing these changes forward from the 8.5 branch.

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 12, 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-12-12T22:19:35.311+0000

  • Duration: 17 min 31 sec

Test stats 🧪

Test Results
Failed 0
Passed 4665
Skipped 13
Total 4678

💚 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!)

@cmacknz cmacknz changed the title [main](backport #1627) [8.5](backport #1618) Improve shutdown logs [main] Port "Improve shutdown logs" from 8.5 back to main Dec 12, 2022
@cmacknz cmacknz changed the title [main] Port "Improve shutdown logs" from 8.5 back to main Port "Improve shutdown logs" from 8.5 back to main Dec 12, 2022
@cmacknz cmacknz added backport-v8.5.0 Automated backport with mergify backport-v8.6.0 Automated backport with mergify and removed backport-v8.5.0 Automated backport with mergify labels Dec 12, 2022
@cmacknz cmacknz requested a review from AndersonQ December 12, 2022 18:36
}

u.log.Infow("Restarting after upgrade",
"new_version", release.Version(),
Copy link
Member

Choose a reason for hiding this comment

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

I think this is probably reversed, example from a recent 8.5.3 upgrade attempt

"Restarting after upgrade","new_version":"8.5.3","prev_version":"8.6.0",

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 12, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.333% (59/60) 👍
Files 69.082% (143/207) 👍
Classes 69.133% (271/392) 👍
Methods 53.983% (820/1519) 👍
Lines 39.129% (8878/22689) 👍 0.011
Conditionals 100.0% (0/0) 💚

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

No Coverage information No Coverage information
0.0% 0.0% Duplication

@cmacknz cmacknz merged commit b9d8f5e into main Dec 12, 2022
@cmacknz cmacknz deleted the mergify/bp/main/pr-1627 branch December 12, 2022 23:46
mergify bot added a commit that referenced this pull request Dec 12, 2022
cmacknz pushed a commit that referenced this pull request Dec 13, 2022
(cherry picked from commit b9d8f5e)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport backport-v8.6.0 Automated backport with mergify 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