Merge pull request cockroachdb#29377 from vilterp/backport2.1-29360

release-2.1: ui: don't show 125% axis label on percentage chart
vivekmenezes · Aug 30, 2018 · 5375efa · 5375efa
2 parents b569cd4 + c55c6d3
commit 5375efa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/ui/src/views/cluster/containers/nodeGraphs/dashboards/hardware.tsx b/pkg/ui/src/views/cluster/containers/nodeGraphs/dashboards/hardware.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import { LineGraph } from "src/views/cluster/components/linegraph";
 import { Metric, Axis, AxisUnits } from "src/views/shared/components/metricQuery";
 
-import {GraphDashboardProps, nodeDisplayName, storeIDsForNode} from "./dashboardUtils";
+import { GraphDashboardProps, nodeDisplayName, storeIDsForNode } from "./dashboardUtils";
 
 // TODO(vilterp): tooltips
 

diff --git a/pkg/ui/src/views/cluster/util/graphs.ts b/pkg/ui/src/views/cluster/util/graphs.ts
@@ -63,7 +63,10 @@ class AxisDomain {
     const max = extent[1];
     if (alignMinMax) {
       const alignedMin = min - min % increment;
-      const alignedMax = max - max % increment + increment;
+      let alignedMax = max;
+      if (max % increment !== 0) {
+        alignedMax = max - max % increment + increment;
+      }
       this.extent = [alignedMin, alignedMax];
     } else {
       this.extent = extent;