diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json b/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json index a05f30c4e40..c1aaff61d0f 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json @@ -103,7 +103,7 @@ "timeFrom": null, "timeShift": null, "title": "Req/s", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -192,7 +192,7 @@ "timeFrom": null, "timeShift": null, "title": "Req/s", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -281,7 +281,7 @@ "timeFrom": null, "timeShift": null, "title": "Req/s", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -369,7 +369,7 @@ "timeFrom": null, "timeShift": null, "title": "Memory", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -458,7 +458,7 @@ "timeFrom": null, "timeShift": null, "title": "Hue gradient mode", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -547,7 +547,7 @@ "timeFrom": null, "timeShift": null, "title": "Hue gradient mode", - "type": "graph3" + "type": "timeseries" } ], "schemaVersion": 27, diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json b/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json index 29b34fafcd5..8ff87bd9b55 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json @@ -115,7 +115,7 @@ "timeFrom": null, "timeShift": null, "title": "Show gaps", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -225,7 +225,7 @@ "timeFrom": null, "timeShift": null, "title": "Gaps & null between every point for series B", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -355,7 +355,7 @@ "timeFrom": null, "timeShift": null, "title": "No nulls but unaligned series", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -455,7 +455,7 @@ "timeFrom": null, "timeShift": null, "title": "Connected", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -565,7 +565,7 @@ "timeFrom": null, "timeShift": null, "title": "Same as above but connected", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -695,7 +695,7 @@ "timeFrom": null, "timeShift": null, "title": "Same as above but connected", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -858,7 +858,7 @@ "timeShift": null, "title": "Null values in first series & show gaps ", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -1021,7 +1021,7 @@ "timeShift": null, "title": "Null values in second series show gaps (bugged)", "transformations": [], - "type": "graph3" + "type": "timeseries" } ], "schemaVersion": 27, diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json b/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json index 1dbcc21ecb1..844f252aa77 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json @@ -94,7 +94,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 10K (unit short)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -173,7 +173,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 10K (unit bytes metric)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -252,7 +252,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 10K (unit bytes IEC)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -331,7 +331,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 10K (unit short)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -410,7 +410,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0.0002 - 0.001 (unit short)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -489,7 +489,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 12000 - 30000 (unit ms)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -569,7 +569,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 1B (unit short)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -649,7 +649,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 0 - 1B (unit bytes)", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -728,7 +728,7 @@ "timeFrom": null, "timeShift": null, "title": "Data from 12000 - 30000 (unit ms)", - "type": "graph3" + "type": "timeseries" } ], "refresh": false, diff --git a/devenv/dev-dashboards/panel-graph/graph-ng.json b/devenv/dev-dashboards/panel-graph/graph-ng.json index fab1eba7c3d..a9a02909316 100644 --- a/devenv/dev-dashboards/panel-graph/graph-ng.json +++ b/devenv/dev-dashboards/panel-graph/graph-ng.json @@ -151,7 +151,7 @@ "timeFrom": null, "timeShift": null, "title": "Lines 500 data points", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -275,7 +275,7 @@ "timeFrom": null, "timeShift": null, "title": "10 data points, points auto", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -399,7 +399,7 @@ "timeFrom": null, "timeShift": null, "title": "20 data points, points never", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -523,7 +523,7 @@ "timeFrom": null, "timeShift": null, "title": "20 data points, points always", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -647,7 +647,7 @@ "timeFrom": null, "timeShift": null, "title": "Interpolation: linear", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -771,7 +771,7 @@ "timeFrom": null, "timeShift": null, "title": "Interpolation: Smooth", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -895,7 +895,7 @@ "timeFrom": null, "timeShift": null, "title": "Interpolation: Step before", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -1019,7 +1019,7 @@ "timeFrom": null, "timeShift": null, "title": "Interpolation: Step after", - "type": "graph3" + "type": "timeseries" }, { "collapsed": false, @@ -1173,7 +1173,7 @@ "timeShift": null, "title": "List", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -1327,7 +1327,7 @@ "timeShift": null, "title": "List legend to the right ", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -1480,7 +1480,7 @@ "timeShift": null, "title": "Table", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -1633,7 +1633,7 @@ "timeShift": null, "title": "Table to the right", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "collapsed": false, @@ -1755,7 +1755,7 @@ "timeFrom": null, "timeShift": null, "title": "Single mode", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -1863,7 +1863,7 @@ "timeFrom": null, "timeShift": null, "title": "Multi mode", - "type": "graph3" + "type": "timeseries" }, { "datasource": null, @@ -1970,7 +1970,7 @@ "timeFrom": null, "timeShift": null, "title": "No tooltip", - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -2081,7 +2081,7 @@ "timeShift": null, "title": "Diff number of datapoints and multi series tooltip", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "collapsed": false, @@ -2203,7 +2203,7 @@ "timeShift": null, "title": "Diff num datapoints & show gaps", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -2314,7 +2314,7 @@ "timeShift": null, "title": "Null values & show gaps", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -2425,7 +2425,7 @@ "timeShift": null, "title": "Null values & show gaps 2", "transformations": [], - "type": "graph3" + "type": "timeseries" }, { "datasource": "gdev-testdata", @@ -2553,7 +2553,7 @@ "timeShift": null, "title": "Null values & show connected", "transformations": [], - "type": "graph3" + "type": "timeseries" } ], "title": "Show gaps & Connected", @@ -2862,7 +2862,7 @@ "timeFrom": null, "timeShift": null, "title": "Dashed lines", - "type": "graph3" + "type": "timeseries" }, { "collapsed": false, @@ -3000,7 +3000,7 @@ "timeFrom": null, "timeShift": null, "title": "React NG graph", - "type": "graph3" + "type": "timeseries" } ], "refresh": false, diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index cf7c19894fc..6d163335204 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -39,7 +39,7 @@ const tempoPlugin = async () => await import(/* webpackChunkName: "tempoPlugin" */ 'app/plugins/datasource/tempo/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 dashListPanel from 'app/plugins/panel/dashlist/module'; import * as pluginsListPanel from 'app/plugins/panel/pluginlist/module'; @@ -81,7 +81,7 @@ const builtInPlugins: any = { 'app/plugins/datasource/tempo/module': tempoPlugin, '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/dashlist/module': dashListPanel, 'app/plugins/panel/pluginlist/module': pluginsListPanel, diff --git a/public/app/plugins/panel/graph3/README.md b/public/app/plugins/panel/graph3/README.md deleted file mode 100644 index ef1933f44bc..00000000000 --- a/public/app/plugins/panel/graph3/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Graph3 Panel - Native Plugin - -This is a graph panel exprimenting with the charting library: -https://github.com/leeoniya/uPlot - diff --git a/public/app/plugins/panel/graph3/HideSeriesConfigEditor.tsx b/public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx similarity index 100% rename from public/app/plugins/panel/graph3/HideSeriesConfigEditor.tsx rename to public/app/plugins/panel/timeseries/HideSeriesConfigEditor.tsx diff --git a/public/app/plugins/panel/graph3/LayoutBuilder.ts b/public/app/plugins/panel/timeseries/LayoutBuilder.ts similarity index 100% rename from public/app/plugins/panel/graph3/LayoutBuilder.ts rename to public/app/plugins/panel/timeseries/LayoutBuilder.ts diff --git a/public/app/plugins/panel/graph3/LineStyleEditor.tsx b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx similarity index 100% rename from public/app/plugins/panel/graph3/LineStyleEditor.tsx rename to public/app/plugins/panel/timeseries/LineStyleEditor.tsx diff --git a/public/app/plugins/panel/timeseries/README.md b/public/app/plugins/panel/timeseries/README.md new file mode 100644 index 00000000000..66137ea1780 --- /dev/null +++ b/public/app/plugins/panel/timeseries/README.md @@ -0,0 +1,3 @@ +# Timeseries Panel - Native Plugin + +This panel allows visualizing timeseries data diff --git a/public/app/plugins/panel/graph3/ScaleDistributionEditor.tsx b/public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx similarity index 100% rename from public/app/plugins/panel/graph3/ScaleDistributionEditor.tsx rename to public/app/plugins/panel/timeseries/ScaleDistributionEditor.tsx diff --git a/public/app/plugins/panel/graph3/GraphPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx similarity index 92% rename from public/app/plugins/panel/graph3/GraphPanel.tsx rename to public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx index 4490bdf5dd9..8b4164404ff 100644 --- a/public/app/plugins/panel/graph3/GraphPanel.tsx +++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx @@ -7,9 +7,9 @@ import { ExemplarsPlugin } from './plugins/ExemplarsPlugin'; import { hideSeriesConfigFactory } from './hideSeriesConfigFactory'; import { ContextMenuPlugin } from './plugins/ContextMenuPlugin'; -interface GraphPanelProps extends PanelProps {} +interface TimeSeriesPanelProps extends PanelProps {} -export const GraphPanel: React.FC = ({ +export const TimeSeriesPanel: React.FC = ({ data, timeRange, timeZone, diff --git a/public/app/plugins/panel/graph3/__snapshots__/migrations.test.ts.snap b/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap similarity index 100% rename from public/app/plugins/panel/graph3/__snapshots__/migrations.test.ts.snap rename to public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap diff --git a/public/app/plugins/panel/graph3/hideSeriesConfigFactory.test.ts b/public/app/plugins/panel/timeseries/hideSeriesConfigFactory.test.ts similarity index 100% rename from public/app/plugins/panel/graph3/hideSeriesConfigFactory.test.ts rename to public/app/plugins/panel/timeseries/hideSeriesConfigFactory.test.ts diff --git a/public/app/plugins/panel/graph3/hideSeriesConfigFactory.ts b/public/app/plugins/panel/timeseries/hideSeriesConfigFactory.ts similarity index 100% rename from public/app/plugins/panel/graph3/hideSeriesConfigFactory.ts rename to public/app/plugins/panel/timeseries/hideSeriesConfigFactory.ts diff --git a/public/app/plugins/panel/graph3/img/icn-graph-panel.svg b/public/app/plugins/panel/timeseries/img/icn-graph-panel.svg similarity index 100% rename from public/app/plugins/panel/graph3/img/icn-graph-panel.svg rename to public/app/plugins/panel/timeseries/img/icn-graph-panel.svg diff --git a/public/app/plugins/panel/graph3/migrations.test.ts b/public/app/plugins/panel/timeseries/migrations.test.ts similarity index 100% rename from public/app/plugins/panel/graph3/migrations.test.ts rename to public/app/plugins/panel/timeseries/migrations.test.ts diff --git a/public/app/plugins/panel/graph3/migrations.ts b/public/app/plugins/panel/timeseries/migrations.ts similarity index 100% rename from public/app/plugins/panel/graph3/migrations.ts rename to public/app/plugins/panel/timeseries/migrations.ts diff --git a/public/app/plugins/panel/graph3/module.tsx b/public/app/plugins/panel/timeseries/module.tsx similarity index 98% rename from public/app/plugins/panel/graph3/module.tsx rename to public/app/plugins/panel/timeseries/module.tsx index 90a934da104..54bef852ce8 100644 --- a/public/app/plugins/panel/graph3/module.tsx +++ b/public/app/plugins/panel/timeseries/module.tsx @@ -17,13 +17,13 @@ import { ScaleDistributionConfig, } from '@grafana/ui'; import { SeriesConfigEditor } from './HideSeriesConfigEditor'; -import { GraphPanel } from './GraphPanel'; +import { TimeSeriesPanel } from './TimeSeriesPanel'; import { graphPanelChangedHandler } from './migrations'; import { Options } from './types'; import { ScaleDistributionEditor } from './ScaleDistributionEditor'; import { LineStyleEditor } from './LineStyleEditor'; -export const plugin = new PanelPlugin(GraphPanel) +export const plugin = new PanelPlugin(TimeSeriesPanel) .setPanelChangeHandler(graphPanelChangedHandler) .useFieldConfig({ standardOptions: { diff --git a/public/app/plugins/panel/graph3/plugin.json b/public/app/plugins/panel/timeseries/plugin.json similarity index 84% rename from public/app/plugins/panel/graph3/plugin.json rename to public/app/plugins/panel/timeseries/plugin.json index c87373497e9..e7c4e283b10 100644 --- a/public/app/plugins/panel/graph3/plugin.json +++ b/public/app/plugins/panel/timeseries/plugin.json @@ -1,7 +1,7 @@ { "type": "panel", - "name": "uPlot graph", - "id": "graph3", + "name": "Timeseries", + "id": "timeseries", "state": "alpha", "info": { diff --git a/public/app/plugins/panel/graph3/plugins/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx similarity index 100% rename from public/app/plugins/panel/graph3/plugins/AnnotationMarker.tsx rename to public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx diff --git a/public/app/plugins/panel/graph3/plugins/AnnotationsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx similarity index 100% rename from public/app/plugins/panel/graph3/plugins/AnnotationsPlugin.tsx rename to public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx diff --git a/public/app/plugins/panel/graph3/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx similarity index 100% rename from public/app/plugins/panel/graph3/plugins/ContextMenuPlugin.tsx rename to public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx diff --git a/public/app/plugins/panel/graph3/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx similarity index 100% rename from public/app/plugins/panel/graph3/plugins/ExemplarMarker.tsx rename to public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx diff --git a/public/app/plugins/panel/graph3/plugins/ExemplarsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx similarity index 100% rename from public/app/plugins/panel/graph3/plugins/ExemplarsPlugin.tsx rename to public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx diff --git a/public/app/plugins/panel/graph3/types.ts b/public/app/plugins/panel/timeseries/types.ts similarity index 100% rename from public/app/plugins/panel/graph3/types.ts rename to public/app/plugins/panel/timeseries/types.ts