From 216f0183776d6bbb151a699078f703b5d6f2e9a2 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Sat, 29 May 2021 15:03:37 -0400 Subject: [PATCH] Rename: Status grid to history (#34864) (#34953) (cherry picked from commit 4972e0f6a10ac2ab3c0f429eb48b2f27b1c15af3) Co-authored-by: Ryan McKinley --- .../datasource-testdata/new_features_in_v8.json | 8 ++++---- devenv/dev-dashboards/panel-timeline/timeline-demo.json | 2 +- devenv/dev-dashboards/panel-timeline/timeline-modes.json | 2 +- pkg/api/frontendsettings.go | 2 +- pkg/plugins/manager/manager_test.go | 2 +- public/app/features/plugins/built_in_plugins.ts | 4 ++-- public/app/plugins/panel/state-timeline/types.ts | 4 ++-- .../StatusHistoryPanel.tsx} | 2 +- .../panel/{status-grid => status-history}/img/status.svg | 0 .../panel/{status-grid => status-history}/module.tsx | 4 ++-- .../panel/{status-grid => status-history}/plugin.json | 4 ++-- .../panel/{status-grid => status-history}/types.ts | 0 12 files changed, 17 insertions(+), 17 deletions(-) rename public/app/plugins/panel/{status-grid/StatusGridPanel.tsx => status-history/StatusHistoryPanel.tsx} (96%) rename public/app/plugins/panel/{status-grid => status-history}/img/status.svg (100%) rename public/app/plugins/panel/{status-grid => status-history}/module.tsx (95%) rename public/app/plugins/panel/{status-grid => status-history}/plugin.json (83%) rename public/app/plugins/panel/{status-grid => status-history}/types.ts (100%) diff --git a/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json b/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json index 266ed794efa..e0170fe82c0 100644 --- a/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json +++ b/devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json @@ -354,7 +354,7 @@ "id": 67, "links": [], "options": { - "content": "## Status grid\n\nA sister panel to the state timeline is the new Status grid panel. It can visualize periodic state in a \ngrid. Works with both numerical, string or boolean state. ", + "content": "## Status history\n\nA sister panel to the state timeline is the new Status history panel. It can visualize periodic state in a \ngrid. Works with both numerical, string or boolean state. ", "mode": "markdown" }, "pluginVersion": "8.1.0-pre", @@ -430,7 +430,7 @@ } ], "title": "State timeline with time series + thresholds", - "type": "status-grid" + "type": "status-history" }, { "datasource": "gdev-testdata", @@ -518,8 +518,8 @@ "stringInput": "true,true,true,false,true,true,false,true,false" } ], - "title": "Status grid - boolean values", - "type": "status-grid" + "title": "Status history - boolean values", + "type": "status-history" }, { "cacheTimeout": null, diff --git a/devenv/dev-dashboards/panel-timeline/timeline-demo.json b/devenv/dev-dashboards/panel-timeline/timeline-demo.json index 0064cb80483..e2aec6e61db 100644 --- a/devenv/dev-dashboards/panel-timeline/timeline-demo.json +++ b/devenv/dev-dashboards/panel-timeline/timeline-demo.json @@ -389,7 +389,7 @@ } ], "title": "Status map", - "type": "status-grid" + "type": "status-history" } ], "refresh": false, diff --git a/devenv/dev-dashboards/panel-timeline/timeline-modes.json b/devenv/dev-dashboards/panel-timeline/timeline-modes.json index 7b8184df53c..8600d3274e8 100644 --- a/devenv/dev-dashboards/panel-timeline/timeline-modes.json +++ b/devenv/dev-dashboards/panel-timeline/timeline-modes.json @@ -350,7 +350,7 @@ } ], "title": "Status grid", - "type": "status-grid" + "type": "status-history" } ], "refresh": false, diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index f61e1c09357..7a506233c97 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -288,7 +288,7 @@ func getPanelSort(id string) int { sort = 9 case "heatmap": sort = 10 - case "status-grid": + case "status-history": sort = 11 case "histogram": sort = 12 diff --git a/pkg/plugins/manager/manager_test.go b/pkg/plugins/manager/manager_test.go index a3038d696d9..cc4ebf23ad5 100644 --- a/pkg/plugins/manager/manager_test.go +++ b/pkg/plugins/manager/manager_test.go @@ -489,7 +489,7 @@ func verifyCorePluginCatalogue(t *testing.T, pm *PluginManager) { "table-old", "text", "state-timeline", - "status-grid", + "status-history", "timeseries", "welcome", "xychart", diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index 04973256170..4a3b32acf3c 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -43,7 +43,7 @@ const alertmanagerPlugin = async () => import * as textPanel from 'app/plugins/panel/text/module'; import * as timeseriesPanel from 'app/plugins/panel/timeseries/module'; import * as stateTimelinePanel from 'app/plugins/panel/state-timeline/module'; -import * as statusGridPanel from 'app/plugins/panel/status-grid/module'; +import * as statusHistoryPanel from 'app/plugins/panel/status-history/module'; import * as graphPanel from 'app/plugins/panel/graph/module'; import * as xyChartPanel from 'app/plugins/panel/xychart/module'; import * as dashListPanel from 'app/plugins/panel/dashlist/module'; @@ -92,7 +92,7 @@ const builtInPlugins: any = { 'app/plugins/panel/text/module': textPanel, 'app/plugins/panel/timeseries/module': timeseriesPanel, 'app/plugins/panel/state-timeline/module': stateTimelinePanel, - 'app/plugins/panel/status-grid/module': statusGridPanel, + 'app/plugins/panel/status-history/module': statusHistoryPanel, 'app/plugins/panel/graph/module': graphPanel, 'app/plugins/panel/xychart/module': xyChartPanel, 'app/plugins/panel/dashlist/module': dashListPanel, diff --git a/public/app/plugins/panel/state-timeline/types.ts b/public/app/plugins/panel/state-timeline/types.ts index 28ec2d1922e..4397da50a35 100644 --- a/public/app/plugins/panel/state-timeline/types.ts +++ b/public/app/plugins/panel/state-timeline/types.ts @@ -9,7 +9,7 @@ export interface TimelineOptions extends OptionsWithLegend { showValue: BarValueVisibility; rowHeight: number; - // only used for "samples" mode (status-grid) + // only used for "samples" mode (status-history) colWidth?: number; // only used in "changes" mode (state-timeline) mergeValues?: boolean; @@ -51,6 +51,6 @@ export const defaultTimelineFieldConfig: TimelineFieldConfig = { export enum TimelineMode { // state-timeline Changes = 'changes', - // status-grid + // status-history Samples = 'samples', } diff --git a/public/app/plugins/panel/status-grid/StatusGridPanel.tsx b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx similarity index 96% rename from public/app/plugins/panel/status-grid/StatusGridPanel.tsx rename to public/app/plugins/panel/status-history/StatusHistoryPanel.tsx index df3ec2da79b..90b5a2f163c 100755 --- a/public/app/plugins/panel/status-grid/StatusGridPanel.tsx +++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx @@ -11,7 +11,7 @@ interface TimelinePanelProps extends PanelProps {} /** * @alpha */ -export const StatusGridPanel: React.FC = ({ +export const StatusHistoryPanel: React.FC = ({ data, timeRange, timeZone, diff --git a/public/app/plugins/panel/status-grid/img/status.svg b/public/app/plugins/panel/status-history/img/status.svg similarity index 100% rename from public/app/plugins/panel/status-grid/img/status.svg rename to public/app/plugins/panel/status-history/img/status.svg diff --git a/public/app/plugins/panel/status-grid/module.tsx b/public/app/plugins/panel/status-history/module.tsx similarity index 95% rename from public/app/plugins/panel/status-grid/module.tsx rename to public/app/plugins/panel/status-history/module.tsx index 5c679493fc7..8d6893023d9 100755 --- a/public/app/plugins/panel/status-grid/module.tsx +++ b/public/app/plugins/panel/status-history/module.tsx @@ -1,10 +1,10 @@ import { FieldColorModeId, FieldConfigProperty, PanelPlugin } from '@grafana/data'; -import { StatusGridPanel } from './StatusGridPanel'; +import { StatusHistoryPanel } from './StatusHistoryPanel'; import { StatusPanelOptions, StatusFieldConfig, defaultStatusFieldConfig } from './types'; import { BarValueVisibility } from '@grafana/ui'; import { addLegendOptions } from '@grafana/ui/src/options/builder'; -export const plugin = new PanelPlugin(StatusGridPanel) +export const plugin = new PanelPlugin(StatusHistoryPanel) .useFieldConfig({ standardOptions: { [FieldConfigProperty.Color]: { diff --git a/public/app/plugins/panel/status-grid/plugin.json b/public/app/plugins/panel/status-history/plugin.json similarity index 83% rename from public/app/plugins/panel/status-grid/plugin.json rename to public/app/plugins/panel/status-history/plugin.json index 175533e63e2..80c8495fdc1 100755 --- a/public/app/plugins/panel/status-grid/plugin.json +++ b/public/app/plugins/panel/status-history/plugin.json @@ -1,7 +1,7 @@ { "type": "panel", - "name": "Status grid", - "id": "status-grid", + "name": "Status history", + "id": "status-history", "state": "beta", diff --git a/public/app/plugins/panel/status-grid/types.ts b/public/app/plugins/panel/status-history/types.ts similarity index 100% rename from public/app/plugins/panel/status-grid/types.ts rename to public/app/plugins/panel/status-history/types.ts