diff --git a/docs/sources/panels-visualizations/visualizations/flame-graph/index.md b/docs/sources/panels-visualizations/visualizations/flame-graph/index.md index beb660f660f..b4096fa4d09 100644 --- a/docs/sources/panels-visualizations/visualizations/flame-graph/index.md +++ b/docs/sources/panels-visualizations/visualizations/flame-graph/index.md @@ -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: diff --git a/go.mod b/go.mod index 5739cccaeb4..d4f52994627 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index c5fe5738216..10b3787e95e 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/services/plugindashboards/service/dashboard_updater.go b/pkg/services/plugindashboards/service/dashboard_updater.go index 7cf8bc8c46d..488fe5a8bc2 100644 --- a/pkg/services/plugindashboards/service/dashboard_updater.go +++ b/pkg/services/plugindashboards/service/dashboard_updater.go @@ -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) } } } diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index fa6efcc48e0..26be15e41a9 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -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 diff --git a/pkg/storage/unified/apistore/go.sum b/pkg/storage/unified/apistore/go.sum index bdd6753af84..d61a2a99351 100644 --- a/pkg/storage/unified/apistore/go.sum +++ b/pkg/storage/unified/apistore/go.sum @@ -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= diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 7f5e3f06001..c437920c70d 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -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 diff --git a/pkg/storage/unified/resource/go.sum b/pkg/storage/unified/resource/go.sum index e12c9508408..9c304734424 100644 --- a/pkg/storage/unified/resource/go.sum +++ b/pkg/storage/unified/resource/go.sum @@ -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= diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json index e2e8df6926b..3faeab0aa9a 100644 --- a/public/api-enterprise-spec.json +++ b/public/api-enterprise-spec.json @@ -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" }, diff --git a/public/api-merged.json b/public/api-merged.json index 7d1e7214293..4f216cfbc95 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -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" }, diff --git a/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts b/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts index 15c86068c4b..dd3e32b88b4 100644 --- a/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts +++ b/public/app/plugins/datasource/azuremonitor/azureMetadata/resourceTypes.ts @@ -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', diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json index a71a2d7f649..622ef0fd399 100644 --- a/public/locales/de-DE/grafana.json +++ b/public/locales/de-DE/grafana.json @@ -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": "" } diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json index bb0e9bc24ff..4f6c91910fd 100644 --- a/public/locales/es-ES/grafana.json +++ b/public/locales/es-ES/grafana.json @@ -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": "" } diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json index d52cecfbc5f..902d3ab19f3 100644 --- a/public/locales/fr-FR/grafana.json +++ b/public/locales/fr-FR/grafana.json @@ -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": "" } diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json index 6eebfbe6174..31d608a208f 100644 --- a/public/locales/pt-BR/grafana.json +++ b/public/locales/pt-BR/grafana.json @@ -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": "" } diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json index e68e88f462c..68f8e9d1877 100644 --- a/public/locales/zh-Hans/grafana.json +++ b/public/locales/zh-Hans/grafana.json @@ -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": "" } diff --git a/public/openapi3.json b/public/openapi3.json index a8dffd5d069..5f3d84d0826 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -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" },