SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge current v1.7 into master

Browse Source
This commit is contained in:
Ludovic Fernandez
2018-08-06 14:58:03 +02:00
committed by Traefiker Bot
parent dad0e75121
commit e92b01c528
8 changed files with 129 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/server.go
View File

@@ -633,8 +633,11 @@ func registerMetricClients(metricsConfig *types.Metrics) metrics.Registry {
var registries []metrics.Registry
if metricsConfig.Prometheus != nil {
registries = append(registries, metrics.RegisterPrometheus(metricsConfig.Prometheus))
log.Debug("Configured Prometheus metrics")
prometheusRegister := metrics.RegisterPrometheus(metricsConfig.Prometheus)
if prometheusRegister != nil {
registries = append(registries, prometheusRegister)
log.Debug("Configured Prometheus metrics")
}
}
if metricsConfig.Datadog != nil {
registries = append(registries, metrics.RegisterDatadog(metricsConfig.Datadog))