bump dependencies #227
Merged
bump dependencies #227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
I've spent some time testing this e2e locally and everything works (scraping service, metrics, logs, traces). There's probably a good opportunity to add Tempo to the docker-compose and k3d examples in line with how we run Cortex and Loki, but that's out of scope of this PR. |
|
This needs the docs to be updated to mention the new SD configs, but that can happen in parallel with a review (edit: this is done). |
- otel: bump to 0.13.0 - prometheus: bump to release-2.21-grafana - loki: bump to 2.0
joe-elliott
reviewed
Oct 28, 2020
- Replace queue with sending_queue and retry_on_failure - Change default value for retry_on_failure.max_elapsed_time to 60s - Update URLs to point to vendored version - Update configs to use new config changes (including k8s manifest)
joe-elliott
approved these changes
Oct 28, 2020
dafydd-t
reviewed
Oct 28, 2020
pkg/tempo/config.go
Outdated
| @@ -41,11 +41,12 @@ type Config struct { | |||
|
|
|||
| // RWConfig controls the configuration of exporting to Grafana Cloud | |||
| type RWConfig struct { | |||
There was a problem hiding this comment.
Any reason you didn't change the name of this struct to go with the use of PushConfig above? I can't see the struct in use anywhere else.
dafydd-t
reviewed
Oct 28, 2020
| @@ -88,13 +90,13 @@ service: | |||
| `, | |||
| }, | |||
| { | |||
| name: "remote_write options", | |||
| name: "push_config options", | |||
There was a problem hiding this comment.
IDK whats going on with indent here, wasn't caused by your changes of course.
dafydd-t
approved these changes
Oct 28, 2020
mattdurham
pushed a commit
that referenced
this pull request
Nov 11, 2021
* bump dependencies - otel: bump to 0.13.0 - prometheus: bump to release-2.21-grafana - loki: bump to 2.0 * fix issue where tempo config was expecting remote_write over push_config * update CHANGELOG * fix tests I broke :) * address review feedback - Replace queue with sending_queue and retry_on_failure - Change default value for retry_on_failure.max_elapsed_time to 60s - Update URLs to point to vendored version - Update configs to use new config changes (including k8s manifest) * reference new prometheus service discovery mechanisms * address feedback
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All of these bumps depend on each other so it unfortunately has to be done in one massive PR.
Closes #203.
I'm also sneaking in a bug fix for #228, where I updated all the docs for Tempo to refer to
push_configbut the code still expectedremote_writefor the Tempo fields.Also Closes #228.
Requesting review from @joe-elliott for the
pkg/tempochanges and @grafana/cloud-middleware for the broad changes.