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

Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync

Browse Source
This commit is contained in:
Ryan McKinley
2025-03-06 08:45:30 +03:00
parent 59188569f0 fcad628a7c
commit f44aa05b20
17 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/panels-visualizations/visualizations/flame-graph/index.md
+1 -1
View File
@@ -19,7 +19,7 @@ weight: 100
# Flame graph
Flame graphs let you visualize [profiling](https://grafana.com/docs/pyroscope/latest/introduction/profiling/) data. Using this visualization, a [profile](https://grafana.com/docs/pyroscope/latest/view-and-analyze-profile-data/profiling-types/) can be represented as a [flame graph](#flame-graph-mode), [top table](#top-table-mode), or both.
Flame graphs let you visualize [profiling](https://grafana.com/docs/pyroscope/latest/introduction/what-is-profiling/) data. Using this visualization, a [profile](https://grafana.com/docs/pyroscope/latest/view-and-analyze-profile-data/profiling-types/) can be represented as a [flame graph](#flame-graph-mode), [top table](#top-table-mode), or both.
For example, if you want to understand which parts of a program consume the most resources, such as CPU time, memory, or I/O operations, you can use a flame graph to visualize and analyze where potential performance issues are:
go.mod
+1 -1
View File
@@ -75,7 +75,7 @@ require (
github.com/googleapis/gax-go/v2 v2.14.1 // @grafana/grafana-backend-group
github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
github.com/gorilla/websocket v1.5.3 // @grafana/grafana-app-platform-squad
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // @grafana/alerting-backend
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 // @grafana/alerting-backend
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 // @grafana/identity-access-team
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 // @grafana/identity-access-team
github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
go.sum
+2 -2
View File
@@ -1555,8 +1555,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 h1:2s0xCzcxw8MlzLbbrEkghmwQpXjwkcRJYSItBQ1ZD0U=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
pkg/services/plugindashboards/service/dashboard_updater.go
+4 -2
View File
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -66,10 +67,11 @@ func (du *DashboardUpdater) updateAppDashboards() {
if !pluginSetting.Enabled {
continue
}
ctx, _ := identity.WithServiceIdentity(context.Background(), pluginSetting.OrgID)
if pluginDef, exists := du.pluginStore.Plugin(context.Background(), pluginSetting.PluginID); exists {
if pluginDef, exists := du.pluginStore.Plugin(ctx, pluginSetting.PluginID); exists {
if pluginDef.Info.Version != pluginSetting.PluginVersion {
du.syncPluginDashboards(context.Background(), pluginDef, pluginSetting.OrgID)
du.syncPluginDashboards(ctx, pluginDef, pluginSetting.OrgID)
}
}
}
pkg/storage/unified/apistore/go.mod
+1 -1
View File
@@ -199,7 +199,7 @@ require (
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // indirect
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 // indirect
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 // indirect
github.com/grafana/dataplane/sdata v0.0.9 // indirect
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 // indirect
pkg/storage/unified/apistore/go.sum
+2 -2
View File
@@ -1249,8 +1249,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 h1:2s0xCzcxw8MlzLbbrEkghmwQpXjwkcRJYSItBQ1ZD0U=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
pkg/storage/unified/resource/go.mod
+1 -1
View File
@@ -128,7 +128,7 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // indirect
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 // indirect
github.com/grafana/dataplane/sdata v0.0.9 // indirect
github.com/grafana/grafana-app-sdk/logging v0.30.0 // indirect
github.com/grafana/grafana-aws-sdk v0.31.5 // indirect
pkg/storage/unified/resource/go.sum
+2 -2
View File
@@ -1146,8 +1146,8 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061 h1:2s0xCzcxw8MlzLbbrEkghmwQpXjwkcRJYSItBQ1ZD0U=
github.com/grafana/alerting v0.0.0-20250305143710-aae4827ec061/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
public/api-enterprise-spec.json
+6
View File
@@ -3754,6 +3754,9 @@
},
"state": {
"$ref": "#/definitions/State"
},
"subject": {
"type": "string"
}
}
},
@@ -6708,6 +6711,9 @@
"state": {
"$ref": "#/definitions/State"
},
"subject": {
"type": "string"
},
"uid": {
"type": "string"
},
public/api-merged.json
+6
View File
@@ -14240,6 +14240,9 @@
},
"state": {
"$ref": "#/definitions/State"
},
"subject": {
"type": "string"
}
}
},
@@ -19492,6 +19495,9 @@
"state": {
"$ref": "#/definitions/State"
},
"subject": {
"type": "string"
},
"uid": {
"type": "string"
},
public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts
+6 -2
View File
@@ -510,6 +510,7 @@ export const resourceTypes = [
'microsoft.customproviders/resourceproviders',
'microsoft.dashboard/grafana',
'microsoft.databoxedge/databoxedgedevices',
'microsoft.databricks/workspaces',
'microsoft.datacollaboration/workspaces',
'microsoft.datafactory/datafactories',
'microsoft.datafactory/factories',
@@ -571,6 +572,7 @@ export const resourceTypes = [
'microsoft.machinelearningservices/workspaces/onlineendpoints',
'microsoft.machinelearningservices/workspaces/onlineendpoints/deployments',
'microsoft.managednetworkfabric/internetgateways',
'microsoft.managednetworkfabric/l2isolationdomains',
'microsoft.managednetworkfabric/l3isolationdomains',
'microsoft.managednetworkfabric/networkdevices',
'microsoft.maps/accounts',
@@ -637,6 +639,7 @@ export const resourceTypes = [
'microsoft.peering/peeringservices',
'microsoft.playfab/titles',
'microsoft.powerbidedicated/capacities',
'microsoft.providerhub/providermonitorsettings',
'microsoft.purview/accounts',
'microsoft.recoveryservices/vaults',
'microsoft.relay/namespaces',
@@ -689,8 +692,9 @@ export const resourceTypes = [
'microsoft.web/sites/slots',
'microsoft.web/staticsites',
'nginx.nginxplus/nginxdeployments',
'oracle.database/oracle.database/autonomousdatabases',
'oracle.database/oracle.database/cloudvmclusters',
'oracle.database/autonomousdatabases',
'oracle.database/cloudvmclusters',
'oracle.database/exadbvmclusters',
'private.messagingconnectors/private.messagingconnectors/connectors',
'wandisco.fusion/migrators',
'wandisco.fusion/migrators/datatransferagents',
public/locales/de-DE/grafana.json
+11 -7
View File
@@ -1084,8 +1084,7 @@
"title": ""
},
"multi-select": {
"options-header": "",
"selection-number": ""
"title": ""
}
}
},
@@ -1219,6 +1218,15 @@
"row": {
"collapse": "",
"expand": "",
"menu": {
"add": "",
"add-panel": "",
"add-row-above": "",
"add-row-below": "",
"move-down": "",
"move-row": "",
"move-up": ""
},
"new": "",
"repeat": {
"learn-more": "",
@@ -1227,13 +1235,9 @@
},
"row-options": {
"height": {
"expand": "",
"hide-row-header": "",
"min": "",
"title": ""
"hide-row-header": ""
},
"repeat": {
"title": "",
"variable": {
"title": ""
}
public/locales/es-ES/grafana.json
+11 -7
View File
@@ -1084,8 +1084,7 @@
"title": ""
},
"multi-select": {
"options-header": "",
"selection-number": ""
"title": ""
}
}
},
@@ -1219,6 +1218,15 @@
"row": {
"collapse": "",
"expand": "",
"menu": {
"add": "",
"add-panel": "",
"add-row-above": "",
"add-row-below": "",
"move-down": "",
"move-row": "",
"move-up": ""
},
"new": "",
"repeat": {
"learn-more": "",
@@ -1227,13 +1235,9 @@
},
"row-options": {
"height": {
"expand": "",
"hide-row-header": "",
"min": "",
"title": ""
"hide-row-header": ""
},
"repeat": {
"title": "",
"variable": {
"title": ""
}
public/locales/fr-FR/grafana.json
+11 -7
View File
@@ -1084,8 +1084,7 @@
"title": ""
},
"multi-select": {
"options-header": "",
"selection-number": ""
"title": ""
}
}
},
@@ -1219,6 +1218,15 @@
"row": {
"collapse": "",
"expand": "",
"menu": {
"add": "",
"add-panel": "",
"add-row-above": "",
"add-row-below": "",
"move-down": "",
"move-row": "",
"move-up": ""
},
"new": "",
"repeat": {
"learn-more": "",
@@ -1227,13 +1235,9 @@
},
"row-options": {
"height": {
"expand": "",
"hide-row-header": "",
"min": "",
"title": ""
"hide-row-header": ""
},
"repeat": {
"title": "",
"variable": {
"title": ""
}
public/locales/pt-BR/grafana.json
+11 -7
View File
@@ -1084,8 +1084,7 @@
"title": ""
},
"multi-select": {
"options-header": "",
"selection-number": ""
"title": ""
}
}
},
@@ -1219,6 +1218,15 @@
"row": {
"collapse": "",
"expand": "",
"menu": {
"add": "",
"add-panel": "",
"add-row-above": "",
"add-row-below": "",
"move-down": "",
"move-row": "",
"move-up": ""
},
"new": "",
"repeat": {
"learn-more": "",
@@ -1227,13 +1235,9 @@
},
"row-options": {
"height": {
"expand": "",
"hide-row-header": "",
"min": "",
"title": ""
"hide-row-header": ""
},
"repeat": {
"title": "",
"variable": {
"title": ""
}
public/locales/zh-Hans/grafana.json
+11 -7
View File
@@ -1075,8 +1075,7 @@
"title": ""
},
"multi-select": {
"options-header": "",
"selection-number": ""
"title": ""
}
}
},
@@ -1210,6 +1209,15 @@
"row": {
"collapse": "",
"expand": "",
"menu": {
"add": "",
"add-panel": "",
"add-row-above": "",
"add-row-below": "",
"move-down": "",
"move-row": "",
"move-up": ""
},
"new": "",
"repeat": {
"learn-more": "",
@@ -1218,13 +1226,9 @@
},
"row-options": {
"height": {
"expand": "",
"hide-row-header": "",
"min": "",
"title": ""
"hide-row-header": ""
},
"repeat": {
"title": "",
"variable": {
"title": ""
}
public/openapi3.json
+6
View File
@@ -4295,6 +4295,9 @@
},
"state": {
"$ref": "#/components/schemas/State"
},
"subject": {
"type": "string"
}
},
"type": "object"
@@ -9547,6 +9550,9 @@
"state": {
"$ref": "#/components/schemas/State"
},
"subject": {
"type": "string"
},
"uid": {
"type": "string"
},