From e17ef5e50432c39a3be6dfb0278900faedf6c961 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 6 Jun 2023 20:09:29 -0700 Subject: [PATCH] Pyroscope: Rename phlare to grafana-pyroscope-datasource (#68859) --- .github/CODEOWNERS | 4 ++-- .../backendplugin/coreplugin/registry.go | 8 ++++---- pkg/plugins/manager/loader/loader.go | 2 +- .../manager/manager_integration_test.go | 6 +++--- pkg/plugins/pfs/corelist/corelist_load_gen.go | 2 +- pkg/plugins/plugins.go | 6 ++++++ pkg/plugins/plugins_test.go | 20 +++++++++++++++++++ pkg/server/wire.go | 4 ++-- .../api/plugins/data/expectedListResp.json | 8 ++++---- .../client.go | 0 .../instance.go | 0 .../instance_test.go | 0 .../kinds/dataquery/types_dataquery_gen.go | 0 .../phlareClient.go | 0 .../phlareClient_test.go | 0 .../pyroscopeClient.go | 0 .../query.go | 2 +- .../query_test.go | 0 .../service.go | 0 .../testdata/profile_response.json | 0 .../app/features/plugins/built_in_plugins.ts | 6 +++--- .../ConfigEditor.tsx | 0 .../QueryEditor/EditorField.tsx | 0 .../QueryEditor/EditorRow.tsx | 0 .../QueryEditor/EditorRows.tsx | 0 .../QueryEditor/LabelsEditor.tsx | 0 .../QueryEditor/QueryEditor.test.tsx | 0 .../QueryEditor/QueryEditor.tsx | 0 .../QueryEditor/QueryOptions.tsx | 0 .../QueryEditor/Stack.tsx | 0 .../QueryEditor/autocomplete.test.ts | 0 .../QueryEditor/autocomplete.ts | 0 .../dataquery.cue | 0 .../dataquery.gen.ts | 0 .../datasource.test.ts | 0 .../datasource.ts | 0 .../img/grafana_pyroscope_icon.svg | 0 .../module.ts | 0 .../phlareql/index.ts | 0 .../phlareql/phlareql.ts | 0 .../plugin.json | 2 +- .../types.ts | 0 42 files changed, 48 insertions(+), 22 deletions(-) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/client.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/instance.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/instance_test.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/kinds/dataquery/types_dataquery_gen.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/phlareClient.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/phlareClient_test.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/pyroscopeClient.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/query.go (99%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/query_test.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/service.go (100%) rename pkg/tsdb/{phlare => grafana-pyroscope-datasource}/testdata/profile_response.json (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/ConfigEditor.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/EditorField.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/EditorRow.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/EditorRows.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/LabelsEditor.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/QueryEditor.test.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/QueryEditor.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/QueryOptions.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/Stack.tsx (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/autocomplete.test.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/QueryEditor/autocomplete.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/dataquery.cue (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/dataquery.gen.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/datasource.test.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/datasource.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/img/grafana_pyroscope_icon.svg (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/module.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/phlareql/index.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/phlareql/phlareql.ts (100%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/plugin.json (95%) rename public/app/plugins/datasource/{phlare => grafana-pyroscope-datasource}/types.ts (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 07b2f1cb679..23ffd625615 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -244,7 +244,7 @@ /pkg/tsdb/graphite/ @grafana/observability-metrics /pkg/tsdb/loki/ @grafana/observability-logs /pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling -/pkg/tsdb/phlare/ @grafana/observability-traces-and-profiling +/pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling /pkg/tsdb/parca/ @grafana/observability-traces-and-profiling # BI backend code @@ -522,7 +522,7 @@ lerna.json @grafana/frontend-ops /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources /public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling /public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling -/public/app/plugins/datasource/phlare/ @grafana/observability-traces-and-profiling +/public/app/plugins/datasource/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling /public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad diff --git a/pkg/plugins/backendplugin/coreplugin/registry.go b/pkg/plugins/backendplugin/coreplugin/registry.go index 4362628b6da..975a1aca172 100644 --- a/pkg/plugins/backendplugin/coreplugin/registry.go +++ b/pkg/plugins/backendplugin/coreplugin/registry.go @@ -13,6 +13,7 @@ import ( cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring" "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" + pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -21,7 +22,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/mysql" "github.com/grafana/grafana/pkg/tsdb/opentsdb" "github.com/grafana/grafana/pkg/tsdb/parca" - "github.com/grafana/grafana/pkg/tsdb/phlare" "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" @@ -44,7 +44,7 @@ const ( MySQL = "mysql" MSSQL = "mssql" Grafana = "grafana" - Phlare = "phlare" + Pyroscope = "grafana-pyroscope-datasource" Parca = "parca" ) @@ -67,7 +67,7 @@ func NewRegistry(store map[string]backendplugin.PluginFactoryFunc) *Registry { func ProvideCoreRegistry(am *azuremonitor.Service, cw *cloudwatch.CloudWatchService, cm *cloudmonitoring.Service, es *elasticsearch.Service, grap *graphite.Service, idb *influxdb.Service, lk *loki.Service, otsdb *opentsdb.Service, pr *prometheus.Service, t *tempo.Service, td *testdatasource.Service, pg *postgres.Service, my *mysql.Service, - ms *mssql.Service, graf *grafanads.Service, phlare *phlare.Service, parca *parca.Service) *Registry { + ms *mssql.Service, graf *grafanads.Service, pyroscope *pyroscope.Service, parca *parca.Service) *Registry { return NewRegistry(map[string]backendplugin.PluginFactoryFunc{ CloudWatch: asBackendPlugin(cw.Executor), CloudMonitoring: asBackendPlugin(cm), @@ -84,7 +84,7 @@ func ProvideCoreRegistry(am *azuremonitor.Service, cw *cloudwatch.CloudWatchServ MySQL: asBackendPlugin(my), MSSQL: asBackendPlugin(ms), Grafana: asBackendPlugin(graf), - Phlare: asBackendPlugin(phlare), + Pyroscope: asBackendPlugin(pyroscope), Parca: asBackendPlugin(parca), }) } diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go index b17b31a5135..7f1d2b9b114 100644 --- a/pkg/plugins/manager/loader/loader.go +++ b/pkg/plugins/manager/loader/loader.go @@ -140,7 +140,7 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun // Hardcoded alias changes switch plugin.ID { - case "grafana-pyroscope": // rebranding + case "grafana-pyroscope-datasource": // rebranding plugin.Alias = "phlare" case "debug": // panel plugin used for testing plugin.Alias = "debugX" diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go index b7c91b43c29..7d648254cb1 100644 --- a/pkg/plugins/manager/manager_integration_test.go +++ b/pkg/plugins/manager/manager_integration_test.go @@ -40,6 +40,7 @@ import ( cloudmonitoring "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring" "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" + pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -48,7 +49,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/mysql" "github.com/grafana/grafana/pkg/tsdb/opentsdb" "github.com/grafana/grafana/pkg/tsdb/parca" - "github.com/grafana/grafana/pkg/tsdb/phlare" "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" @@ -108,7 +108,7 @@ func TestIntegrationPluginManager(t *testing.T) { ms := mssql.ProvideService(cfg) sv2 := searchV2.ProvideService(cfg, db.InitTestDB(t), nil, nil, tracer, features, nil, nil, nil) graf := grafanads.ProvideService(sv2, nil) - phlare := phlare.ProvideService(hcp, acimpl.ProvideAccessControl(cfg)) + phlare := pyroscope.ProvideService(hcp, acimpl.ProvideAccessControl(cfg)) parca := parca.ProvideService(hcp) coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf, phlare, parca) @@ -218,7 +218,7 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *store.Serv "jaeger": {}, "mixed": {}, "zipkin": {}, - "phlare": {}, + "grafana-pyroscope-datasource": {}, "parca": {}, } diff --git a/pkg/plugins/pfs/corelist/corelist_load_gen.go b/pkg/plugins/pfs/corelist/corelist_load_gen.go index cdbdb3ea1f7..48dc739db69 100644 --- a/pkg/plugins/pfs/corelist/corelist_load_gen.go +++ b/pkg/plugins/pfs/corelist/corelist_load_gen.go @@ -39,13 +39,13 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin { parsePluginOrPanic("public/app/plugins/datasource/dashboard", "dashboard", rt), 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/graphite", "graphite", rt), parsePluginOrPanic("public/app/plugins/datasource/jaeger", "jaeger", rt), parsePluginOrPanic("public/app/plugins/datasource/loki", "loki", rt), parsePluginOrPanic("public/app/plugins/datasource/mssql", "mssql", rt), parsePluginOrPanic("public/app/plugins/datasource/mysql", "mysql", rt), parsePluginOrPanic("public/app/plugins/datasource/parca", "parca", rt), - parsePluginOrPanic("public/app/plugins/datasource/phlare", "phlare", rt), parsePluginOrPanic("public/app/plugins/datasource/postgres", "postgres", rt), parsePluginOrPanic("public/app/plugins/datasource/prometheus", "prometheus", rt), parsePluginOrPanic("public/app/plugins/datasource/tempo", "tempo", rt), diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 61ed751e4ac..9455fe96534 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -114,6 +114,7 @@ type JSONData struct { ID string `json:"id"` Type Type `json:"type"` Name string `json:"name"` + Alias string `json:"alias,omitempty"` Info Info `json:"info"` Dependencies Dependencies `json:"dependencies"` Includes []*Includes `json:"includes"` @@ -165,6 +166,10 @@ func ReadPluginJSON(reader io.Reader) (JSONData, error) { switch plugin.ID { case "grafana-piechart-panel": plugin.Name = "Pie Chart (old)" + case "grafana-pyroscope-datasource": // rebranding + plugin.Alias = "phlare" + case "debug": // panel plugin used for testing + plugin.Alias = "debugX" } if len(plugin.Dependencies.Plugins) == 0 { @@ -437,6 +442,7 @@ func (p *Plugin) ToDTO() PluginDTO { Module: p.Module, BaseURL: p.BaseURL, AngularDetected: p.AngularDetected, + Alias: p.Alias, } } diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go index e19e366f457..03761844bda 100644 --- a/pkg/plugins/plugins_test.go +++ b/pkg/plugins/plugins_test.go @@ -102,6 +102,26 @@ func Test_ReadPluginJSON(t *testing.T) { }, }, }, + { + name: "Phlare<>Pyroscope rebranding -- hardcoded alias", + pluginJSON: func(t *testing.T) io.ReadCloser { + pJSON := `{ + "id": "grafana-pyroscope-datasource", + "type": "datasource" + }` + return io.NopCloser(strings.NewReader(pJSON)) + }, + expected: JSONData{ + ID: "grafana-pyroscope-datasource", + Alias: "phlare", // Hardcoded from the parser + Type: "datasource", + Dependencies: Dependencies{ + GrafanaDependency: "", + GrafanaVersion: "*", + Plugins: []Dependency{}, + }, + }, + }, } for _, tt := range tests { diff --git a/pkg/server/wire.go b/pkg/server/wire.go index bd2e3aca265..d1ce2905ecf 100644 --- a/pkg/server/wire.go +++ b/pkg/server/wire.go @@ -144,6 +144,7 @@ import ( "github.com/grafana/grafana/pkg/tsdb/cloud-monitoring" "github.com/grafana/grafana/pkg/tsdb/cloudwatch" "github.com/grafana/grafana/pkg/tsdb/elasticsearch" + pyroscope "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource" "github.com/grafana/grafana/pkg/tsdb/grafanads" "github.com/grafana/grafana/pkg/tsdb/graphite" "github.com/grafana/grafana/pkg/tsdb/influxdb" @@ -154,7 +155,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb/mysql" "github.com/grafana/grafana/pkg/tsdb/opentsdb" "github.com/grafana/grafana/pkg/tsdb/parca" - "github.com/grafana/grafana/pkg/tsdb/phlare" "github.com/grafana/grafana/pkg/tsdb/postgres" "github.com/grafana/grafana/pkg/tsdb/prometheus" "github.com/grafana/grafana/pkg/tsdb/tempo" @@ -256,7 +256,7 @@ var wireBasicSet = wire.NewSet( graphite.ProvideService, prometheus.ProvideService, elasticsearch.ProvideService, - phlare.ProvideService, + pyroscope.ProvideService, parca.ProvideService, encryptionservice.ProvideEncryptionService, wire.Bind(new(encryption.Internal), new(*encryptionservice.Service)), diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json index 3ad896af460..279e9d5cc60 100644 --- a/pkg/tests/api/plugins/data/expectedListResp.json +++ b/pkg/tests/api/plugins/data/expectedListResp.json @@ -663,7 +663,7 @@ { "name": "Grafana Pyroscope", "type": "datasource", - "id": "phlare", + "id": "grafana-pyroscope-datasource", "enabled": true, "pinned": false, "info": { @@ -679,8 +679,8 @@ } ], "logos": { - "small": "public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg", - "large": "public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg" + "small": "public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg", + "large": "public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg" }, "build": {}, "screenshots": null, @@ -694,7 +694,7 @@ }, "latestVersion": "", "hasUpdate": false, - "defaultNavUrl": "/plugins/phlare/", + "defaultNavUrl": "/plugins/grafana-pyroscope-datasource/", "category": "profiling", "state": "", "signature": "internal", diff --git a/pkg/tsdb/phlare/client.go b/pkg/tsdb/grafana-pyroscope-datasource/client.go similarity index 100% rename from pkg/tsdb/phlare/client.go rename to pkg/tsdb/grafana-pyroscope-datasource/client.go diff --git a/pkg/tsdb/phlare/instance.go b/pkg/tsdb/grafana-pyroscope-datasource/instance.go similarity index 100% rename from pkg/tsdb/phlare/instance.go rename to pkg/tsdb/grafana-pyroscope-datasource/instance.go diff --git a/pkg/tsdb/phlare/instance_test.go b/pkg/tsdb/grafana-pyroscope-datasource/instance_test.go similarity index 100% rename from pkg/tsdb/phlare/instance_test.go rename to pkg/tsdb/grafana-pyroscope-datasource/instance_test.go diff --git a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go b/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go similarity index 100% rename from pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go rename to pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go diff --git a/pkg/tsdb/phlare/phlareClient.go b/pkg/tsdb/grafana-pyroscope-datasource/phlareClient.go similarity index 100% rename from pkg/tsdb/phlare/phlareClient.go rename to pkg/tsdb/grafana-pyroscope-datasource/phlareClient.go diff --git a/pkg/tsdb/phlare/phlareClient_test.go b/pkg/tsdb/grafana-pyroscope-datasource/phlareClient_test.go similarity index 100% rename from pkg/tsdb/phlare/phlareClient_test.go rename to pkg/tsdb/grafana-pyroscope-datasource/phlareClient_test.go diff --git a/pkg/tsdb/phlare/pyroscopeClient.go b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go similarity index 100% rename from pkg/tsdb/phlare/pyroscopeClient.go rename to pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go diff --git a/pkg/tsdb/phlare/query.go b/pkg/tsdb/grafana-pyroscope-datasource/query.go similarity index 99% rename from pkg/tsdb/phlare/query.go rename to pkg/tsdb/grafana-pyroscope-datasource/query.go index 10e1dffc0bc..3d69f9e5e1b 100644 --- a/pkg/tsdb/phlare/query.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/query.go @@ -12,7 +12,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend/gtime" "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/live" - "github.com/grafana/grafana/pkg/tsdb/phlare/kinds/dataquery" + "github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery" "github.com/xlab/treeprint" "golang.org/x/sync/errgroup" ) diff --git a/pkg/tsdb/phlare/query_test.go b/pkg/tsdb/grafana-pyroscope-datasource/query_test.go similarity index 100% rename from pkg/tsdb/phlare/query_test.go rename to pkg/tsdb/grafana-pyroscope-datasource/query_test.go diff --git a/pkg/tsdb/phlare/service.go b/pkg/tsdb/grafana-pyroscope-datasource/service.go similarity index 100% rename from pkg/tsdb/phlare/service.go rename to pkg/tsdb/grafana-pyroscope-datasource/service.go diff --git a/pkg/tsdb/phlare/testdata/profile_response.json b/pkg/tsdb/grafana-pyroscope-datasource/testdata/profile_response.json similarity index 100% rename from pkg/tsdb/phlare/testdata/profile_response.json rename to pkg/tsdb/grafana-pyroscope-datasource/testdata/profile_response.json diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index 6097d5ce2f3..5ffa8176911 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -37,8 +37,8 @@ const tempoPlugin = async () => await import(/* webpackChunkName: "tempoPlugin" */ 'app/plugins/datasource/tempo/module'); const alertmanagerPlugin = async () => await import(/* webpackChunkName: "alertmanagerPlugin" */ 'app/plugins/datasource/alertmanager/module'); -const phlarePlugin = async () => - await import(/* webpackChunkName: "phlarePlugin" */ 'app/plugins/datasource/phlare/module'); +const pyroscopePlugin = async () => + await import(/* webpackChunkName: "pyroscopePlugin" */ 'app/plugins/datasource/grafana-pyroscope-datasource/module'); const parcaPlugin = async () => await import(/* webpackChunkName: "parcaPlugin" */ 'app/plugins/datasource/parca/module'); @@ -102,7 +102,7 @@ const builtInPlugins: any = { 'app/plugins/datasource/azuremonitor/module': azureMonitorPlugin, 'app/plugins/datasource/tempo/module': tempoPlugin, 'app/plugins/datasource/alertmanager/module': alertmanagerPlugin, - 'app/plugins/datasource/phlare/module': phlarePlugin, + 'app/plugins/datasource/grafana-pyroscope-datasource/module': pyroscopePlugin, 'app/plugins/datasource/parca/module': parcaPlugin, 'app/plugins/panel/text/module': textPanel, diff --git a/public/app/plugins/datasource/phlare/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/ConfigEditor.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/ConfigEditor.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/EditorField.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/EditorField.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorField.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/EditorRow.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorRow.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/EditorRow.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorRow.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/EditorRows.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorRows.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/EditorRows.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/EditorRows.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/LabelsEditor.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/LabelsEditor.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.test.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.test.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/QueryEditor.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryEditor.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/QueryOptions.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/QueryOptions.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/Stack.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/Stack.tsx rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx diff --git a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.test.ts similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/autocomplete.test.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.test.ts diff --git a/public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts similarity index 100% rename from public/app/plugins/datasource/phlare/QueryEditor/autocomplete.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/autocomplete.ts diff --git a/public/app/plugins/datasource/phlare/dataquery.cue b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue similarity index 100% rename from public/app/plugins/datasource/phlare/dataquery.cue rename to public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.cue diff --git a/public/app/plugins/datasource/phlare/dataquery.gen.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts similarity index 100% rename from public/app/plugins/datasource/phlare/dataquery.gen.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/dataquery.gen.ts diff --git a/public/app/plugins/datasource/phlare/datasource.test.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts similarity index 100% rename from public/app/plugins/datasource/phlare/datasource.test.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.test.ts diff --git a/public/app/plugins/datasource/phlare/datasource.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts similarity index 100% rename from public/app/plugins/datasource/phlare/datasource.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/datasource.ts diff --git a/public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg b/public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg similarity index 100% rename from public/app/plugins/datasource/phlare/img/grafana_pyroscope_icon.svg rename to public/app/plugins/datasource/grafana-pyroscope-datasource/img/grafana_pyroscope_icon.svg diff --git a/public/app/plugins/datasource/phlare/module.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/module.ts similarity index 100% rename from public/app/plugins/datasource/phlare/module.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/module.ts diff --git a/public/app/plugins/datasource/phlare/phlareql/index.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/phlareql/index.ts similarity index 100% rename from public/app/plugins/datasource/phlare/phlareql/index.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/phlareql/index.ts diff --git a/public/app/plugins/datasource/phlare/phlareql/phlareql.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/phlareql/phlareql.ts similarity index 100% rename from public/app/plugins/datasource/phlare/phlareql/phlareql.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/phlareql/phlareql.ts diff --git a/public/app/plugins/datasource/phlare/plugin.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json similarity index 95% rename from public/app/plugins/datasource/phlare/plugin.json rename to public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json index 3ec4ed4eb3b..7296c870330 100644 --- a/public/app/plugins/datasource/phlare/plugin.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/plugin.json @@ -1,7 +1,7 @@ { "type": "datasource", "name": "Grafana Pyroscope", - "id": "phlare", + "id": "grafana-pyroscope-datasource", "category": "profiling", "metrics": true, diff --git a/public/app/plugins/datasource/phlare/types.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts similarity index 100% rename from public/app/plugins/datasource/phlare/types.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/types.ts