opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

GraphNG: use uPlot's native ms support (#29445)

Browse Source
This commit is contained in:
Leon Sorokin
2020-11-27 17:06:57 -06:00
committed by GitHub
parent 643f790753
commit 61d6dcf9ce
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/package.json
View File

@ -71,7 +71,7 @@
"react-transition-group": "4.4.1", "react-transition-group": "4.4.1",
"slate": "0.47.8", "slate": "0.47.8",
"tinycolor2": "1.4.1", "tinycolor2": "1.4.1",
"uplot": "1.4.4" "uplot": "1.4.6"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-commonjs": "11.0.2",

8
packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
View File

@ -32,6 +32,7 @@ export class UPlotAxisBuilder extends PlotConfigBuilder<AxisProps, Axis> {
timeZone, timeZone,
theme, theme,
} = this.props; } = this.props;
const gridColor = theme.isDark ? theme.palette.gray25 : theme.palette.gray90; const gridColor = theme.isDark ? theme.palette.gray25 : theme.palette.gray90;
let config: Axis = { let config: Axis = {
@ -82,7 +83,7 @@ function calculateSpace(self: uPlot, axisIdx: number, scaleMin: number, scaleMax
// For x-axis (bottom) we need bigger spacing between labels // For x-axis (bottom) we need bigger spacing between labels
if (axis.side === 2) { if (axis.side === 2) {
return 60; return 50;
} }
return 30; return 30;
@ -114,11 +115,12 @@ function calculateAxisSize(self: uPlot, values: string[], axisIdx: number) {
function formatTime(self: uPlot, splits: number[], axisIdx: number, foundSpace: number, foundIncr: number): string[] { function formatTime(self: uPlot, splits: number[], axisIdx: number, foundSpace: number, foundIncr: number): string[] {
const timeZone = (self.axes[axisIdx] as any).timeZone; const timeZone = (self.axes[axisIdx] as any).timeZone;
const scale = self.scales.x; const scale = self.scales.x;
const range = (scale?.max ?? 0) - (scale?.min ?? 0) / 1000; const range = ((scale?.max ?? 0) - (scale?.min ?? 0)) / 1e3;
const oneDay = 86400; const oneDay = 86400;
const oneYear = 31536000; const oneYear = 31536000;
foundIncr = foundIncr / 1000; foundIncr /= 1e3;
let format = systemDateFormats.interval.minute; let format = systemDateFormats.interval.minute;
if (foundIncr < 1) { if (foundIncr < 1) {

3
packages/grafana-ui/src/components/uPlot/hooks.ts
View File

@ -116,7 +116,7 @@ export const usePlotConfig = (width: number, height: number, timeZone: TimeZone,
const tz = getTimeZoneInfo(timeZone, Date.now())?.ianaName; const tz = getTimeZoneInfo(timeZone, Date.now())?.ianaName;
if (tz) { if (tz) {
fmt = (ts: number) => uPlot.tzDate(new Date(ts * 1e3), tz); fmt = (ts: number) => uPlot.tzDate(new Date(ts), tz);
} }
return fmt; return fmt;
@ -130,6 +130,7 @@ export const usePlotConfig = (width: number, height: number, timeZone: TimeZone,
...DEFAULT_PLOT_CONFIG, ...DEFAULT_PLOT_CONFIG,
width, width,
height, height,
ms: 1,
plugins: Object.entries(plugins).map(p => ({ plugins: Object.entries(plugins).map(p => ({
hooks: p[1].hooks, hooks: p[1].hooks,
})), })),

8
yarn.lock
View File

@ -27296,10 +27296,10 @@ update-notifier@^2.5.0:
semver-diff "^2.0.0" semver-diff "^2.0.0"
xdg-basedir "^3.0.0" xdg-basedir "^3.0.0"
uplot@1.4.4: uplot@1.4.6:
version "1.4.4" version "1.4.6"
resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.4.4.tgz#ab30da26b1e2d432df5bc43389e70399787f0448" resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.4.6.tgz#52b6812c06b8d3cb89d4a8d053f45415cb5d9a13"
integrity sha512-vgV84+by3fGTU4bdpffSvA9FX8ide6MsmlBzOASPDdZCquXmCA+T2qodeNdnBen+7YOeqD9H91epVnF0dQgVKw== integrity sha512-nw3LdjLFhAqKQF/Rv7QjZICVnjJemOQVj2L3b7889gHBrnC1LwltkzTcawDcbMe6pxo++0KVev9xSC0YCw+m5w==
upper-case-first@^1.1.0, upper-case-first@^1.1.2: upper-case-first@^1.1.0, upper-case-first@^1.1.2:
version "1.1.2" version "1.1.2"