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

fix: partial docker syncTargets #5798

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Conversation

FerdinandvHagen
Copy link
Contributor

syncTargets for docker is called within a loop which leads to an incomplete targets slice to be sent to the manager.

Moving the syncTargets after the loop ensures that always all targets are correctly registered.

PR Description

Which issue(s) this PR fixes

Fixes #5797

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

@CLAassistant
Copy link

CLAassistant commented Nov 17, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM!

Can you add this as a bug fix entry to CHANGELOG.md before we merge?

FerdinandvHagen and others added 2 commits December 8, 2023 16:24
syncTargets for docker is called within a loop which leads to an incomplete targets slice to be sent to the manager.

Moving the syncTargets after the loop ensures that always all targets are correctly registered.
Signed-off-by: Paschalis Tsilias <[email protected]>
Copy link
Member

@tpaschalis tpaschalis left a comment

Choose a reason for hiding this comment

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

LGTM! FYI @FerdinandvHagen I've rebased with main to avoid conflicts with the changelog and added a new bugfix entry.

Thanks for your contribution!

@tpaschalis tpaschalis enabled auto-merge (squash) December 8, 2023 14:29
Signed-off-by: Paschalis Tsilias <[email protected]>
@tpaschalis tpaschalis merged commit e961c17 into grafana:main Dec 8, 2023
10 checks passed
@FerdinandvHagen
Copy link
Contributor Author

Thank you @tpaschalis - my pleasure.

BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
* fix: partial docker syncTargets

syncTargets for docker is called within a loop which leads to an incomplete targets slice to be sent to the manager.

Moving the syncTargets after the loop ensures that always all targets are correctly registered.

---------
Co-authored-by: Paschalis Tsilias <[email protected]>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

loki.source.docker: positions removed on transient docker error
4 participants