feat: Allow specifying remote_write tenant in ruler_remote_write_config

Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
grafana · Jul 25, 2024 · 41ca5a4 · 41ca5a4
1 parent 2dfc13b
commit 41ca5a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/pkg/ruler/registry.go b/pkg/ruler/registry.go
@@ -205,14 +205,14 @@ func (r *walRegistry) getTenantConfig(tenant string) (instance.Config, error) {
 				clt.Headers = make(map[string]string)
 			}
 
-			// ensure that no variation of the X-Scope-OrgId header can be added, which might trick authentication
-			for k := range clt.Headers {
-				if strings.EqualFold(user.OrgIDHeaderName, strings.TrimSpace(k)) {
-					delete(clt.Headers, k)
+			if rwCfg.AddOrgIDHeader {
+				// ensure that no variation of the X-Scope-OrgId header can be added, which might trick authentication
+				for k := range clt.Headers {
+					if strings.EqualFold(user.OrgIDHeaderName, strings.TrimSpace(k)) {
+						delete(clt.Headers, k)
+					}
 				}
-			}
 
-			if rwCfg.AddOrgIDHeader {
 				// inject the X-Scope-OrgId header for multi-tenant metrics backends
 				clt.Headers[user.OrgIDHeaderName] = tenant
 			}

diff --git a/pkg/ruler/registry_test.go b/pkg/ruler/registry_test.go
@@ -60,7 +60,8 @@ var backCompatCfg = Config{
 				},
 			},
 			Headers: map[string]string{
-				"Base": "value",
+				"Base":               "value",
+				user.OrgIDHeaderName: "org-id",
 			},
 			WriteRelabelConfigs: []*relabel.Config{
 				{
@@ -85,7 +86,8 @@ var backCompatCfg = Config{
 					},
 				},
 				Headers: map[string]string{
-					"Base": "value",
+					"Base":               "value",
+					user.OrgIDHeaderName: "org-id",
 				},
 				WriteRelabelConfigs: []*relabel.Config{
 					{
@@ -120,7 +122,8 @@ var cfg = Config{
 					},
 				},
 				Headers: map[string]string{
-					"Base": "value",
+					"Base":               "value",
+					user.OrgIDHeaderName: "org-id",
 				},
 				WriteRelabelConfigs: []*relabel.Config{
 					{
@@ -144,7 +147,8 @@ var cfg = Config{
 					},
 				},
 				Headers: map[string]string{
-					"Base": "value2",
+					"Base":               "value2",
+					user.OrgIDHeaderName: "org-id2",
 				},
 				WriteRelabelConfigs: []*relabel.Config{
 					{