Skip to content
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

mimirtool config: Update config descriptors #2629

Merged
merged 5 commits into from
Aug 4, 2022

Conversation

dimitarvdimitrov
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov commented Aug 2, 2022

Signed-off-by: Dimitar Dimitrov dimitar.dimitrov@grafana.com

What this PR does

Updates GEM and Mimir config descriptors before 2.3 release. Also updates tests to include any changed defaults and removed flags. The config descriptors taken are from the HEAD of main for both GEM and Mimir.

There aren't any config flag changes in any open PRs as of Aug 2, 12:45 UTC, so I think it's safe to commit the changes in this PR to the 2.3 release.

Which issue(s) this PR fixes or relates to

Fixes #2358

Checklist

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

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Copy link
Collaborator

@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.

Good job! LGTM. I just think there's a typo in one of the removed config params, can you take a look please?

pkg/mimirtool/config/cortex.go Outdated Show resolved Hide resolved
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Comment on lines 181 to 184

// Removed in 2.1, 2.2 and 2.3
"graphite.querier.enable_remote_subquerier", // -graphite.querier.enable-remote-subquerier
"graphite.querier.enable_remote_subquerier", // -graphite.querier.use-remote-results
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These weren't in GEM 1.7

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Copy link
Collaborator

@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.

LGTM (but I have a doubt about a Cortex flag, see comment, please)

pkg/mimirtool/config/cortex.go Show resolved Hide resolved
@dimitarvdimitrov dimitarvdimitrov force-pushed the dimitar/update-mimirtool-config-descriptors branch from 29550fc to bbd5796 Compare August 4, 2022 07:56
@pracucci pracucci merged commit c57ec32 into main Aug 4, 2022
@pracucci pracucci deleted the dimitar/update-mimirtool-config-descriptors branch August 4, 2022 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mimirtool: Update mimir config descriptor
2 participants