diff --git a/docs/img/traefik-health.png b/docs/img/traefik-health.png index ca53570cb..cf3160975 100644 Binary files a/docs/img/traefik-health.png and b/docs/img/traefik-health.png differ diff --git a/docs/img/web.frontend.png b/docs/img/web.frontend.png index d8072d3ca..62a90e5e9 100644 Binary files a/docs/img/web.frontend.png and b/docs/img/web.frontend.png differ diff --git a/webui/package.json b/webui/package.json index b52a59d60..370f0d40a 100644 --- a/webui/package.json +++ b/webui/package.json @@ -30,6 +30,7 @@ "bulma": "^0.7.0", "core-js": "^2.4.1", "d3": "^4.13.0", + "d3-format": "^1.3.0", "date-fns": "^1.29.0", "lodash": "^4.17.5", "rxjs": "^5.5.6", diff --git a/webui/src/app/charts/bar-chart/bar-chart.component.ts b/webui/src/app/charts/bar-chart/bar-chart.component.ts index 47946d9ae..cc77ddfec 100644 --- a/webui/src/app/charts/bar-chart/bar-chart.component.ts +++ b/webui/src/app/charts/bar-chart/bar-chart.component.ts @@ -1,5 +1,6 @@ import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { axisBottom, axisLeft, easeLinear, max, min, scaleBand, scaleLinear, select } from 'd3'; +import { format } from 'd3-format'; import * as _ from 'lodash'; import { WindowService } from '../../services/window.service'; @@ -93,7 +94,7 @@ export class BarChartComponent implements OnInit, OnChanges { .call(axisBottom(this.x)); this.g.select('.axis--y') - .call(axisLeft(this.y).tickSize(-this.width)); + .call(axisLeft(this.y).tickFormat(format('~s')).tickSize(-this.width)); // Clean previous graph this.g.selectAll('.bar').remove(); diff --git a/webui/src/app/components/providers/providers.component.html b/webui/src/app/components/providers/providers.component.html index 66dd178a5..719fa1df0 100644 --- a/webui/src/app/components/providers/providers.component.html +++ b/webui/src/app/components/providers/providers.component.html @@ -559,7 +559,7 @@
- Men + Mem {{ p.buffering.memRequestBodyBytes }}
@@ -582,7 +582,7 @@
- Men + Mem {{ p.buffering.memResponseBodyBytes }}
diff --git a/webui/yarn.lock b/webui/yarn.lock index 1d00658b7..46117b48d 100644 --- a/webui/yarn.lock +++ b/webui/yarn.lock @@ -1698,6 +1698,10 @@ d3-format@1, d3-format@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a" +d3-format@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.0.tgz#a3ac44269a2011cdb87c7b5693040c18cddfff11" + d3-geo@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz#157e3b0f917379d0f73bebfff3be537f49fa7356"