Profiling: Enable flame graph & Phlare/Parca data sources for all users (#63488)

* Remove flame graph toggle

* Remove beta badge from panel

* Update expectedListResp.json

* Update flame graph container to only show if there is data
This commit is contained in:
Joey
2023-03-01 11:32:39 +00:00
committed by GitHub
parent d258c8ef8a
commit fbd049a094
15 changed files with 130 additions and 87 deletions
+1 -7
View File
@@ -10,7 +10,6 @@ import (
"github.com/grafana/grafana/pkg/services/accesscontrol"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/licensing"
"github.com/grafana/grafana/pkg/services/pluginsettings"
"github.com/grafana/grafana/pkg/services/secrets/kvstore"
@@ -63,11 +62,6 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
continue
}
hideFromList := panel.HideFromList
if panel.ID == "flamegraph" {
hideFromList = !hs.Features.IsEnabled(featuremgmt.FlagFlameGraph)
}
panels[panel.ID] = plugins.PanelDTO{
ID: panel.ID,
Name: panel.Name,
@@ -75,7 +69,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
Module: panel.Module,
BaseURL: panel.BaseURL,
SkipDataQuery: panel.SkipDataQuery,
HideFromList: hideFromList,
HideFromList: panel.HideFromList,
ReleaseState: string(panel.State),
Signature: string(panel.Signature),
Sort: getPanelSort(panel.ID),
-5
View File
@@ -27,7 +27,6 @@ import (
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/pluginsettings"
"github.com/grafana/grafana/pkg/setting"
@@ -116,10 +115,6 @@ func (hs *HTTPServer) GetPluginList(c *contextmodel.ReqContext) response.Respons
}
}
if (pluginDef.ID == "parca" || pluginDef.ID == "phlare") && !hs.Features.IsEnabled(featuremgmt.FlagFlameGraph) {
continue
}
filteredPluginDefinitions = append(filteredPluginDefinitions, pluginDef)
filteredPluginIDs[pluginDef.ID] = true
}
-5
View File
@@ -244,11 +244,6 @@ var (
State: FeatureStateAlpha,
RequiresDevMode: true,
},
{
Name: "flameGraph",
Description: "Show the flame graph",
State: FeatureStateAlpha,
},
{
Name: "cloudWatchCrossAccountQuerying",
Description: "Enables cross-account querying in CloudWatch datasources",
-4
View File
@@ -179,10 +179,6 @@ const (
// SQL-based entity store (requires storage flag also)
FlagEntityStore = "entityStore"
// FlagFlameGraph
// Show the flame graph
FlagFlameGraph = "flameGraph"
// FlagCloudWatchCrossAccountQuerying
// Enables cross-account querying in CloudWatch datasources
FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying"
@@ -458,7 +458,7 @@
"hasUpdate": false,
"defaultNavUrl": "/plugins/flamegraph/",
"category": "",
"state": "beta",
"state": "",
"signature": "internal",
"signatureType": "",
"signatureOrg": ""
@@ -1101,6 +1101,83 @@
"signature": "internal",
"signatureType": "",
"signatureOrg": ""
},{
"name": "Parca",
"type": "datasource",
"id": "parca",
"enabled": true,
"pinned": false,
"info": {
"author": {
"name": "Grafana Labs",
"url": "https://www.grafana.com"
},
"description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
"links": [{
"name": "GitHub Project",
"url": "https://github.com/parca-dev/parca"
}],
"logos": {
"small": "public/app/plugins/datasource/parca/img/logo-small.svg",
"large": "public/app/plugins/datasource/parca/img/logo-small.svg"
},
"build": {},
"screenshots": null,
"version": "",
"updated": ""
},
"dependencies": {
"grafanaDependency": "",
"grafanaVersion": "*",
"plugins": []
},
"latestVersion": "",
"hasUpdate": false,
"defaultNavUrl": "/plugins/parca/",
"category": "profiling",
"state": "",
"signature": "internal",
"signatureType": "",
"signatureOrg": ""
},
{
"name": "Phlare",
"type": "datasource",
"id": "phlare",
"enabled": true,
"pinned": false,
"info": {
"author": {
"name": "Grafana Labs",
"url": "https://www.grafana.com"
},
"description": "Horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system. OSS profiling solution from Grafana Labs.",
"links": [{
"name": "GitHub Project",
"url": "https://github.com/grafana/phlare"
}],
"logos": {
"small": "public/app/plugins/datasource/phlare/img/phlare_icon_color.svg",
"large": "public/app/plugins/datasource/phlare/img/phlare_icon_color.svg"
},
"build": {},
"screenshots": null,
"version": "",
"updated": ""
},
"dependencies": {
"grafanaDependency": "",
"grafanaVersion": "*",
"plugins": []
},
"latestVersion": "",
"hasUpdate": false,
"defaultNavUrl": "/plugins/phlare/",
"category": "profiling",
"state": "",
"signature": "internal",
"signatureType": "",
"signatureOrg": ""
},
{
"name": "Pie chart",