Skip to content

N
nexpie-grafana-theme
Commit e7c53ddd by Ryan McKinley Committed by GitHub
Options

GraphNG: rename "graph3" to "timeseries" panel (#30123)

parent e99cb309
Showing with 56 additions and 58 deletions
devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Req/s", "title": "Req/s",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Req/s", "title": "Req/s",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Req/s", "title": "Req/s",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Memory", "title": "Memory",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Hue gradient mode", "title": "Hue gradient mode",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -547,7 +547,7 @@ ...@@ -547,7 +547,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Hue gradient mode", "title": "Hue gradient mode",
"type": "graph3" "type": "timeseries"
} }
], ],
"schemaVersion": 27, "schemaVersion": 27,
......
devenv/dev-dashboards/panel-graph/graph-ng-nulls.json
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Show gaps", "title": "Show gaps",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Gaps & null between every point for series B", "title": "Gaps & null between every point for series B",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "No nulls but unaligned series", "title": "No nulls but unaligned series",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -455,7 +455,7 @@ ...@@ -455,7 +455,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Connected", "title": "Connected",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Same as above but connected", "title": "Same as above but connected",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -695,7 +695,7 @@ ...@@ -695,7 +695,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Same as above but connected", "title": "Same as above but connected",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -858,7 +858,7 @@ ...@@ -858,7 +858,7 @@
"timeShift": null, "timeShift": null,
"title": "Null values in first series & show gaps ", "title": "Null values in first series & show gaps ",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -1021,7 +1021,7 @@ ...@@ -1021,7 +1021,7 @@
"timeShift": null, "timeShift": null,
"title": "Null values in second series show gaps (bugged)", "title": "Null values in second series show gaps (bugged)",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
} }
], ],
"schemaVersion": 27, "schemaVersion": 27,
......
devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 10K (unit short)", "title": "Data from 0 - 10K (unit short)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 10K (unit bytes metric)", "title": "Data from 0 - 10K (unit bytes metric)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 10K (unit bytes IEC)", "title": "Data from 0 - 10K (unit bytes IEC)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 10K (unit short)", "title": "Data from 0 - 10K (unit short)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0.0002 - 0.001 (unit short)", "title": "Data from 0.0002 - 0.001 (unit short)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -489,7 +489,7 @@ ...@@ -489,7 +489,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 12000 - 30000 (unit ms)", "title": "Data from 12000 - 30000 (unit ms)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 1B (unit short)", "title": "Data from 0 - 1B (unit short)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 0 - 1B (unit bytes)", "title": "Data from 0 - 1B (unit bytes)",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -728,7 +728,7 @@ ...@@ -728,7 +728,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Data from 12000 - 30000 (unit ms)", "title": "Data from 12000 - 30000 (unit ms)",
"type": "graph3" "type": "timeseries"
} }
], ],
"refresh": false, "refresh": false,
......
devenv/dev-dashboards/panel-graph/graph-ng.json
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Lines 500 data points", "title": "Lines 500 data points",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "10 data points, points auto", "title": "10 data points, points auto",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "20 data points, points never", "title": "20 data points, points never",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "20 data points, points always", "title": "20 data points, points always",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -647,7 +647,7 @@ ...@@ -647,7 +647,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Interpolation: linear", "title": "Interpolation: linear",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -771,7 +771,7 @@ ...@@ -771,7 +771,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Interpolation: Smooth", "title": "Interpolation: Smooth",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -895,7 +895,7 @@ ...@@ -895,7 +895,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Interpolation: Step before", "title": "Interpolation: Step before",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -1019,7 +1019,7 @@ ...@@ -1019,7 +1019,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Interpolation: Step after", "title": "Interpolation: Step after",
"type": "graph3" "type": "timeseries"
}, },
{ {
"collapsed": false, "collapsed": false,
...@@ -1173,7 +1173,7 @@ ...@@ -1173,7 +1173,7 @@
"timeShift": null, "timeShift": null,
"title": "List", "title": "List",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -1327,7 +1327,7 @@ ...@@ -1327,7 +1327,7 @@
"timeShift": null, "timeShift": null,
"title": "List legend to the right ", "title": "List legend to the right ",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -1480,7 +1480,7 @@ ...@@ -1480,7 +1480,7 @@
"timeShift": null, "timeShift": null,
"title": "Table", "title": "Table",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -1633,7 +1633,7 @@ ...@@ -1633,7 +1633,7 @@
"timeShift": null, "timeShift": null,
"title": "Table to the right", "title": "Table to the right",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"collapsed": false, "collapsed": false,
...@@ -1755,7 +1755,7 @@ ...@@ -1755,7 +1755,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Single mode", "title": "Single mode",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -1863,7 +1863,7 @@ ...@@ -1863,7 +1863,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Multi mode", "title": "Multi mode",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": null, "datasource": null,
...@@ -1970,7 +1970,7 @@ ...@@ -1970,7 +1970,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "No tooltip", "title": "No tooltip",
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -2081,7 +2081,7 @@ ...@@ -2081,7 +2081,7 @@
"timeShift": null, "timeShift": null,
"title": "Diff number of datapoints and multi series tooltip", "title": "Diff number of datapoints and multi series tooltip",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"collapsed": false, "collapsed": false,
...@@ -2203,7 +2203,7 @@ ...@@ -2203,7 +2203,7 @@
"timeShift": null, "timeShift": null,
"title": "Diff num datapoints & show gaps", "title": "Diff num datapoints & show gaps",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -2314,7 +2314,7 @@ ...@@ -2314,7 +2314,7 @@
"timeShift": null, "timeShift": null,
"title": "Null values & show gaps", "title": "Null values & show gaps",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -2425,7 +2425,7 @@ ...@@ -2425,7 +2425,7 @@
"timeShift": null, "timeShift": null,
"title": "Null values & show gaps 2", "title": "Null values & show gaps 2",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
}, },
{ {
"datasource": "gdev-testdata", "datasource": "gdev-testdata",
...@@ -2553,7 +2553,7 @@ ...@@ -2553,7 +2553,7 @@
"timeShift": null, "timeShift": null,
"title": "Null values & show connected", "title": "Null values & show connected",
"transformations": [], "transformations": [],
"type": "graph3" "type": "timeseries"
} }
], ],
"title": "Show gaps & Connected", "title": "Show gaps & Connected",
...@@ -2862,7 +2862,7 @@ ...@@ -2862,7 +2862,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "Dashed lines", "title": "Dashed lines",
"type": "graph3" "type": "timeseries"
}, },
{ {
"collapsed": false, "collapsed": false,
...@@ -3000,7 +3000,7 @@ ...@@ -3000,7 +3000,7 @@
"timeFrom": null, "timeFrom": null,
"timeShift": null, "timeShift": null,
"title": "React NG graph", "title": "React NG graph",
"type": "graph3" "type": "timeseries"
} }
], ],
"refresh": false, "refresh": false,
......
public/app/features/plugins/built_in_plugins.ts
...@@ -39,7 +39,7 @@ const tempoPlugin = async () => ...@@ -39,7 +39,7 @@ const tempoPlugin = async () =>
await import(/* webpackChunkName: "tempoPlugin" */ 'app/plugins/datasource/tempo/module'); await import(/* webpackChunkName: "tempoPlugin" */ 'app/plugins/datasource/tempo/module');
import * as textPanel from 'app/plugins/panel/text/module'; import * as textPanel from 'app/plugins/panel/text/module';
import * as graph3Panel from 'app/plugins/panel/graph3/module'; import * as timeseriesPanel from 'app/plugins/panel/timeseries/module';
import * as graphPanel from 'app/plugins/panel/graph/module'; import * as graphPanel from 'app/plugins/panel/graph/module';
import * as dashListPanel from 'app/plugins/panel/dashlist/module'; import * as dashListPanel from 'app/plugins/panel/dashlist/module';
import * as pluginsListPanel from 'app/plugins/panel/pluginlist/module'; import * as pluginsListPanel from 'app/plugins/panel/pluginlist/module';
...@@ -81,7 +81,7 @@ const builtInPlugins: any = { ...@@ -81,7 +81,7 @@ const builtInPlugins: any = {
'app/plugins/datasource/tempo/module': tempoPlugin, 'app/plugins/datasource/tempo/module': tempoPlugin,
'app/plugins/panel/text/module': textPanel, 'app/plugins/panel/text/module': textPanel,
'app/plugins/panel/graph3/module': graph3Panel, 'app/plugins/panel/timeseries/module': timeseriesPanel,
'app/plugins/panel/graph/module': graphPanel, 'app/plugins/panel/graph/module': graphPanel,
'app/plugins/panel/dashlist/module': dashListPanel, 'app/plugins/panel/dashlist/module': dashListPanel,
'app/plugins/panel/pluginlist/module': pluginsListPanel, 'app/plugins/panel/pluginlist/module': pluginsListPanel,
......
public/app/plugins/panel/graph3/README.md deleted 100644 → 0
# Graph3 Panel - Native Plugin
This is a graph panel exprimenting with the charting library:
https://github.com/leeoniya/uPlot
public/app/plugins/panel/timeseries/README.md 0 → 100644
# Timeseries Panel - Native Plugin
This panel allows visualizing timeseries data
public/app/plugins/panel/graph3/GraphPanel.tsx → public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
...@@ -7,9 +7,9 @@ import { ExemplarsPlugin } from './plugins/ExemplarsPlugin'; ...@@ -7,9 +7,9 @@ import { ExemplarsPlugin } from './plugins/ExemplarsPlugin';
import { hideSeriesConfigFactory } from './hideSeriesConfigFactory'; import { hideSeriesConfigFactory } from './hideSeriesConfigFactory';
import { ContextMenuPlugin } from './plugins/ContextMenuPlugin'; import { ContextMenuPlugin } from './plugins/ContextMenuPlugin';
interface GraphPanelProps extends PanelProps<Options> {} interface TimeSeriesPanelProps extends PanelProps<Options> {}
export const GraphPanel: React.FC<GraphPanelProps> = ({ export const TimeSeriesPanel: React.FC<TimeSeriesPanelProps> = ({
data, data,
timeRange, timeRange,
timeZone, timeZone,
......
public/app/plugins/panel/graph3/module.tsx → public/app/plugins/panel/timeseries/module.tsx
...@@ -17,13 +17,13 @@ import { ...@@ -17,13 +17,13 @@ import {
ScaleDistributionConfig, ScaleDistributionConfig,
} from '@grafana/ui'; } from '@grafana/ui';
import { SeriesConfigEditor } from './HideSeriesConfigEditor'; import { SeriesConfigEditor } from './HideSeriesConfigEditor';
import { GraphPanel } from './GraphPanel'; import { TimeSeriesPanel } from './TimeSeriesPanel';
import { graphPanelChangedHandler } from './migrations'; import { graphPanelChangedHandler } from './migrations';
import { Options } from './types'; import { Options } from './types';
import { ScaleDistributionEditor } from './ScaleDistributionEditor'; import { ScaleDistributionEditor } from './ScaleDistributionEditor';
import { LineStyleEditor } from './LineStyleEditor'; import { LineStyleEditor } from './LineStyleEditor';
export const plugin = new PanelPlugin<Options, GraphFieldConfig>(GraphPanel) export const plugin = new PanelPlugin<Options, GraphFieldConfig>(TimeSeriesPanel)
.setPanelChangeHandler(graphPanelChangedHandler) .setPanelChangeHandler(graphPanelChangedHandler)
.useFieldConfig({ .useFieldConfig({
standardOptions: { standardOptions: {
......
public/app/plugins/panel/graph3/plugin.json → public/app/plugins/panel/timeseries/plugin.json
{ {
"type": "panel", "type": "panel",
"name": "uPlot graph", "name": "Timeseries",
"id": "graph3", "id": "timeseries",
"state": "alpha", "state": "alpha",
"info": { "info": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment