public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pyroscope: Rename phlare to grafana-pyroscope-datasource (#68859)

Browse Source
This commit is contained in:
Ryan McKinley
2023-06-07 06:09:29 +03:00
committed by GitHub
parent cefcbfa5ed
commit e17ef5e504
42 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/loader/loader.go
+1 -1
View File
@@ -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"
pkg/plugins/manager/manager_integration_test.go
+3 -3
View File
@@ -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": {},
}