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.

Sign up for GitHub

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

Jump to bottom

Ruler: Do not clear remote-write HTTP client config #4437

Merged
merged 1 commit into from
Oct 8, 2021
Merged

Ruler: Do not clear remote-write HTTP client config #4437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/ruler/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func (r *walRegistry) getTenantRemoteWriteConfig(tenant string, base RemoteWrite
overrides.Client.Name = fmt.Sprintf("%s-rw", tenant)
overrides.Client.SendExemplars = false
// TODO(dannyk): configure HTTP client overrides
overrides.Client.HTTPClientConfig = promConfig.HTTPClientConfig{}
// metadata is only used by prometheus scrape configs
overrides.Client.MetadataConfig = config.MetadataConfig{Send: false}
overrides.Client.SigV4Config = nil
Expand Down
20 changes: 20 additions & 0 deletions pkg/ruler/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ func setupRegistry(t *testing.T, dir string) *walRegistry {
QueueConfig: config.QueueConfig{
Capacity: defaultCapacity,
},
HTTPClientConfig: promConfig.HTTPClientConfig{
BasicAuth: &promConfig.BasicAuth{
Password: "bar",
Username: "foo",
},
},
Headers: map[string]string{
"Base": "value",
},
Expand Down Expand Up @@ -174,6 +180,20 @@ func TestTenantRemoteWriteConfigDisabled(t *testing.T) {
assert.Len(t, tenantCfg.RemoteWrite, 0)
}

func TestTenantRemoteWriteHTTPConfigMaintained(t *testing.T) {
walDir, err := createTempWALDir()
require.NoError(t, err)
reg := setupRegistry(t, walDir)
defer os.RemoveAll(walDir)
Copy link
Contributor

@kavirajk kavirajk Oct 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
defer os.RemoveAll(walDir)
defer func() {
require.NoError(t, os.RemoveAll(walDir))
}()


tenantCfg, err := reg.getTenantConfig(enabledRWTenant)
require.NoError(t, err)

Copy link
Contributor

@kavirajk kavirajk Oct 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

nit: require.Len(t, tenantCfg.RemoteWrite, 1).
Just to avoid panic with tenantCfg.RemoteWrite[0] and make sure we just have one element.

// HTTP client config is not currently overrideable, all tenants' configs should inherit base
assert.Equal(t, tenantCfg.RemoteWrite[0].HTTPClientConfig.BasicAuth.Username, "foo")
assert.Equal(t, tenantCfg.RemoteWrite[0].HTTPClientConfig.BasicAuth.Password, promConfig.Secret("<secret>"))
}

func TestTenantRemoteWriteHeaderOverride(t *testing.T) {
walDir, err := createTempWALDir()
require.NoError(t, err)
Expand Down