Merge commit 'bba3d6fd67d6567bf09852c902c72feb565c1096' into beta

* commit 'bba3d6fd67d6567bf09852c902c72feb565c1096':
  jitsucom#1012 Prometheus custom endpoint and authorization

documentation/other-features/application-metrics.mdx

@@ -15,7 +15,10 @@ By default metrics collection is disabled. For enabling it put the following key
 server:
   admin_token: your_admin_token
   metrics:
-    prometheus.enabled: true
+    prometheus:
+      enabled: true
+      auth: true
+      endpoint: prometheus
 
 destinations:
 ...    

server/appconfig/appconfig.go

@@ -89,6 +89,8 @@ func setDefaultParams(containerized bool) {
 	viper.SetDefault("server.cache.events.trim_interval_ms", 500)
 	viper.SetDefault("server.cache.events.max_malformed_event_size_bytes", 10_000)
 	viper.SetDefault("server.cache.pool.size", 10)
+	viper.SetDefault("server.metrics.prometheus.auth", true)
+	viper.SetDefault("server.metrics.prometheus.endpoint", "prometheus")
 	viper.SetDefault("server.strict_auth_tokens", false)
 	viper.SetDefault("server.max_columns", 100)
 	viper.SetDefault("server.max_event_size", 51200)

server/main.go

@@ -229,7 +229,9 @@ func main() {
 	metricsExported := viper.GetBool("server.metrics.prometheus.enabled")
 	metricsRelay := metrics.InitRelay(clusterID, viper.Sub("server.metrics.relay"))
 	if metricsExported || metricsRelay != nil {
-		metrics.Init(metricsExported)
+		metricsAuth := viper.GetBool("server.metrics.prometheus.auth")
+		metricsEndpoint := viper.GetString("server.metrics.prometheus.endpoint")
+		metrics.Init(metricsExported, metricsAuth, metricsEndpoint)
 		if metricsRelay != nil {
 			interval := 5 * time.Minute
 			if viper.IsSet("server.metrics.relay.interval") {

server/metrics/prometheus.go

@@ -19,6 +19,10 @@ const (
 
 var Exported bool
 
+var Auth bool
+
+var Endpoint string
+
 var Registry *prometheus.Registry
 
 func Enabled() bool {
@@ -45,8 +49,10 @@ func NewHistogramVec(opts prometheus.HistogramOpts, labels []string) *prometheus
 
 const Unknown = "unknown"
 
-func Init(exported bool) {
+func Init(exported bool, auth bool, endpoint string) {
 	Exported = exported
+	Auth = auth
+	Endpoint = endpoint
 	if Exported {
 		logging.Info("✅ Initializing Prometheus metrics..")
 	}

server/routers/router.go

@@ -162,7 +162,11 @@ func SetupRouter(adminToken string, metaStorage meta.Storage, destinations *dest
 	router.POST("/api.:ignored", middleware.TokenFuncAuth(jsEventHandler.PostHandler, appconfig.Instance.AuthorizationService.GetClientOrigins, ""))
 
 	if metrics.Exported {
-		router.GET("/prometheus", middleware.TokenAuth(gin.WrapH(metrics.Handler()), adminToken))
+		handler := gin.WrapH(metrics.Handler())
+		if metrics.Auth {
+			handler = middleware.TokenAuth(handler, adminToken)
+		}
+		router.GET("/" + metrics.Endpoint, handler)
 	}
 
 	//Setup profiler