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

Implement ApplyConfig for Loki #416

Merged
merged 4 commits into from
Feb 18, 2021
Merged

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 18, 2021

PR Description

This PR adds an ApplyConfig field for applying a new config to the Loki subsystem. This isn't hooked into anything for now, but will be used as part of #147.

It works by checking to see if a Loki instance config has changed, and replacing the Promtail instance if it has. Instances that have been removed from the updated config will be shut down.

Which issue(s) this PR fixes

Related to #147, but doesn't implement it fully.

Notes to the Reviewer

PR Checklist

  • CHANGELOG updated (internal change, not needed)
  • Documentation added (internal change, not needed)
  • Tests updated

pkg/loki/loki.go Outdated Show resolved Hide resolved
pkg/loki/loki.go Outdated Show resolved Hide resolved
@@ -0,0 +1,135 @@
//+build !race
Copy link
Member Author

Choose a reason for hiding this comment

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

There's a race condition in promtail itself, so I'm just going to not use the race detector here for now

@rfratto rfratto merged commit 2fba3bf into grafana:main Feb 18, 2021
@rfratto rfratto deleted the loki-applyconfig branch February 18, 2021 19:16
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
* Implement ApplyConfig for Loki

* add integration test for ApplyConfig

* fix lint, race errors, map deletion

* make windows test happy
@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 Apr 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 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.

2 participants