Alerting: Add configurable transport to historian app (#114935)

apps/alerting/historian/pkg/app/config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"net/http"
 	"net/url"
 	"time"
 
@@ -15,9 +16,14 @@ const (
 	lokiDefaultMaxQuerySize   = 65536           // 64kb
 )
 
+type LokiConfig struct {
+	lokiclient.LokiConfig
+	Transport http.RoundTripper
+}
+
 type NotificationConfig struct {
 	Enabled bool
-	Loki    lokiclient.LokiConfig
+	Loki    LokiConfig
 }
 
 type RuntimeConfig struct {
@@ -27,7 +33,7 @@ type RuntimeConfig struct {
 
 func (n *NotificationConfig) AddFlagsWithPrefix(prefix string, flags *pflag.FlagSet) {
 	flags.BoolVar(&n.Enabled, prefix+".enabled", false, "Enable notification query endpoints")
-	addLokiFlags(&n.Loki, prefix+".loki", flags)
+	addLokiFlags(&n.Loki.LokiConfig, prefix+".loki", flags)
 }
 
 func (r *RuntimeConfig) AddFlagsWithPrefix(prefix string, flags *pflag.FlagSet) {

apps/alerting/historian/pkg/app/config/config_test.go

@@ -24,10 +24,12 @@ func TestRuntimeConfig(t *testing.T) {
 			expected: RuntimeConfig{
 				Notification: NotificationConfig{
 					Enabled: false,
-					Loki: lokiclient.LokiConfig{
-						ReadPathURL:    nil,
-						MaxQueryLength: 721 * time.Hour,
-						MaxQuerySize:   65536,
+					Loki: LokiConfig{
+						LokiConfig: lokiclient.LokiConfig{
+							ReadPathURL:    nil,
+							MaxQueryLength: 721 * time.Hour,
+							MaxQuerySize:   65536,
+						},
 					},
 				},
 			},
@@ -38,10 +40,12 @@ func TestRuntimeConfig(t *testing.T) {
 			expected: RuntimeConfig{
 				Notification: NotificationConfig{
 					Enabled: true,
-					Loki: lokiclient.LokiConfig{
-						ReadPathURL:    nil,
-						MaxQueryLength: 721 * time.Hour,
-						MaxQuerySize:   65536,
+					Loki: LokiConfig{
+						LokiConfig: lokiclient.LokiConfig{
+							ReadPathURL:    nil,
+							MaxQueryLength: 721 * time.Hour,
+							MaxQuerySize:   65536,
+						},
 					},
 				},
 			},
@@ -57,13 +61,15 @@ func TestRuntimeConfig(t *testing.T) {
 			expected: RuntimeConfig{
 				Notification: NotificationConfig{
 					Enabled: false,
-					Loki: lokiclient.LokiConfig{
-						ReadPathURL:       lokiURL,
-						BasicAuthUser:     "foo",
-						BasicAuthPassword: "bar",
-						TenantID:          "baz",
-						MaxQueryLength:    721 * time.Hour,
-						MaxQuerySize:      65536,
+					Loki: LokiConfig{
+						LokiConfig: lokiclient.LokiConfig{
+							ReadPathURL:       lokiURL,
+							BasicAuthUser:     "foo",
+							BasicAuthPassword: "bar",
+							TenantID:          "baz",
+							MaxQueryLength:    721 * time.Hour,
+							MaxQuerySize:      65536,
+						},
 					},
 				},
 			},

apps/alerting/historian/pkg/app/notification/lokireader.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"regexp"
 	"sort"
 	"strings"
@@ -19,6 +20,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/grafana/grafana/apps/alerting/historian/pkg/apis/alertinghistorian/v0alpha1"
+	"github.com/grafana/grafana/apps/alerting/historian/pkg/app/config"
 	"github.com/grafana/grafana/apps/alerting/historian/pkg/app/logutil"
 )
 
@@ -47,7 +49,7 @@ type LokiReader struct {
 	logger logging.Logger
 }
 
-func NewLokiReader(cfg lokiclient.LokiConfig, reg prometheus.Registerer, logger logging.Logger, tracer trace.Tracer) *LokiReader {
+func NewLokiReader(cfg config.LokiConfig, reg prometheus.Registerer, logger logging.Logger, tracer trace.Tracer) *LokiReader {
 	duration := instrument.NewHistogramCollector(promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{
 		Namespace: Namespace,
 		Subsystem: Subsystem,
@@ -56,9 +58,13 @@ func NewLokiReader(cfg lokiclient.LokiConfig, reg prometheus.Registerer, logger
 		Buckets:   instrument.DefBuckets,
 	}, instrument.HistogramCollectorBuckets))
 
+	requester := &http.Client{
+		Transport: cfg.Transport,
+	}
+
 	gkLogger := logutil.ToGoKitLogger(logger)
 	return &LokiReader{
-		client: lokiclient.NewLokiClient(cfg, lokiclient.NewRequester(), nil, duration, gkLogger, tracer, LokiClientSpanName),
+		client: lokiclient.NewLokiClient(cfg.LokiConfig, requester, nil, duration, gkLogger, tracer, LokiClientSpanName),
 		logger: logger,
 	}
 }

pkg/registry/apps/alerting/historian/register.go

@@ -42,7 +42,9 @@ func RegisterAppInstaller(
 
 			appSpecificConfig.Notification = historianAppConfig.NotificationConfig{
 				Enabled: nhCfg.Enabled,
-				Loki:    lokiConfig,
+				Loki: historianAppConfig.LokiConfig{
+					LokiConfig: lokiConfig,
+				},
 			}
 		}
 	}