Update changelog, fix acl-token flags in help. #1587
Conversation
cmd/mimir/help.txt.tmpl
Outdated
| @@ -87,6 +87,8 @@ Usage of ./cmd/mimir/mimir: | |||
| Comma-separated list of network CIDRs to block in Alertmanager receiver integrations. | |||
| -alertmanager.receivers-firewall-block-private-addresses | |||
| True to block private and local addresses in Alertmanager receiver integrations. It blocks private addresses defined by RFC 1918 (IPv4 addresses) and RFC 4193 (IPv6 addresses), as well as loopback, local unicast and local multicast addresses. | |||
| -alertmanager.sharding-ring.consul.acl-token string | |||
There was a problem hiding this comment.
It's categorized as advanced. It shouldn't be here.
There was a problem hiding this comment.
We need to distinguish between outer struct and inner field. Right now categorization finds the inner field with same address as outer struct, and replaces the field information. If we make inner field unexported, we can ignore such field in Mimir's code generating flag. I've posted PR grafana/dskit#154 to accomplish that.
There was a problem hiding this comment.
How cool is the fact that we have a preview of the -help in cmd/mimir/help.txt.tmpl? 😄
|
Please rebase this PR on top of main to make all required test checks pass. |
| @@ -127,3 +127,9 @@ func (m *mockTenantConfigProvider) S3SSEKMSKeyID(_ string) string { | |||
| func (m *mockTenantConfigProvider) S3SSEKMSEncryptionContext(_ string) string { | |||
| return m.s3KmsEncryptionContext | |||
| } | |||
|
|
|||
| func secretWithValue(v string) flagext.Secret { | |||
There was a problem hiding this comment.
I would upstream this to dskit. Looks a very handy utility.
|
I think I will try another approach, simply have a list of structs that should not be descended into. It should result in cleaner code with less weird rules about exported/unexported fields, and smaller PR. |
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
…if it's advanced field or not. Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
pstibrany
changed the title
|
I've rebased this PR on top of main. Since dskit was already updated in #1599, in this PR I'm only updating CHANGELOG to mention multikv fix, and fix problem with acl-token arguments. |
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
What this PR does
This PR updates dskit to commit 6d48ca07ade5.. This fixes panic in
multiKV store implementation when using runtime config to change primary KV store used bymulti.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]