Upgrade to latest dskit and weaveworks/common #2309
Merged
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
aknuds1
force-pushed
the
chore/upgrade-dskit
branch
2 times, most recently
from
3b64850
to
6679076
Compare
pracucci
reviewed
Jul 4, 2022
| ExcludeRequestInLog bool `yaml:"-"` | ||
| RegisterInstrumentation bool `yaml:"register_instrumentation"` | ||
| ExcludeRequestInLog bool `yaml:"-"` | ||
| DisableRequestSuccessLog bool `yaml:"-"` |
There was a problem hiding this comment.
We want to disable this in Mimir. We can do it in the same place where we set ExcludeRequestInLog too:
https://github.com/grafana/mimir/blob/main/pkg/mimir/mimir.go#L125
There was a problem hiding this comment.
Thanks @pracucci, will look into it.
There was a problem hiding this comment.
@pracucci I've disabled it.
docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md
Show resolved
Hide resolved
docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md
Outdated
Show resolved
Hide resolved
aknuds1
force-pushed
the
chore/upgrade-dskit
branch
2 times, most recently
from
f4d8f82
to
693fc03
Compare
|
After discussing with @pracucci, we've agreed I'm going to make a PR to weaveworks/common to hide new configuration parameters from its dependency. |
aknuds1
changed the title
|
PR to weaveworks/common made. |
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1
force-pushed
the
chore/upgrade-dskit
branch
from
693fc03
to
dad8218
Compare
|
I've upgraded to the latest weaveworks/common, which removes the new TLS config parameters. |
pracucci
reviewed
Jul 6, 2022
pracucci
approved these changes
Jul 6, 2022
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
|
@pracucci I added a couple of changelog entries from dskit. Should I keep them? |
aknuds1
changed the title
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
masonmei
pushed a commit
to udmire/mimir
that referenced
this pull request
Jul 11, 2022
* Upgrade to latest dskit and weaveworks/common * Fix flaky tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does
Upgrade to latest dskit and weaveworks/common, where
dskit/middleware.PrometheusGRPCUnaryInstrumentationmoves toweaveworks/common/middleware.UnaryClientInstrumentInterceptor.Which issue(s) this PR fixes or relates to
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]