From c70623fb852a09b6aff9b38169a84eb2c4a51f85 Mon Sep 17 00:00:00 2001 From: Andres Martinez Gotor Date: Fri, 22 Sep 2023 14:00:40 +0200 Subject: [PATCH] Chore: Rename testdata plugin with a fully qualified name (#75104) --- .betterer.results | 88 +++++++++---------- .eslintrc | 4 +- .github/CODEOWNERS | 4 +- .golangci.toml | 5 +- pkg/api/plugin_resource_test.go | 6 +- pkg/kindsysreport/codegen/report.go | 1 + pkg/kindsysreport/codegen/report.json | 7 +- .../backendplugin/coreplugin/registry.go | 4 +- .../manager/pipeline/bootstrap/steps.go | 2 + pkg/plugins/pfs/corelist/corelist_load_gen.go | 2 +- pkg/plugins/plugindef/plugindef.cue | 2 +- pkg/plugins/plugins.go | 2 + pkg/server/wire.go | 2 +- pkg/services/datasources/models.go | 2 +- .../plugins_integration_test.go | 6 +- pkg/services/store/service_test.go | 2 +- pkg/tests/api/plugins/api_plugins_test.go | 4 +- .../api/plugins/data/expectedListResp.json | 8 +- .../csv_data.go | 0 .../csv_data_test.go | 0 .../data/browser_marketshare.csv | 0 .../data/flight_info_by_state.csv | 0 .../data/gdp_per_capita.csv | 0 .../data/js_libraries.csv | 0 .../data/ohlc_dogecoin.csv | 0 .../data/population_by_state.csv | 0 .../data/weight_height.csv | 0 .../kinds/dataquery/types_dataquery_gen.go | 0 .../resource_handler.go | 0 .../scenarios.go | 0 .../scenarios_test.go | 0 .../sims/engine.go | 0 .../sims/engine_test.go | 0 .../sims/flight_path.go | 0 .../sims/flight_path_test.go | 0 .../sims/tank.go | 0 .../sims/testdata/flight_path_query_A.jsonc | 0 .../sims/types.go | 0 .../sims/utils.go | 0 .../sims/utils_test.go | 0 .../sims/waveform.go | 0 .../stream_handler.go | 0 .../testdata.go | 2 +- .../testdata/labels.csv | 0 .../testdata/labels.golden.jsonc | 0 .../testdata/mixed.csv | 0 .../testdata/mixed.golden.jsonc | 0 .../testdata/simple.csv | 0 .../testdata/simple.golden.jsonc | 0 .../testdata/usa-timeseries-wide.jsonc | 0 .../testdata/usa-timeseries.jsonc | 0 .../testdata/usa-values-as-fields.jsonc | 0 .../usa-values-as-labeled-fields.jsonc | 0 .../testdata/usa-values-as-rows.jsonc | 0 .../usa_stats.go | 0 .../usa_stats_test.go | 0 .../utils.go | 0 pkg/tsdb/grafanads/grafana.go | 2 +- .../app/features/plugins/built_in_plugins.ts | 4 +- .../scenes/scenes/gridMultiTimeRange.tsx | 2 +- .../scenes/scenes/gridWithMultipleData.tsx | 2 +- public/app/features/scenes/scenes/queries.ts | 2 +- .../ConfigEditor.tsx | 0 .../LogIpsum.ts | 0 .../MetaDataInspector.tsx | 0 .../QueryEditor.test.tsx | 0 .../QueryEditor.tsx | 0 .../TestInfoTab.tsx | 0 .../__mocks__/scenarios.ts | 0 .../components/CSVContentEditor.tsx | 0 .../components/CSVFileEditor.tsx | 0 .../components/CSVWaveEditor.tsx | 0 .../components/ErrorEditor.tsx | 0 .../components/GrafanaLiveEditor.tsx | 0 .../components/NodeGraphEditor.tsx | 0 .../components/PredictablePulseEditor.tsx | 0 .../components/RandomWalkEditor.tsx | 0 .../components/RawFrameEditor.tsx | 0 .../components/SimulationQueryEditor.tsx | 0 .../components/SimulationSchemaForm.tsx | 0 .../components/StreamingClientEditor.tsx | 0 .../components/USAQueryEditor.tsx | 0 .../components/index.ts | 0 .../constants.ts | 0 .../dashboards/streaming.json | 0 .../dataquery.cue | 0 .../dataquery.gen.ts | 0 .../datasource.ts | 0 .../img/testdata.svg | 0 .../metricTree.test.ts | 0 .../metricTree.ts | 0 .../module.tsx | 0 .../nodeGraphUtils.ts | 0 .../plugin.json | 2 +- .../runStreams.ts | 0 .../testData/flameGraphResponse.ts | 0 .../testData/serviceMapResponse.ts | 0 .../variables.ts | 0 98 files changed, 88 insertions(+), 79 deletions(-) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/csv_data.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/csv_data_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/browser_marketshare.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/flight_info_by_state.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/gdp_per_capita.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/js_libraries.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/ohlc_dogecoin.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/population_by_state.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/data/weight_height.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/kinds/dataquery/types_dataquery_gen.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/resource_handler.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/scenarios.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/scenarios_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/engine.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/engine_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/flight_path.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/flight_path_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/tank.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/testdata/flight_path_query_A.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/types.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/utils.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/utils_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/sims/waveform.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/stream_handler.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata.go (96%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/labels.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/labels.golden.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/mixed.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/mixed.golden.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/simple.csv (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/simple.golden.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/usa-timeseries-wide.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/usa-timeseries.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/usa-values-as-fields.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/usa-values-as-labeled-fields.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/testdata/usa-values-as-rows.jsonc (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/usa_stats.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/usa_stats_test.go (100%) rename pkg/tsdb/{testdatasource => grafana-testdata-datasource}/utils.go (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/ConfigEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/LogIpsum.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/MetaDataInspector.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/QueryEditor.test.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/QueryEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/TestInfoTab.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/__mocks__/scenarios.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/CSVContentEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/CSVFileEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/CSVWaveEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/ErrorEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/GrafanaLiveEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/NodeGraphEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/PredictablePulseEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/RandomWalkEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/RawFrameEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/SimulationQueryEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/SimulationSchemaForm.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/StreamingClientEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/USAQueryEditor.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/components/index.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/constants.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/dashboards/streaming.json (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/dataquery.cue (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/dataquery.gen.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/datasource.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/img/testdata.svg (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/metricTree.test.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/metricTree.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/module.tsx (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/nodeGraphUtils.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/plugin.json (94%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/runStreams.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/testData/flameGraphResponse.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/testData/serviceMapResponse.ts (100%) rename public/app/plugins/datasource/{testdata => grafana-testdata-datasource}/variables.ts (100%) diff --git a/.betterer.results b/.betterer.results index 88b80135740..9d3421eff52 100644 --- a/.betterer.results +++ b/.betterer.results @@ -6196,6 +6196,50 @@ exports[`better eslint`] = { [0, 0, 0, "Styles should be written using objects.", "0"], [0, 0, 0, "Styles should be written using objects.", "1"] ], + "public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "Unexpected any. Specify a different type.", "3"], + [0, 0, 0, "Unexpected any. Specify a different type.", "4"], + [0, 0, 0, "Do not use any type assertions.", "5"], + [0, 0, 0, "Unexpected any. Specify a different type.", "6"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"], + [0, 0, 0, "Do not use any type assertions.", "3"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"], + [0, 0, 0, "Unexpected any. Specify a different type.", "3"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Styles should be written using objects.", "2"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"] + ], + "public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], "public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], @@ -7259,50 +7303,6 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], - "public/app/plugins/datasource/testdata/ConfigEditor.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "public/app/plugins/datasource/testdata/QueryEditor.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Unexpected any. Specify a different type.", "3"], - [0, 0, 0, "Unexpected any. Specify a different type.", "4"], - [0, 0, 0, "Do not use any type assertions.", "5"], - [0, 0, 0, "Unexpected any. Specify a different type.", "6"] - ], - "public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"] - ], - "public/app/plugins/datasource/testdata/components/RawFrameEditor.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"], - [0, 0, 0, "Unexpected any. Specify a different type.", "3"] - ], - "public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Styles should be written using objects.", "2"] - ], - "public/app/plugins/datasource/testdata/datasource.ts:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] - ], - "public/app/plugins/datasource/testdata/nodeGraphUtils.ts:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"] - ], - "public/app/plugins/datasource/testdata/runStreams.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], "public/app/plugins/datasource/zipkin/ConfigEditor.tsx:5381": [ [0, 0, 0, "Styles should be written using objects.", "0"] ], diff --git a/.eslintrc b/.eslintrc index 848b36da43d..32ea6926535 100644 --- a/.eslintrc +++ b/.eslintrc @@ -96,8 +96,8 @@ }, { "files": [ - "public/app/plugins/datasource/testdata/*.{ts,tsx}", - "public/app/plugins/datasource/testdata/**/*.{ts,tsx}" + "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}", + "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}" ], "rules": { "no-restricted-imports": [ diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f750564ca93..d14843de783 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -288,7 +288,7 @@ /pkg/services/datasources/ @grafana/plugins-platform-backend /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend /pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code -/pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend +/pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend # Backend code docs @@ -520,7 +520,7 @@ cypress.config.js @grafana/grafana-frontend-platform /public/app/plugins/datasource/cloudwatch/ @grafana/aws-datasources /public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs /public/app/plugins/datasource/grafana/ @grafana/grafana-frontend-platform -/public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend +/public/app/plugins/datasource/grafana-testdata-datasource/ @grafana/plugins-platform-frontend /public/app/plugins/datasource/azuremonitor/ @grafana/partner-datasources /public/app/plugins/datasource/graphite/ @grafana/observability-metrics /public/app/plugins/datasource/influxdb/ @grafana/observability-metrics diff --git a/.golangci.toml b/.golangci.toml index e529b178e4d..1d894ab85cd 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -53,7 +53,10 @@ deny = [ { pkg = "github.com/grafana/grafana/pkg/tests", desc = "Core plugins are not allowed to depend on Grafana core packages" }, { pkg = "github.com/grafana/grafana/pkg/web", desc = "Core plugins are not allowed to depend on Grafana core packages" }, ] -files = ["**/pkg/tsdb/testdatasource/*", "**/pkg/tsdb/testdatasource/**/*"] +files = [ + "**/pkg/tsdb/grafana-testdata-datasource/*", + "**/pkg/tsdb/grafana-testdata-datasource/**/*", +] [linters-settings.gocritic] enabled-checks = ["ruleguard"] diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go index fd07728a2d0..61fb73df91b 100644 --- a/pkg/api/plugin_resource_test.go +++ b/pkg/api/plugin_resource_test.go @@ -34,7 +34,7 @@ import ( "github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/tsdb/cloudwatch" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" "github.com/grafana/grafana/pkg/web/webtest" ) @@ -67,7 +67,7 @@ func TestCallResource(t *testing.T) { }) t.Run("Test successful response is received for valid request", func(t *testing.T) { - req := srv.NewPostRequest("/api/plugins/testdata/resources/test", strings.NewReader("{ \"test\": true }")) + req := srv.NewPostRequest("/api/plugins/grafana-testdata-datasource/resources/test", strings.NewReader("{ \"test\": true }")) webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{ 1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{ {Action: pluginaccesscontrol.ActionAppAccess, Scope: pluginaccesscontrol.ScopeProvider.GetResourceAllScope()}, @@ -106,7 +106,7 @@ func TestCallResource(t *testing.T) { }) t.Run("Test error is properly propagated to API response", func(t *testing.T) { - req := srv.NewGetRequest("/api/plugins/testdata/resources/scenarios") + req := srv.NewGetRequest("/api/plugins/grafana-testdata-datasource/resources/scenarios") webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{ 1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{ {Action: pluginaccesscontrol.ActionAppAccess, Scope: pluginaccesscontrol.ScopeProvider.GetResourceAllScope()}, diff --git a/pkg/kindsysreport/codegen/report.go b/pkg/kindsysreport/codegen/report.go index 4229aa23274..433c5d43c64 100644 --- a/pkg/kindsysreport/codegen/report.go +++ b/pkg/kindsysreport/codegen/report.go @@ -296,6 +296,7 @@ var irregularPluginNames = map[string]string{ "azuremonitor": "grafana-azure-monitor-datasource", "microsoftsqlserver": "mssql", "postgresql": "postgres", + "testdata": "grafana-testdata-datasource", } func buildComposableLinks(pp plugindef.PluginDef, cp kindsys.ComposableProperties) KindLinks { diff --git a/pkg/kindsysreport/codegen/report.json b/pkg/kindsysreport/codegen/report.json index 412333f45bd..2aee0908d05 100644 --- a/pkg/kindsysreport/codegen/report.json +++ b/pkg/kindsysreport/codegen/report.json @@ -1841,6 +1841,7 @@ "testdatadataquery": { "category": "composable", "codeowners": [ + "grafana/plugins-platform-backend", "grafana/plugins-platform-frontend" ], "currentVersion": [ @@ -1851,9 +1852,9 @@ "lineageIsGroup": false, "links": { "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/testdatadataquery/schema-reference", - "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/testdata/kinds/dataquery/types_dataquery_gen.go", - "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/testdata/dataquery.cue", - "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/testdata/dataquery.gen.ts" + "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go", + "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue", + "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts" }, "machineName": "testdatadataquery", "maturity": "experimental", diff --git a/pkg/plugins/backendplugin/coreplugin/registry.go b/pkg/plugins/backendplugin/coreplugin/registry.go index 08879fddfdd..7844a5d16ce 100644 --- a/pkg/plugins/backendplugin/coreplugin/registry.go +++ b/pkg/plugins/backendplugin/coreplugin/registry.go @@ -14,6 +14,7 @@ import ( "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -25,7 +26,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" ) const ( @@ -39,7 +39,7 @@ const ( OpenTSDB = "opentsdb" Prometheus = "prometheus" Tempo = "tempo" - TestData = "testdata" + TestData = "grafana-testdata-datasource" PostgreSQL = "postgres" MySQL = "mysql" MSSQL = "mssql" diff --git a/pkg/plugins/manager/pipeline/bootstrap/steps.go b/pkg/plugins/manager/pipeline/bootstrap/steps.go index 624c83ba406..65177dc6056 100644 --- a/pkg/plugins/manager/pipeline/bootstrap/steps.go +++ b/pkg/plugins/manager/pipeline/bootstrap/steps.go @@ -84,6 +84,8 @@ func AliasDecorateFunc(_ context.Context, p *plugins.Plugin) (*plugins.Plugin, e switch p.ID { case "grafana-pyroscope-datasource": // rebranding p.Alias = "phlare" + case "grafana-testdata-datasource": + p.Alias = "testdata" case "debug": // panel plugin used for testing p.Alias = "debugX" } diff --git a/pkg/plugins/pfs/corelist/corelist_load_gen.go b/pkg/plugins/pfs/corelist/corelist_load_gen.go index 83808c4e744..de2a8fbff57 100644 --- a/pkg/plugins/pfs/corelist/corelist_load_gen.go +++ b/pkg/plugins/pfs/corelist/corelist_load_gen.go @@ -40,6 +40,7 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin { parsePluginOrPanic("public/app/plugins/datasource/elasticsearch", "elasticsearch", rt), parsePluginOrPanic("public/app/plugins/datasource/grafana", "grafana", rt), parsePluginOrPanic("public/app/plugins/datasource/grafana-pyroscope-datasource", "grafana_pyroscope_datasource", rt), + parsePluginOrPanic("public/app/plugins/datasource/grafana-testdata-datasource", "grafana_testdata_datasource", rt), parsePluginOrPanic("public/app/plugins/datasource/graphite", "graphite", rt), parsePluginOrPanic("public/app/plugins/datasource/jaeger", "jaeger", rt), parsePluginOrPanic("public/app/plugins/datasource/loki", "loki", rt), @@ -49,7 +50,6 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin { parsePluginOrPanic("public/app/plugins/datasource/postgres", "postgres", rt), parsePluginOrPanic("public/app/plugins/datasource/prometheus", "prometheus", rt), parsePluginOrPanic("public/app/plugins/datasource/tempo", "tempo", rt), - parsePluginOrPanic("public/app/plugins/datasource/testdata", "testdata", rt), parsePluginOrPanic("public/app/plugins/datasource/zipkin", "zipkin", rt), parsePluginOrPanic("public/app/plugins/panel/alertGroups", "alertGroups", rt), parsePluginOrPanic("public/app/plugins/panel/alertlist", "alertlist", rt), diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue index aa0514fc914..74b41340fe4 100644 --- a/pkg/plugins/plugindef/plugindef.cue +++ b/pkg/plugins/plugindef/plugindef.cue @@ -16,7 +16,7 @@ schemas: [{ // grafana.com, then the plugin `id` has to follow the naming // conventions. id: string & strings.MinRunes(1) - id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|datagrid|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$" + id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|datagrid|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|grafana-testdata-datasource|zipkin|phlare|parca)$" // Human-readable name of the plugin that is shown to the user in // the UI. diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 4befa80a212..06ed9c52f80 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -132,6 +132,8 @@ func ReadPluginJSON(reader io.Reader) (JSONData, error) { plugin.Name = "Pie Chart (old)" case "grafana-pyroscope-datasource": // rebranding plugin.Alias = "phlare" + case "grafana-testdata-datasource": + plugin.Alias = "testdata" case "debug": // panel plugin used for testing plugin.Alias = "debugX" } diff --git a/pkg/server/wire.go b/pkg/server/wire.go index ec9804e7d10..ee79f4de4ab 100644 --- a/pkg/server/wire.go +++ b/pkg/server/wire.go @@ -143,6 +143,7 @@ import ( "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -156,7 +157,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" ) var wireBasicSet = wire.NewSet( diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go index 3a6d335357b..de0211af353 100644 --- a/pkg/services/datasources/models.go +++ b/pkg/services/datasources/models.go @@ -28,7 +28,7 @@ const ( DS_ES_OPEN_DISTRO = "grafana-es-open-distro-datasource" DS_ES_OPENSEARCH = "grafana-opensearch-datasource" DS_AZURE_MONITOR = "grafana-azure-monitor-datasource" - DS_TESTDATA = "testdata" + DS_TESTDATA = "grafana-testdata-datasource" // CustomHeaderName is the prefix that is used to store the name of a custom header. CustomHeaderName = "httpHeaderName" // CustomHeaderValue is the prefix that is used to store the value of a custom header. diff --git a/pkg/services/pluginsintegration/plugins_integration_test.go b/pkg/services/pluginsintegration/plugins_integration_test.go index 2f2f738172e..54dd76a3df2 100644 --- a/pkg/services/pluginsintegration/plugins_integration_test.go +++ b/pkg/services/pluginsintegration/plugins_integration_test.go @@ -28,6 +28,7 @@ import ( "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -39,7 +40,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" ) func TestIntegrationPluginManager(t *testing.T) { @@ -113,7 +113,7 @@ func verifyPluginQuery(t *testing.T, ctx context.Context, c plugins.Client) { now := time.Unix(1661420870, 0) req := &backend.QueryDataRequest{ PluginContext: backend.PluginContext{ - PluginID: "testdata", + PluginID: "grafana-testdata-datasource", }, Queries: []backend.DataQuery{ { @@ -184,7 +184,7 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor "opentsdb": {}, "prometheus": {}, "tempo": {}, - "testdata": {}, + "grafana-testdata-datasource": {}, "postgres": {}, "mysql": {}, "mssql": {}, diff --git a/pkg/services/store/service_test.go b/pkg/services/store/service_test.go index 206cf6c1e66..05fe50066d9 100644 --- a/pkg/services/store/service_test.go +++ b/pkg/services/store/service_test.go @@ -19,7 +19,7 @@ import ( "github.com/grafana/grafana/pkg/services/quota/quotatest" "github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/setting" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" ) var ( diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go index 32ce64272e0..4fc2295ed8b 100644 --- a/pkg/tests/api/plugins/api_plugins_test.go +++ b/pkg/tests/api/plugins/api_plugins_test.go @@ -145,14 +145,14 @@ func TestIntegrationPluginAssets(t *testing.T) { { desc: "should return no-cache settings for Dev env", env: setting.Dev, - url: "http://%s/public/plugins/testdata/img/testdata.svg", + url: "http://%s/public/plugins/grafana-testdata-datasource/img/testdata.svg", expStatus: http.StatusOK, expCacheControl: "max-age=0, must-revalidate, no-cache", }, { desc: "should return cache settings for Prod env", env: setting.Prod, - url: "http://%s/public/plugins/testdata/img/testdata.svg", + url: "http://%s/public/plugins/grafana-testdata-datasource/img/testdata.svg", expStatus: http.StatusOK, expCacheControl: "public, max-age=3600", }, diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json index d6ac56484e0..f740c989f0d 100644 --- a/pkg/tests/api/plugins/data/expectedListResp.json +++ b/pkg/tests/api/plugins/data/expectedListResp.json @@ -1598,7 +1598,7 @@ { "name": "TestData", "type": "datasource", - "id": "testdata", + "id": "grafana-testdata-datasource", "enabled": true, "pinned": false, "info": { @@ -1609,8 +1609,8 @@ "description": "Generates test data in different forms", "links": null, "logos": { - "small": "/public/app/plugins/datasource/testdata/img/testdata.svg", - "large": "/public/app/plugins/datasource/testdata/img/testdata.svg" + "small": "/public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg", + "large": "/public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg" }, "build": {}, "screenshots": null, @@ -1624,7 +1624,7 @@ }, "latestVersion": "", "hasUpdate": false, - "defaultNavUrl": "/plugins/testdata/", + "defaultNavUrl": "/plugins/grafana-testdata-datasource/", "category": "", "state": "", "signature": "internal", diff --git a/pkg/tsdb/testdatasource/csv_data.go b/pkg/tsdb/grafana-testdata-datasource/csv_data.go similarity index 100% rename from pkg/tsdb/testdatasource/csv_data.go rename to pkg/tsdb/grafana-testdata-datasource/csv_data.go diff --git a/pkg/tsdb/testdatasource/csv_data_test.go b/pkg/tsdb/grafana-testdata-datasource/csv_data_test.go similarity index 100% rename from pkg/tsdb/testdatasource/csv_data_test.go rename to pkg/tsdb/grafana-testdata-datasource/csv_data_test.go diff --git a/pkg/tsdb/testdatasource/data/browser_marketshare.csv b/pkg/tsdb/grafana-testdata-datasource/data/browser_marketshare.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/browser_marketshare.csv rename to pkg/tsdb/grafana-testdata-datasource/data/browser_marketshare.csv diff --git a/pkg/tsdb/testdatasource/data/flight_info_by_state.csv b/pkg/tsdb/grafana-testdata-datasource/data/flight_info_by_state.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/flight_info_by_state.csv rename to pkg/tsdb/grafana-testdata-datasource/data/flight_info_by_state.csv diff --git a/pkg/tsdb/testdatasource/data/gdp_per_capita.csv b/pkg/tsdb/grafana-testdata-datasource/data/gdp_per_capita.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/gdp_per_capita.csv rename to pkg/tsdb/grafana-testdata-datasource/data/gdp_per_capita.csv diff --git a/pkg/tsdb/testdatasource/data/js_libraries.csv b/pkg/tsdb/grafana-testdata-datasource/data/js_libraries.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/js_libraries.csv rename to pkg/tsdb/grafana-testdata-datasource/data/js_libraries.csv diff --git a/pkg/tsdb/testdatasource/data/ohlc_dogecoin.csv b/pkg/tsdb/grafana-testdata-datasource/data/ohlc_dogecoin.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/ohlc_dogecoin.csv rename to pkg/tsdb/grafana-testdata-datasource/data/ohlc_dogecoin.csv diff --git a/pkg/tsdb/testdatasource/data/population_by_state.csv b/pkg/tsdb/grafana-testdata-datasource/data/population_by_state.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/population_by_state.csv rename to pkg/tsdb/grafana-testdata-datasource/data/population_by_state.csv diff --git a/pkg/tsdb/testdatasource/data/weight_height.csv b/pkg/tsdb/grafana-testdata-datasource/data/weight_height.csv similarity index 100% rename from pkg/tsdb/testdatasource/data/weight_height.csv rename to pkg/tsdb/grafana-testdata-datasource/data/weight_height.csv diff --git a/pkg/tsdb/testdatasource/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go similarity index 100% rename from pkg/tsdb/testdatasource/kinds/dataquery/types_dataquery_gen.go rename to pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go diff --git a/pkg/tsdb/testdatasource/resource_handler.go b/pkg/tsdb/grafana-testdata-datasource/resource_handler.go similarity index 100% rename from pkg/tsdb/testdatasource/resource_handler.go rename to pkg/tsdb/grafana-testdata-datasource/resource_handler.go diff --git a/pkg/tsdb/testdatasource/scenarios.go b/pkg/tsdb/grafana-testdata-datasource/scenarios.go similarity index 100% rename from pkg/tsdb/testdatasource/scenarios.go rename to pkg/tsdb/grafana-testdata-datasource/scenarios.go diff --git a/pkg/tsdb/testdatasource/scenarios_test.go b/pkg/tsdb/grafana-testdata-datasource/scenarios_test.go similarity index 100% rename from pkg/tsdb/testdatasource/scenarios_test.go rename to pkg/tsdb/grafana-testdata-datasource/scenarios_test.go diff --git a/pkg/tsdb/testdatasource/sims/engine.go b/pkg/tsdb/grafana-testdata-datasource/sims/engine.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/engine.go rename to pkg/tsdb/grafana-testdata-datasource/sims/engine.go diff --git a/pkg/tsdb/testdatasource/sims/engine_test.go b/pkg/tsdb/grafana-testdata-datasource/sims/engine_test.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/engine_test.go rename to pkg/tsdb/grafana-testdata-datasource/sims/engine_test.go diff --git a/pkg/tsdb/testdatasource/sims/flight_path.go b/pkg/tsdb/grafana-testdata-datasource/sims/flight_path.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/flight_path.go rename to pkg/tsdb/grafana-testdata-datasource/sims/flight_path.go diff --git a/pkg/tsdb/testdatasource/sims/flight_path_test.go b/pkg/tsdb/grafana-testdata-datasource/sims/flight_path_test.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/flight_path_test.go rename to pkg/tsdb/grafana-testdata-datasource/sims/flight_path_test.go diff --git a/pkg/tsdb/testdatasource/sims/tank.go b/pkg/tsdb/grafana-testdata-datasource/sims/tank.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/tank.go rename to pkg/tsdb/grafana-testdata-datasource/sims/tank.go diff --git a/pkg/tsdb/testdatasource/sims/testdata/flight_path_query_A.jsonc b/pkg/tsdb/grafana-testdata-datasource/sims/testdata/flight_path_query_A.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/sims/testdata/flight_path_query_A.jsonc rename to pkg/tsdb/grafana-testdata-datasource/sims/testdata/flight_path_query_A.jsonc diff --git a/pkg/tsdb/testdatasource/sims/types.go b/pkg/tsdb/grafana-testdata-datasource/sims/types.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/types.go rename to pkg/tsdb/grafana-testdata-datasource/sims/types.go diff --git a/pkg/tsdb/testdatasource/sims/utils.go b/pkg/tsdb/grafana-testdata-datasource/sims/utils.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/utils.go rename to pkg/tsdb/grafana-testdata-datasource/sims/utils.go diff --git a/pkg/tsdb/testdatasource/sims/utils_test.go b/pkg/tsdb/grafana-testdata-datasource/sims/utils_test.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/utils_test.go rename to pkg/tsdb/grafana-testdata-datasource/sims/utils_test.go diff --git a/pkg/tsdb/testdatasource/sims/waveform.go b/pkg/tsdb/grafana-testdata-datasource/sims/waveform.go similarity index 100% rename from pkg/tsdb/testdatasource/sims/waveform.go rename to pkg/tsdb/grafana-testdata-datasource/sims/waveform.go diff --git a/pkg/tsdb/testdatasource/stream_handler.go b/pkg/tsdb/grafana-testdata-datasource/stream_handler.go similarity index 100% rename from pkg/tsdb/testdatasource/stream_handler.go rename to pkg/tsdb/grafana-testdata-datasource/stream_handler.go diff --git a/pkg/tsdb/testdatasource/testdata.go b/pkg/tsdb/grafana-testdata-datasource/testdata.go similarity index 96% rename from pkg/tsdb/testdatasource/testdata.go rename to pkg/tsdb/grafana-testdata-datasource/testdata.go index 8596bdf8ae3..5cba8661da8 100644 --- a/pkg/tsdb/testdatasource/testdata.go +++ b/pkg/tsdb/grafana-testdata-datasource/testdata.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend/log" "github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter" "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/grafana/grafana/pkg/tsdb/testdatasource/sims" + "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/sims" ) func ProvideService() *Service { diff --git a/pkg/tsdb/testdatasource/testdata/labels.csv b/pkg/tsdb/grafana-testdata-datasource/testdata/labels.csv similarity index 100% rename from pkg/tsdb/testdatasource/testdata/labels.csv rename to pkg/tsdb/grafana-testdata-datasource/testdata/labels.csv diff --git a/pkg/tsdb/testdatasource/testdata/labels.golden.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/labels.golden.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/labels.golden.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/labels.golden.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/mixed.csv b/pkg/tsdb/grafana-testdata-datasource/testdata/mixed.csv similarity index 100% rename from pkg/tsdb/testdatasource/testdata/mixed.csv rename to pkg/tsdb/grafana-testdata-datasource/testdata/mixed.csv diff --git a/pkg/tsdb/testdatasource/testdata/mixed.golden.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/mixed.golden.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/mixed.golden.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/mixed.golden.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/simple.csv b/pkg/tsdb/grafana-testdata-datasource/testdata/simple.csv similarity index 100% rename from pkg/tsdb/testdatasource/testdata/simple.csv rename to pkg/tsdb/grafana-testdata-datasource/testdata/simple.csv diff --git a/pkg/tsdb/testdatasource/testdata/simple.golden.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/simple.golden.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/simple.golden.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/simple.golden.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/usa-timeseries-wide.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries-wide.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/usa-timeseries-wide.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries-wide.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/usa-timeseries.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/usa-timeseries.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/usa-values-as-fields.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-fields.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/usa-values-as-fields.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-fields.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/usa-values-as-labeled-fields.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-labeled-fields.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/usa-values-as-labeled-fields.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-labeled-fields.jsonc diff --git a/pkg/tsdb/testdatasource/testdata/usa-values-as-rows.jsonc b/pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-rows.jsonc similarity index 100% rename from pkg/tsdb/testdatasource/testdata/usa-values-as-rows.jsonc rename to pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-rows.jsonc diff --git a/pkg/tsdb/testdatasource/usa_stats.go b/pkg/tsdb/grafana-testdata-datasource/usa_stats.go similarity index 100% rename from pkg/tsdb/testdatasource/usa_stats.go rename to pkg/tsdb/grafana-testdata-datasource/usa_stats.go diff --git a/pkg/tsdb/testdatasource/usa_stats_test.go b/pkg/tsdb/grafana-testdata-datasource/usa_stats_test.go similarity index 100% rename from pkg/tsdb/testdatasource/usa_stats_test.go rename to pkg/tsdb/grafana-testdata-datasource/usa_stats_test.go diff --git a/pkg/tsdb/testdatasource/utils.go b/pkg/tsdb/grafana-testdata-datasource/utils.go similarity index 100% rename from pkg/tsdb/testdatasource/utils.go rename to pkg/tsdb/grafana-testdata-datasource/utils.go diff --git a/pkg/tsdb/grafanads/grafana.go b/pkg/tsdb/grafanads/grafana.go index 8d6d83c168a..f35a7cfb96a 100644 --- a/pkg/tsdb/grafanads/grafana.go +++ b/pkg/tsdb/grafanads/grafana.go @@ -17,7 +17,7 @@ import ( "github.com/grafana/grafana/pkg/services/datasources" "github.com/grafana/grafana/pkg/services/searchV2" "github.com/grafana/grafana/pkg/services/store" - "github.com/grafana/grafana/pkg/tsdb/testdatasource" + testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource" ) // DatasourceName is the string constant used as the datasource name in requests diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index 66053733ba0..40d6bf59874 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -28,7 +28,7 @@ const prometheusPlugin = async () => const mssqlPlugin = async () => await import(/* webpackChunkName: "mssqlPlugin" */ 'app/plugins/datasource/mssql/module'); const testDataDSPlugin = async () => - await import(/* webpackChunkName: "testDataDSPlugin" */ 'app/plugins/datasource/testdata/module'); + await import(/* webpackChunkName: "testDataDSPlugin" */ 'app/plugins/datasource/grafana-testdata-datasource/module'); const cloudMonitoringPlugin = async () => await import(/* webpackChunkName: "cloudMonitoringPlugin" */ 'app/plugins/datasource/cloud-monitoring/module'); const azureMonitorPlugin = async () => @@ -97,7 +97,7 @@ const builtInPlugins: Record Promise, diff --git a/public/app/plugins/datasource/testdata/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/ConfigEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx diff --git a/public/app/plugins/datasource/testdata/LogIpsum.ts b/public/app/plugins/datasource/grafana-testdata-datasource/LogIpsum.ts similarity index 100% rename from public/app/plugins/datasource/testdata/LogIpsum.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/LogIpsum.ts diff --git a/public/app/plugins/datasource/testdata/MetaDataInspector.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/MetaDataInspector.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx diff --git a/public/app/plugins/datasource/testdata/QueryEditor.test.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/QueryEditor.test.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/QueryEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx diff --git a/public/app/plugins/datasource/testdata/TestInfoTab.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/TestInfoTab.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/TestInfoTab.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/TestInfoTab.tsx diff --git a/public/app/plugins/datasource/testdata/__mocks__/scenarios.ts b/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts similarity index 100% rename from public/app/plugins/datasource/testdata/__mocks__/scenarios.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts diff --git a/public/app/plugins/datasource/testdata/components/CSVContentEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVContentEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/CSVContentEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/CSVContentEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/CSVFileEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/CSVFileEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/ErrorEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/ErrorEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/ErrorEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/ErrorEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/GrafanaLiveEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/GrafanaLiveEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/GrafanaLiveEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/GrafanaLiveEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/NodeGraphEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/NodeGraphEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/PredictablePulseEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/PredictablePulseEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/RawFrameEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/RawFrameEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/SimulationQueryEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/SimulationSchemaForm.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx diff --git a/public/app/plugins/datasource/testdata/components/StreamingClientEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/StreamingClientEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx diff --git a/public/app/plugins/datasource/testdata/components/index.ts b/public/app/plugins/datasource/grafana-testdata-datasource/components/index.ts similarity index 100% rename from public/app/plugins/datasource/testdata/components/index.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/components/index.ts diff --git a/public/app/plugins/datasource/testdata/constants.ts b/public/app/plugins/datasource/grafana-testdata-datasource/constants.ts similarity index 100% rename from public/app/plugins/datasource/testdata/constants.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/constants.ts diff --git a/public/app/plugins/datasource/testdata/dashboards/streaming.json b/public/app/plugins/datasource/grafana-testdata-datasource/dashboards/streaming.json similarity index 100% rename from public/app/plugins/datasource/testdata/dashboards/streaming.json rename to public/app/plugins/datasource/grafana-testdata-datasource/dashboards/streaming.json diff --git a/public/app/plugins/datasource/testdata/dataquery.cue b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue similarity index 100% rename from public/app/plugins/datasource/testdata/dataquery.cue rename to public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue diff --git a/public/app/plugins/datasource/testdata/dataquery.gen.ts b/public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts similarity index 100% rename from public/app/plugins/datasource/testdata/dataquery.gen.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts similarity index 100% rename from public/app/plugins/datasource/testdata/datasource.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts diff --git a/public/app/plugins/datasource/testdata/img/testdata.svg b/public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg similarity index 100% rename from public/app/plugins/datasource/testdata/img/testdata.svg rename to public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg diff --git a/public/app/plugins/datasource/testdata/metricTree.test.ts b/public/app/plugins/datasource/grafana-testdata-datasource/metricTree.test.ts similarity index 100% rename from public/app/plugins/datasource/testdata/metricTree.test.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/metricTree.test.ts diff --git a/public/app/plugins/datasource/testdata/metricTree.ts b/public/app/plugins/datasource/grafana-testdata-datasource/metricTree.ts similarity index 100% rename from public/app/plugins/datasource/testdata/metricTree.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/metricTree.ts diff --git a/public/app/plugins/datasource/testdata/module.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/module.tsx similarity index 100% rename from public/app/plugins/datasource/testdata/module.tsx rename to public/app/plugins/datasource/grafana-testdata-datasource/module.tsx diff --git a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts b/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts similarity index 100% rename from public/app/plugins/datasource/testdata/nodeGraphUtils.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts diff --git a/public/app/plugins/datasource/testdata/plugin.json b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json similarity index 94% rename from public/app/plugins/datasource/testdata/plugin.json rename to public/app/plugins/datasource/grafana-testdata-datasource/plugin.json index 1407f7e7384..373ad10e303 100644 --- a/public/app/plugins/datasource/testdata/plugin.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json @@ -1,7 +1,7 @@ { "type": "datasource", "name": "TestData", - "id": "testdata", + "id": "grafana-testdata-datasource", "metrics": true, "logs": true, diff --git a/public/app/plugins/datasource/testdata/runStreams.ts b/public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts similarity index 100% rename from public/app/plugins/datasource/testdata/runStreams.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts diff --git a/public/app/plugins/datasource/testdata/testData/flameGraphResponse.ts b/public/app/plugins/datasource/grafana-testdata-datasource/testData/flameGraphResponse.ts similarity index 100% rename from public/app/plugins/datasource/testdata/testData/flameGraphResponse.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/testData/flameGraphResponse.ts diff --git a/public/app/plugins/datasource/testdata/testData/serviceMapResponse.ts b/public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts similarity index 100% rename from public/app/plugins/datasource/testdata/testData/serviceMapResponse.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts diff --git a/public/app/plugins/datasource/testdata/variables.ts b/public/app/plugins/datasource/grafana-testdata-datasource/variables.ts similarity index 100% rename from public/app/plugins/datasource/testdata/variables.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/variables.ts