New metrics

admin/api/routes.go

@@ -59,8 +59,8 @@ func (h *RoutesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 					Weight:  tg.Weight,
 					Tags:    tg.Tags,
 					Cmd:     "route add",
-					Rate1:   tg.Timer.Rate1(),
-					Pct99:   tg.Timer.Percentile(0.99),
+					// Rate1:   tg.Timer.Rate1(),
+					// Pct99:   tg.Timer.Percentile(0.99),
 				}
 				routes = append(routes, ar)
 			}

admin/server.go

@@ -9,7 +9,9 @@ import (
 	"github.com/fabiolb/fabio/admin/api"
 	"github.com/fabiolb/fabio/admin/ui"
 	"github.com/fabiolb/fabio/config"
+	"github.com/fabiolb/fabio/metrics4"
 	"github.com/fabiolb/fabio/proxy"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 // Server provides the HTTP server for the admin UI and API.
@@ -20,6 +22,7 @@ type Server struct {
 	Version  string
 	Commands string
 	Cfg      *config.Config
+	Metrics  *metrics4.Provider
 }
 
 // ListenAndServe starts the admin server.
@@ -64,12 +67,21 @@ func (s *Server) handler() http.Handler {
 	mux.Handle("/api/routes", &api.RoutesHandler{})
 	mux.Handle("/api/version", &api.VersionHandler{Version: s.Version})
 	mux.Handle("/routes", &ui.RoutesHandler{Color: s.Color, Title: s.Title, Version: s.Version})
+
+	initMetricsHandlers(mux, s)
+
 	mux.HandleFunc("/logo.svg", ui.HandleLogo)
 	mux.HandleFunc("/health", handleHealth)
 	mux.Handle("/", http.RedirectHandler("/routes", http.StatusSeeOther))
 	return mux
 }
 
+func initMetricsHandlers(mux *http.ServeMux, s *Server) {
+	if strings.Contains(s.Cfg.Metrics.Target, "prometheus") && s.Cfg.Metrics.Prometheus.MetricsEndpoint != "" {
+		mux.HandleFunc(s.Cfg.Metrics.Prometheus.MetricsEndpoint, promhttp.Handler().ServeHTTP)
+	}
+}
+
 func handleHealth(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintln(w, "OK")
 }

config/config.go

@@ -95,15 +95,26 @@ type Log struct {
 }
 
 type Metrics struct {
-	Target       string
-	Prefix       string
-	Names        string
-	Interval     time.Duration
-	Timeout      time.Duration
-	Retry        time.Duration
-	GraphiteAddr string
-	StatsDAddr   string
-	Circonus     Circonus
+	Target string
+	Prefix     string
+	Interval   time.Duration
+	Prometheus Prometheus
+	StatsD     StatsD
+	Graphite   Graphite
+	Circonus   Circonus
+}
+
+type Graphite struct {
+	Addr string
+}
+
+type StatsD struct {
+	Addr       string
+	SampleRate float64
+}
+
+type Prometheus struct {
+	MetricsEndpoint string
 }
 
 type Registry struct {

config/default.go

@@ -26,11 +26,18 @@ var defaultConfig = &Config{
 		Level:        "INFO",
 	},
 	Metrics: Metrics{
-		Prefix:   "{{clean .Hostname}}.{{clean .Exec}}",
-		Names:    "{{clean .Service}}.{{clean .Host}}.{{clean .Path}}.{{clean .TargetURL.Host}}",
+		//Prefix:   "{{clean .Hostname}}.{{clean .Exec}}",
+		//Names:    "{{clean .Service}}.{{clean .Host}}.{{clean .Path}}.{{clean .TargetURL.Host}}",
 		Interval: 30 * time.Second,
-		Timeout:  10 * time.Second,
-		Retry:    500 * time.Millisecond,
+		//Timeout:  10 * time.Second,
+		//Retry:    500 * time.Millisecond,
+		Prometheus: Prometheus{
+			MetricsEndpoint: "/metrics/prometheus",
+		},
+		StatsD: StatsD{
+			SampleRate: 1,
+		},
+		Graphite: Graphite{},
 		Circonus: Circonus{
 			APIApp: "fabio",
 		},

config/load.go

@@ -143,19 +143,25 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.StringVar(&cfg.Log.AccessTarget, "log.access.target", defaultConfig.Log.AccessTarget, "access log target")
 	f.StringVar(&cfg.Log.RoutesFormat, "log.routes.format", defaultConfig.Log.RoutesFormat, "log format of routing table updates")
 	f.StringVar(&cfg.Log.Level, "log.level", defaultConfig.Log.Level, "log level: TRACE, DEBUG, INFO, WARN, ERROR, FATAL")
+
 	f.StringVar(&cfg.Metrics.Target, "metrics.target", defaultConfig.Metrics.Target, "metrics backend")
+
 	f.StringVar(&cfg.Metrics.Prefix, "metrics.prefix", defaultConfig.Metrics.Prefix, "prefix for reported metrics")
-	f.StringVar(&cfg.Metrics.Names, "metrics.names", defaultConfig.Metrics.Names, "route metric name template")
 	f.DurationVar(&cfg.Metrics.Interval, "metrics.interval", defaultConfig.Metrics.Interval, "metrics reporting interval")
-	f.DurationVar(&cfg.Metrics.Timeout, "metrics.timeout", defaultConfig.Metrics.Timeout, "timeout for metrics to become available")
-	f.DurationVar(&cfg.Metrics.Retry, "metrics.retry", defaultConfig.Metrics.Retry, "retry interval during startup")
-	f.StringVar(&cfg.Metrics.GraphiteAddr, "metrics.graphite.addr", defaultConfig.Metrics.GraphiteAddr, "graphite server address")
-	f.StringVar(&cfg.Metrics.StatsDAddr, "metrics.statsd.addr", defaultConfig.Metrics.StatsDAddr, "statsd server address")
+
+	f.StringVar(&cfg.Metrics.Prometheus.MetricsEndpoint, "metrics.prometheus.endpoint", defaultConfig.Metrics.Prometheus.MetricsEndpoint, "metrics endpoint for Prometheus")
+
+	f.StringVar(&cfg.Metrics.Graphite.Addr, "metrics.graphite.addr", defaultConfig.Metrics.Graphite.Addr, "graphite carbon receiver or aggregator (plaintext) address")
+
+	f.StringVar(&cfg.Metrics.StatsD.Addr, "metrics.statsd.addr", defaultConfig.Metrics.StatsD.Addr, "statsd server address")
+	f.Float64Var(&cfg.Metrics.StatsD.SampleRate, "metrics.statsd.sampleRate", defaultConfig.Metrics.StatsD.SampleRate, "statsd sample rate")
+
 	f.StringVar(&cfg.Metrics.Circonus.APIKey, "metrics.circonus.apikey", defaultConfig.Metrics.Circonus.APIKey, "Circonus API token key")
 	f.StringVar(&cfg.Metrics.Circonus.APIApp, "metrics.circonus.apiapp", defaultConfig.Metrics.Circonus.APIApp, "Circonus API token app")
 	f.StringVar(&cfg.Metrics.Circonus.APIURL, "metrics.circonus.apiurl", defaultConfig.Metrics.Circonus.APIURL, "Circonus API URL")
 	f.StringVar(&cfg.Metrics.Circonus.BrokerID, "metrics.circonus.brokerid", defaultConfig.Metrics.Circonus.BrokerID, "Circonus Broker ID")
 	f.StringVar(&cfg.Metrics.Circonus.CheckID, "metrics.circonus.checkid", defaultConfig.Metrics.Circonus.CheckID, "Circonus Check ID")
+
 	f.StringVar(&cfg.Registry.Backend, "registry.backend", defaultConfig.Registry.Backend, "registry backend")
 	f.DurationVar(&cfg.Registry.Timeout, "registry.timeout", defaultConfig.Registry.Timeout, "timeout for registry to become available")
 	f.DurationVar(&cfg.Registry.Retry, "registry.retry", defaultConfig.Registry.Retry, "retry interval during startup")

config/load_test.go

@@ -646,13 +646,6 @@ func TestLoad(t *testing.T) {
 				return cfg
 			},
 		},
-		{
-			args: []string{"-metrics.names", "some names"},
-			cfg: func(cfg *Config) *Config {
-				cfg.Metrics.Names = "some names"
-				return cfg
-			},
-		},
 		{
 			args: []string{"-metrics.interval", "5ms"},
 			cfg: func(cfg *Config) *Config {