outposts: add outpost_name label to metrics

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

internal/outpost/proxyv2/application/application.go

@@ -31,6 +31,7 @@ type Application struct {
 	endpint       OIDCEndpoint
 	oauthConfig   oauth2.Config
 	tokenVerifier *oidc.IDTokenVerifier
+	outpostName   string
 
 	sessions    sessions.Store
 	proxyConfig api.ProxyOutpostConfig
@@ -40,7 +41,7 @@ type Application struct {
 	mux *mux.Router
 }
 
-func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, akHost string) *Application {
+func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore, ak *ak.APIController) *Application {
 	gob.Register(Claims{})
 
 	externalHost, err := url.Parse(p.ExternalHost)
@@ -56,7 +57,7 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
 	})
 
 	// Configure an OpenID Connect aware OAuth2 client.
-	endpoint := GetOIDCEndpoint(p, akHost)
+	endpoint := GetOIDCEndpoint(p, ak.Outpost.Config["authentik_host"].(string))
 	oauth2Config := oauth2.Config{
 		ClientID:     *p.ClientId,
 		ClientSecret: *p.ClientSecret,
@@ -68,6 +69,7 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
 	a := &Application{
 		Host:          externalHost.Host,
 		log:           log.WithField("logger", "authentik.outpost.proxy.bundle").WithField("provider", p.Name),
+		outpostName:   ak.Outpost.Name,
 		endpint:       endpoint,
 		oauthConfig:   oauth2Config,
 		tokenVerifier: verifier,
@@ -103,12 +105,13 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, cs *ak.CryptoStore
 			inner.ServeHTTP(rw, r)
 			after := time.Since(before)
 			metrics.Requests.With(prometheus.Labels{
-				"type":   "app",
-				"scheme": r.URL.Scheme,
-				"method": r.Method,
-				"path":   r.URL.Path,
-				"host":   web.GetHost(r),
-				"user":   user,
+				"outpost_name": a.outpostName,
+				"type":         "app",
+				"scheme":       r.URL.Scheme,
+				"method":       r.Method,
+				"path":         r.URL.Path,
+				"host":         web.GetHost(r),
+				"user":         user,
 			}).Observe(float64(after))
 		})
 	})

internal/outpost/proxyv2/application/mode_proxy.go

@@ -50,6 +50,7 @@ func (a *Application) configureProxy() error {
 			user = claims.Email
 		}
 		metrics.UpstreamTiming.With(prometheus.Labels{
+			"outpost_name":  a.outpostName,
 			"upstream_host": u.String(),
 			"scheme":        r.URL.Scheme,
 			"method":        r.Method,

internal/outpost/proxyv2/application/utils.go

@@ -44,15 +44,6 @@ func (a *Application) getClaims(r *http.Request) (*Claims, error) {
 	return &c, nil
 }
 
-func contains(s []string, e string) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}
-
 // toString Generic to string function, currently supports actual strings and integers
 func toString(in interface{}) string {
 	switch v := in.(type) {