Chore: Rename testdata plugin with a fully qualified name (#75104)

pull/75381/head
Andres Martinez Gotor 2 years ago committed by GitHub
parent d6db9eaeb2
commit c70623fb85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 88
      .betterer.results
  2. 4
      .eslintrc
  3. 4
      .github/CODEOWNERS
  4. 5
      .golangci.toml
  5. 6
      pkg/api/plugin_resource_test.go
  6. 1
      pkg/kindsysreport/codegen/report.go
  7. 7
      pkg/kindsysreport/codegen/report.json
  8. 4
      pkg/plugins/backendplugin/coreplugin/registry.go
  9. 2
      pkg/plugins/manager/pipeline/bootstrap/steps.go
  10. 2
      pkg/plugins/pfs/corelist/corelist_load_gen.go
  11. 2
      pkg/plugins/plugindef/plugindef.cue
  12. 2
      pkg/plugins/plugins.go
  13. 2
      pkg/server/wire.go
  14. 2
      pkg/services/datasources/models.go
  15. 6
      pkg/services/pluginsintegration/plugins_integration_test.go
  16. 2
      pkg/services/store/service_test.go
  17. 4
      pkg/tests/api/plugins/api_plugins_test.go
  18. 8
      pkg/tests/api/plugins/data/expectedListResp.json
  19. 0
      pkg/tsdb/grafana-testdata-datasource/csv_data.go
  20. 0
      pkg/tsdb/grafana-testdata-datasource/csv_data_test.go
  21. 0
      pkg/tsdb/grafana-testdata-datasource/data/browser_marketshare.csv
  22. 0
      pkg/tsdb/grafana-testdata-datasource/data/flight_info_by_state.csv
  23. 0
      pkg/tsdb/grafana-testdata-datasource/data/gdp_per_capita.csv
  24. 0
      pkg/tsdb/grafana-testdata-datasource/data/js_libraries.csv
  25. 0
      pkg/tsdb/grafana-testdata-datasource/data/ohlc_dogecoin.csv
  26. 0
      pkg/tsdb/grafana-testdata-datasource/data/population_by_state.csv
  27. 0
      pkg/tsdb/grafana-testdata-datasource/data/weight_height.csv
  28. 0
      pkg/tsdb/grafana-testdata-datasource/kinds/dataquery/types_dataquery_gen.go
  29. 0
      pkg/tsdb/grafana-testdata-datasource/resource_handler.go
  30. 0
      pkg/tsdb/grafana-testdata-datasource/scenarios.go
  31. 0
      pkg/tsdb/grafana-testdata-datasource/scenarios_test.go
  32. 0
      pkg/tsdb/grafana-testdata-datasource/sims/engine.go
  33. 0
      pkg/tsdb/grafana-testdata-datasource/sims/engine_test.go
  34. 0
      pkg/tsdb/grafana-testdata-datasource/sims/flight_path.go
  35. 0
      pkg/tsdb/grafana-testdata-datasource/sims/flight_path_test.go
  36. 0
      pkg/tsdb/grafana-testdata-datasource/sims/tank.go
  37. 0
      pkg/tsdb/grafana-testdata-datasource/sims/testdata/flight_path_query_A.jsonc
  38. 0
      pkg/tsdb/grafana-testdata-datasource/sims/types.go
  39. 0
      pkg/tsdb/grafana-testdata-datasource/sims/utils.go
  40. 0
      pkg/tsdb/grafana-testdata-datasource/sims/utils_test.go
  41. 0
      pkg/tsdb/grafana-testdata-datasource/sims/waveform.go
  42. 0
      pkg/tsdb/grafana-testdata-datasource/stream_handler.go
  43. 2
      pkg/tsdb/grafana-testdata-datasource/testdata.go
  44. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/labels.csv
  45. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/labels.golden.jsonc
  46. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/mixed.csv
  47. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/mixed.golden.jsonc
  48. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/simple.csv
  49. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/simple.golden.jsonc
  50. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries-wide.jsonc
  51. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/usa-timeseries.jsonc
  52. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-fields.jsonc
  53. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-labeled-fields.jsonc
  54. 0
      pkg/tsdb/grafana-testdata-datasource/testdata/usa-values-as-rows.jsonc
  55. 0
      pkg/tsdb/grafana-testdata-datasource/usa_stats.go
  56. 0
      pkg/tsdb/grafana-testdata-datasource/usa_stats_test.go
  57. 0
      pkg/tsdb/grafana-testdata-datasource/utils.go
  58. 2
      pkg/tsdb/grafanads/grafana.go
  59. 4
      public/app/features/plugins/built_in_plugins.ts
  60. 2
      public/app/features/scenes/scenes/gridMultiTimeRange.tsx
  61. 2
      public/app/features/scenes/scenes/gridWithMultipleData.tsx
  62. 2
      public/app/features/scenes/scenes/queries.ts
  63. 0
      public/app/plugins/datasource/grafana-testdata-datasource/ConfigEditor.tsx
  64. 0
      public/app/plugins/datasource/grafana-testdata-datasource/LogIpsum.ts
  65. 0
      public/app/plugins/datasource/grafana-testdata-datasource/MetaDataInspector.tsx
  66. 0
      public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx
  67. 0
      public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.tsx
  68. 0
      public/app/plugins/datasource/grafana-testdata-datasource/TestInfoTab.tsx
  69. 0
      public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts
  70. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/CSVContentEditor.tsx
  71. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/CSVFileEditor.tsx
  72. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/CSVWaveEditor.tsx
  73. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/ErrorEditor.tsx
  74. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/GrafanaLiveEditor.tsx
  75. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/NodeGraphEditor.tsx
  76. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/PredictablePulseEditor.tsx
  77. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/RandomWalkEditor.tsx
  78. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/RawFrameEditor.tsx
  79. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationQueryEditor.tsx
  80. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/SimulationSchemaForm.tsx
  81. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/StreamingClientEditor.tsx
  82. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/USAQueryEditor.tsx
  83. 0
      public/app/plugins/datasource/grafana-testdata-datasource/components/index.ts
  84. 0
      public/app/plugins/datasource/grafana-testdata-datasource/constants.ts
  85. 0
      public/app/plugins/datasource/grafana-testdata-datasource/dashboards/streaming.json
  86. 0
      public/app/plugins/datasource/grafana-testdata-datasource/dataquery.cue
  87. 0
      public/app/plugins/datasource/grafana-testdata-datasource/dataquery.gen.ts
  88. 0
      public/app/plugins/datasource/grafana-testdata-datasource/datasource.ts
  89. 0
      public/app/plugins/datasource/grafana-testdata-datasource/img/testdata.svg
  90. 0
      public/app/plugins/datasource/grafana-testdata-datasource/metricTree.test.ts
  91. 0
      public/app/plugins/datasource/grafana-testdata-datasource/metricTree.ts
  92. 0
      public/app/plugins/datasource/grafana-testdata-datasource/module.tsx
  93. 0
      public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
  94. 2
      public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
  95. 0
      public/app/plugins/datasource/grafana-testdata-datasource/runStreams.ts
  96. 0
      public/app/plugins/datasource/grafana-testdata-datasource/testData/flameGraphResponse.ts
  97. 0
      public/app/plugins/datasource/grafana-testdata-datasource/testData/serviceMapResponse.ts
  98. 0
      public/app/plugins/datasource/grafana-testdata-datasource/variables.ts

@ -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"]
],

@ -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": [

@ -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

@ -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"]

@ -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()},

@ -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 {

@ -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",

@ -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"

@ -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"
}

@ -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),

@ -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.

@ -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"
}

@ -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(

@ -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.

@ -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": {},

@ -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 (

@ -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",
},

@ -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",

@ -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 {

@ -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

@ -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<string, System.Module | (() => Promise<System.Modul
'core:plugin/postgres': postgresPlugin,
'core:plugin/mssql': mssqlPlugin,
'core:plugin/prometheus': prometheusPlugin,
'core:plugin/testdata': testDataDSPlugin,
'core:plugin/grafana-testdata-datasource': testDataDSPlugin,
'core:plugin/cloud-monitoring': cloudMonitoringPlugin,
'core:plugin/azuremonitor': azureMonitorPlugin,
'core:plugin/tempo': tempoPlugin,

@ -7,7 +7,7 @@ import {
SceneGridItem,
PanelBuilders,
} from '@grafana/scenes';
import { TestDataQueryType } from 'app/plugins/datasource/testdata/dataquery.gen';
import { TestDataQueryType } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';

@ -7,7 +7,7 @@ import {
SceneGridItem,
PanelBuilders,
} from '@grafana/scenes';
import { TestDataQueryType } from 'app/plugins/datasource/testdata/dataquery.gen';
import { TestDataQueryType } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';

@ -1,5 +1,5 @@
import { QueryRunnerState, SceneQueryRunner } from '@grafana/scenes';
import { TestData } from 'app/plugins/datasource/testdata/dataquery.gen';
import { TestData } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
export function getQueryRunnerWithRandomWalkQuery(
overrides?: Partial<TestData>,

@ -1,7 +1,7 @@
{
"type": "datasource",
"name": "TestData",
"id": "testdata",
"id": "grafana-testdata-datasource",
"metrics": true,
"logs": true,
Loading…
Cancel
Save