Merge current v3.1 into master

integration/fixtures/access_log/access_log_base.toml

@@ -22,10 +22,17 @@
     address = ":8008"
   [entryPoints.preflight]
     address = ":8009"
+  [entryPoints.ping]
+    address = ":8010"
 
 [api]
   insecure = true
 
+[ping]
+
+[metrics]
+  [metrics.prometheus]
+
 [providers]
   [providers.docker]
     exposedByDefault = false

integration/fixtures/access_log/access_log_ping.toml

@@ -1,30 +0,0 @@
-[global]
-  checkNewVersion = false
-  sendAnonymousUsage = false
-
-[log]
-  level = "ERROR"
-  filePath = "traefik.log"
-
-[accessLog]
-  filePath = "access.log"
-
-[entryPoints]
-  [entryPoints.web]
-    address = ":8000"
-
-[api]
-  insecure = true
-
-[ping]
-
-[providers]
-  [providers.file]
-    filename = "{{ .SelfFilename }}"
-
-## dynamic configuration ##
-[http.routers]
-  [http.routers.customPing]
-    entryPoints = ["web"]
-    rule = "PathPrefix(`/ping`)"
-    service = "ping@internal"