Migrate to Thanos Objstore package at new location #2682
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
bboreham
force-pushed
the
thanos-objstore
branch
2 times, most recently
from
3ec7d33
to
356e6be
Compare
|
I wanted to check if there's any logic difference, so I looked at: There are changes to Azure client because of the Azure SDK upgrade, but logic looks unchanged, so LGTM so far. |
bboreham
force-pushed
the
thanos-objstore
branch
from
356e6be
to
ce1a8b9
Compare
pracucci
reviewed
Aug 24, 2022
bboreham
force-pushed
the
thanos-objstore
branch
from
ce1a8b9
to
2125765
Compare
This comment has been minimized.
This comment has been minimized.
bboreham
force-pushed
the
thanos-objstore
branch
2 times, most recently
from
2eba5e0
to
ed80907
Compare
bboreham
force-pushed
the
thanos-objstore
branch
from
fc1adf5
to
1a25ce8
Compare
|
@bboreham What's the status of this? Are we ready to rebase and merge, or is there anything left? |
|
The CHANGELOG has just been cut to prepare for the next Mimir release. Please rebase |
pracucci
reviewed
Oct 13, 2022
CHANGELOG.md
Outdated
| @@ -11,6 +11,7 @@ | |||
| * [CHANGE] Query-frontend: CLI flag `-query-frontend.align-querier-with-step` has been deprecated. Please use `-query-frontend.align-queries-with-step` instead. #2840 | |||
| * [CHANGE] Distributor: change the default value of `-distributor.remote-timeout` to `2s` from `20s` and `-distributor.forwarding.request-timeout` to `2s` from `10s` to improve distributor resource usage when ingesters crash. #2728 | |||
| * [CHANGE] Ingester: changed default setting for `-ingester.ring.readiness-check-ring-health` from `true` to `false`. #2953 | |||
| * [CHANGE] Flag `-azure.msi-resource` no longer works. This setting is now made automatically by Azure. #??? | |||
There was a problem hiding this comment.
Suggested change
| * [CHANGE] Flag `-azure.msi-resource` no longer works. This setting is now made automatically by Azure. #??? | |
| * [CHANGE] Flag `-*.azure.msi-resource` has been deprecated and will be removed in Mimir 2.7. This setting is now made automatically by Azure. #2682 |
pracucci
reviewed
Oct 13, 2022
pkg/storage/bucket/azure/config.go
Outdated
| @@ -18,22 +19,22 @@ type Config struct { | |||
| ContainerName string `yaml:"container_name"` | |||
| Endpoint string `yaml:"endpoint_suffix"` | |||
| MaxRetries int `yaml:"max_retries" category:"advanced"` | |||
| MSIResource string `yaml:"msi_resource" category:"advanced"` | |||
| MSIResource string `yaml:"msi_resource" category:"advanced"` // deprecated | |||
There was a problem hiding this comment.
Suggested change
| MSIResource string `yaml:"msi_resource" category:"advanced"` // deprecated | |
| MSIResource string `yaml:"msi_resource" category:"advanced" doc:"hidden"` // TODO Remove in Mimir 2.7. |
bboreham
force-pushed
the
thanos-objstore
branch
from
1a25ce8
to
9680e15
Compare
grafana/thanos fork updated. Many changes to 3rd-party libraries. Requires update to grafana/e2e and grafana/dskit.
Removed in upstream Azure library and marked as deprecated in thanos-io/objstore, so lint fails if we use it. Because we want to log if it is used, many places need to pass a logger parameter through to `RegisterFlags`. Also update the docs.
bboreham
force-pushed
the
thanos-objstore
branch
from
9680e15
to
b23e42c
Compare
Signed-off-by: Marco Pracucci <marco@pracucci.com>
|
I've just pushed a |
1 task
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.
grafana/thanos fork updated.
Requires update to grafana/e2e grafana/e2e#4 and grafana/dskit grafana/dskit#210.
Checklist
CHANGELOG.mdupdated