Merge branch 'v2.0' into v2.1

2019-12-02 18:20:29 +01:00 · 2019-12-02 18:20:29 +01:00 · 89919dbe36
commit 89919dbe36
parent 4cb9eec257 ecd51a1428
52 changed files with 677 additions and 336 deletions
--- a/docs/content/observability/metrics/prometheus.md
+++ b/docs/content/observability/metrics/prometheus.md
@ -113,8 +113,8 @@ metrics:
 ```

 ```bash tab="CLI"
--entryPoints.metrics.address=":8082"
--metrics.prometheus.entryPoint="metrics"
+--entryPoints.metrics.address=:8082
+--metrics.prometheus.entryPoint=metrics
 ```

 #### `manualRouting`