Skip to content

[8.4](backport #1287) Improve logging for agent upgrades.#1309

Merged
cmacknz merged 2 commits into8.4from
mergify/bp/8.4/pr-1287
Sep 26, 2022
Merged

[8.4](backport #1287) Improve logging for agent upgrades.#1309
cmacknz merged 2 commits into8.4from
mergify/bp/8.4/pr-1287

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 26, 2022

This is an automatic backport of pull request #1287 done by Mergify.
Cherry-pick of 5225e54 has failed:

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

You are currently cherry-picking commit 5225e5408.
  (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:
	modified:   CHANGELOG.next.asciidoc
	modified:   internal/pkg/agent/application/pipeline/actions/handlers/handler_action_upgrade.go
	modified:   internal/pkg/agent/application/upgrade/cleanup.go
	modified:   internal/pkg/agent/application/upgrade/cleanup_test.go
	modified:   internal/pkg/agent/application/upgrade/rollback.go
	modified:   internal/pkg/agent/application/upgrade/step_download.go
	modified:   internal/pkg/agent/application/upgrade/step_mark.go
	modified:   internal/pkg/agent/application/upgrade/step_relink.go
	modified:   internal/pkg/agent/application/upgrade/step_unpack.go
	modified:   internal/pkg/agent/application/upgrade/upgrade.go
	modified:   internal/pkg/agent/cmd/watch.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/control/server/server.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

@cmacknz @mergify
Improve logging for agent upgrades. (#1287)
b0e7b02 
(cherry picked from commit 5225e54)

# Conflicts:
#	internal/pkg/agent/control/server/server.go
@mergify mergify bot requested a review from a team as a code owner September 26, 2022 22:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 26, 2022
@mergify mergify bot requested review from AndersonQ and michel-laterman and removed request for a team September 26, 2022 22:19
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 26, 2022 •
edited
Loading

💚 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-09-26T22:37:30.088+0000

  • Duration: 15 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 4927
Skipped 17
Total 4944

💚 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
Copy Markdown
Contributor

elasticmachine commented Sep 26, 2022

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 97.297% (72/74) 👍
Files 68.559% (157/229) 👍
Classes 68.805% (311/452) 👍
Methods 52.574% (868/1651) 👎 -0.064
Lines 38.888% (9403/24180) 👎 -0.157
Conditionals 100.0% (0/0) 💚

@cmacknz cmacknz merged commit 330ae74 into 8.4 Sep 26, 2022
@cmacknz cmacknz deleted the mergify/bp/8.4/pr-1287 branch September 26, 2022 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

@michel-laterman michel-laterman Awaiting requested review from michel-laterman michel-laterman is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@cmacknz cmacknz

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @cmacknz