Skip to content

[8.4](backport #1285) Expand status reporter/controller interfaces to allow local reporters#1305

Merged
michel-laterman merged 2 commits into8.4from
mergify/bp/8.4/pr-1285
Sep 26, 2022
Merged

[8.4](backport #1285) Expand status reporter/controller interfaces to allow local reporters#1305
michel-laterman merged 2 commits into8.4from
mergify/bp/8.4/pr-1285

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 26, 2022

This is an automatic backport of pull request #1285 done by Mergify.
Cherry-pick of 717708a has failed:

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

You are currently cherry-picking commit 717708a72.
  (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/gateway/fleet/fleet_gateway.go
	modified:   internal/pkg/agent/application/gateway/fleet/fleet_gateway_test.go
	modified:   internal/pkg/agent/application/gateway/fleet/noop_status_controller_test.go
	modified:   internal/pkg/core/status/handler.go
	modified:   internal/pkg/testutils/status_reporter.go

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

@michel-laterman @mergify
Expand status reporter/controller interfaces to allow local reporters (…
ddaca73 
…#1285)

* Expand status reporter/controller interfaces to allow local reporters

Add a local reporter map to the status controller. These reporters are
not used when updating status with fleet-server, they are only used to
gather local state information - specifically if the agent is degraded
because checkin with fleet-server has failed. This bypasses the bug that
was introduced with the liveness endpoint where the agent could checkin
(to fleet-server) with a degraded status because a previous checkin
failed. Local reporters are used to generate a separate status. This
status is used in the liveness endpoint.

* fix linter

(cherry picked from commit 717708a)

# Conflicts:
#	internal/pkg/core/status/reporter.go
@mergify mergify bot requested a review from a team as a code owner September 26, 2022 17:28
@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 blakerouse and michel-laterman and removed request for a team September 26, 2022 17:28
@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-26T18:24:52.530+0000

  • Duration: 17 min 25 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 39.003% (9415/24139) 👎 -0.041
Conditionals 100.0% (0/0) 💚

@michel-laterman michel-laterman merged commit 7f10625 into 8.4 Sep 26, 2022
@michel-laterman michel-laterman deleted the mergify/bp/8.4/pr-1285 branch September 26, 2022 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse 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

@michel-laterman michel-laterman

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 @michel-laterman