Ruler: Do not clear remote-write HTTP client config #4437
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
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
kavirajk
approved these changes
Oct 8, 2021
| walDir, err := createTempWALDir() | ||
| require.NoError(t, err) | ||
| reg := setupRegistry(t, walDir) | ||
| defer os.RemoveAll(walDir) |
There was a problem hiding this comment.
Suggested change
| defer os.RemoveAll(walDir) | |
| defer func() { | |
| require.NoError(t, os.RemoveAll(walDir)) | |
| }() |
|
|
||
| tenantCfg, err := reg.getTenantConfig(enabledRWTenant) | ||
| require.NoError(t, err) | ||
|
|
There was a problem hiding this comment.
nit: require.Len(t, tenantCfg.RemoteWrite, 1).
Just to avoid panic with tenantCfg.RemoteWrite[0] and make sure we just have one element.
|
Going to defer applying the suggestions for a subsequent PR. The feedback is valuable 👍 thanks |
dannykopping
pushed a commit
that referenced
this pull request
Oct 8, 2021
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
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 / why we need it:
HTTP client configurations are not currently overrideable per tenant. This was accidentally set to an empty struct in #4429.
Which issue(s) this PR fixes:
N/A
Special notes for your reviewer:
Checklist