Skip to content

Migrate to dskit/ring #4539

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

Merged
merged 7 commits into from
Nov 3, 2021
Merged

Migrate to dskit/ring #4539

merged 7 commits into from
Nov 3, 2021

Conversation

treid314
Copy link
Contributor

Signed-off-by: Tyler Reid tyler.reid@grafana.com

What this PR does: This PR migrates cortex to use dskit/ring instead of the local version. This could impact logging as we've moved the dskit ring package off of the global logger and used component loggers instead.

Checklist

  • Tests updated
  • [-] Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
@treid314 treid314 force-pushed the dskit_ring branch 2 times, most recently from d2d4081 to 21bcdcb Compare October 28, 2021 16:52
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Changes LGTM, module few comments I would like to see addressed.

Tyler Reid added 4 commits November 2, 2021 14:41
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Did a quick pass and changes look good to me.

@pracucci pracucci merged commit f2656f8 into cortexproject:master Nov 3, 2021
srijan55 pushed a commit to srijan55/cortex that referenced this pull request Nov 26, 2021
* Migrate to dskit/ring

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Tidy those mods

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Update docs on my branch

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Wrap multi-tenant alert manager lifecycler registerer with cortex prefix

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Add changelog for new configs brought in via dskit

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Remove whitespace in changelog

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Signed-off-by: Manish Kumar Gupta <manishkg@microsoft.com>
aknuds1 added a commit to aknuds1/cortex that referenced this pull request Jan 12, 2022
This reverts commit f2656f8.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
pstibrany pushed a commit that referenced this pull request Jan 13, 2022
This reverts commit f2656f8.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit to aknuds1/cortex that referenced this pull request Jan 13, 2022
This reverts commit f2656f8.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
* Migrate to dskit/ring

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Tidy those mods

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Update docs on my branch

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Wrap multi-tenant alert manager lifecycler registerer with cortex prefix

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Add changelog for new configs brought in via dskit

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>

* Remove whitespace in changelog

Signed-off-by: Tyler Reid <tyler.reid@grafana.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
This reverts commit f2656f8.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants