Skip to content

Commit 94dd410

Browse files
Loki: Allow alert headers to be forwarded (#90890)
* Loki: Allow alert headers to be forwarded * Loki: fix tests --------- Co-authored-by: Yuri Tseretyan <[email protected]>
1 parent dc35533 commit 94dd410

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

pkg/services/ngalert/eval/eval.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func buildDatasourceHeaders(ctx context.Context, metadata map[string]string) map
334334
headers := make(map[string]string, len(metadata)+3)
335335

336336
for key, value := range metadata {
337-
headers[fmt.Sprintf("X-Rule-%s", key)] = url.QueryEscape(value)
337+
headers[fmt.Sprintf("http_X-Rule-%s", key)] = url.QueryEscape(value)
338338
}
339339

340340
// Many data sources check this in query method as sometimes alerting needs special considerations.

pkg/services/ngalert/eval/eval_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,9 +1262,9 @@ func TestCreate(t *testing.T) {
12621262
}
12631263

12641264
expectedHeaders := map[string]string{
1265-
"X-Rule-Test1": "data1",
1266-
"X-Rule-Test2": "%D0%BC%D1%83%D0%B7%D1%8B%D0%BA%D0%B0+%F0%9F%8E%B6",
1267-
"X-Rule-Test3": "",
1265+
"http_X-Rule-Test1": "data1",
1266+
"http_X-Rule-Test2": "%D0%BC%D1%83%D0%B7%D1%8B%D0%BA%D0%B0+%F0%9F%8E%B6",
1267+
"http_X-Rule-Test3": "",
12681268
models.FromAlertHeaderName: "true",
12691269
models.CacheSkipHeaderName: "true",
12701270
"X-Grafana-Org-Id": strconv.FormatInt(orgID, 10),

pkg/tsdb/loki/loki.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ func newInstanceSettings(httpClientProvider *httpclient.Provider) datasource.Ins
9090
if err != nil {
9191
return nil, err
9292
}
93+
opts.ForwardHTTPHeaders = true
9394

9495
client, err := httpClientProvider.New(opts)
9596
if err != nil {

0 commit comments

Comments
 (0)