Prepare release v1.7.30

Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v1.7.30](https://github.com/traefik/traefik/tree/v1.7.30) (2021-04-07)
+[All Commits](https://github.com/traefik/traefik/compare/v1.7.29...v1.7.30)
+
+**Bug fixes:**
+- **[metrics]** Prometheus: fixing prom Handler to use the custom registry ([#8040](https://github.com/traefik/traefik/pull/8040) by [tomMoulard](https://github.com/tomMoulard))
+
 ## [v1.7.29](https://github.com/traefik/traefik/tree/v1.7.29) (2021-03-22)
 [All Commits](https://github.com/traefik/traefik/compare/v1.7.28...v1.7.29)
 

metrics/prometheus.go

@@ -65,7 +65,9 @@ type PrometheusHandler struct{}
 
 // AddRoutes adds Prometheus routes on a router.
 func (h PrometheusHandler) AddRoutes(router *mux.Router) {
-	router.Methods(http.MethodGet).Path("/metrics").Handler(promhttp.Handler())
+	router.Methods(http.MethodGet).Path("/metrics").Handler(
+		promhttp.HandlerFor(promRegistry, promhttp.HandlerOpts{}),
+	)
 }
 
 // RegisterPrometheus registers all Prometheus metrics.

script/gcg/traefik-bugfix.toml

@@ -4,11 +4,11 @@ RepositoryName = "traefik"
 OutputType = "file"
 FileName = "traefik_changelog.md"
 
-# example new bugfix v1.7.29
+# example new bugfix v1.7.30
 CurrentRef = "v1.7"
-PreviousRef = "v1.7.28"
+PreviousRef = "v1.7.29"
 BaseBranch = "v1.7"
-FutureCurrentRefName = "v1.7.29"
+FutureCurrentRefName = "v1.7.30"
 
 ThresholdPreviousRef = 10
 ThresholdCurrentRef = 10