From d5a97f1fa4dd124147d7c25908b06eb77fb18e73 Mon Sep 17 00:00:00 2001 From: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:42:52 -0700 Subject: [PATCH] Release: 11.0.10 (#99694) * apply security patch: v11.0.x/310-202501232104.patch commit 546935e4dcab6c415d4302f4f8548c3d93b1df22 Author: Matt Jacobson Date: Thu Jan 23 15:56:40 2025 -0500 CVE-2024-11741 - victorops url * baldm0mma/ update version and add changelog content * baldm0mma/update deps * baldm0mma/update deps --------- Co-authored-by: github-actions[bot] --- CHANGELOG.md | 14 ++ go.mod | 2 +- go.sum | 2 + lerna.json | 2 +- package.json | 2 +- packages/grafana-data/package.json | 4 +- packages/grafana-e2e-selectors/package.json | 2 +- packages/grafana-e2e/package.json | 6 +- packages/grafana-eslint-rules/package.json | 2 +- packages/grafana-flamegraph/package.json | 6 +- .../grafana-o11y-ds-frontend/package.json | 12 +- packages/grafana-plugin-configs/package.json | 2 +- packages/grafana-prometheus/package.json | 14 +- packages/grafana-runtime/package.json | 10 +- packages/grafana-schema/package.json | 2 +- .../x/AnnotationsListPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/BarChartPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/BarGaugePanelCfg_types.gen.ts | 2 +- .../x/CandlestickPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/CanvasPanelCfg_types.gen.ts | 2 +- .../x/CloudWatchDataQuery_types.gen.ts | 2 +- .../x/DashboardListPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/DatagridPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/DebugPanelCfg_types.gen.ts | 2 +- .../x/ElasticsearchDataQuery_types.gen.ts | 2 +- .../panelcfg/x/GaugePanelCfg_types.gen.ts | 2 +- .../panelcfg/x/GeomapPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/HeatmapPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/HistogramPanelCfg_types.gen.ts | 2 +- .../logs/panelcfg/x/LogsPanelCfg_types.gen.ts | 2 +- .../dataquery/x/LokiDataQuery_types.gen.ts | 2 +- .../news/panelcfg/x/NewsPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/NodeGraphPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/PieChartPanelCfg_types.gen.ts | 2 +- .../stat/panelcfg/x/StatPanelCfg_types.gen.ts | 2 +- .../x/StateTimelinePanelCfg_types.gen.ts | 2 +- .../x/StatusHistoryPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/TablePanelCfg_types.gen.ts | 2 +- .../text/panelcfg/x/TextPanelCfg_types.gen.ts | 2 +- .../x/TimeSeriesPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/TrendPanelCfg_types.gen.ts | 2 +- .../panelcfg/x/XYChartPanelCfg_types.gen.ts | 2 +- packages/grafana-sql/package.json | 8 +- packages/grafana-ui/package.json | 8 +- .../api/tooling/definitions/contact_points.go | 2 +- .../channels_config/available_channels.go | 1 + .../datasource/azuremonitor/package.json | 14 +- .../datasource/cloud-monitoring/package.json | 14 +- .../grafana-pyroscope-datasource/package.json | 12 +- .../grafana-testdata-datasource/package.json | 14 +- .../plugins/datasource/jaeger/package.json | 2 +- .../app/plugins/datasource/parca/package.json | 12 +- .../app/plugins/datasource/tempo/package.json | 4 +- .../plugins/datasource/zipkin/package.json | 2 +- yarn.lock | 124 +++++++++--------- 55 files changed, 185 insertions(+), 168 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa677ba6792..984269b9a43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + + +# 11.0.10 (2025-01-28) + +### Features and enhancements + +- **Security:** Update to Go 1.22.11 - Backport to v11.0.x [#99127](https://github.com/grafana/grafana/pull/99127), [@Proximyst](https://github.com/Proximyst) +- **Security:** Update to Go 1.22.11 - Backport to v11.0.x (Enterprise) + +### Bug fixes + +- **Azure/GCM:** Improve error display [#97592](https://github.com/grafana/grafana/pull/97592), [@aangelisc](https://github.com/aangelisc) + + # 11.0.9 (2024-12-04) diff --git a/go.mod b/go.mod index 02557a5c6f4..ecd3160ae19 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/google/uuid v1.6.0 // @grafana/backend-platform github.com/google/wire v0.5.0 // @grafana/backend-platform github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad - github.com/grafana/alerting v0.0.0-20240712182455-c340765c985a // @grafana/alerting-squad-backend + github.com/grafana/alerting v0.0.0-20250123201909-12b988dad96d // @grafana/alerting-squad-backend github.com/grafana/cuetsy v0.1.11 // @grafana/grafana-as-code github.com/grafana/grafana-aws-sdk v0.25.1 // @grafana/aws-datasources github.com/grafana/grafana-azure-sdk-go/v2 v2.0.1 // @grafana/partner-datasources diff --git a/go.sum b/go.sum index 8621752ca3d..bf46beaf5aa 100644 --- a/go.sum +++ b/go.sum @@ -2128,6 +2128,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafana/alerting v0.0.0-20240712182455-c340765c985a h1:hg3wY74+LuIVRUPL4Fenr2bL47Zq6QNXeK0i7ljy7Oc= github.com/grafana/alerting v0.0.0-20240712182455-c340765c985a/go.mod h1:0nHKO0w8OTemvZ3eh7+s1EqGGhgbs0kvkTeLU1FrbTw= +github.com/grafana/alerting v0.0.0-20250123201909-12b988dad96d h1:IbHodZ/4NksHn55clDRsjOSZf3VF9XVMoDXLKUW+Zqo= +github.com/grafana/alerting v0.0.0-20250123201909-12b988dad96d/go.mod h1:0nHKO0w8OTemvZ3eh7+s1EqGGhgbs0kvkTeLU1FrbTw= github.com/grafana/authlib v0.0.0-20240319083410-9d4a6e3861e5 h1:A13Z8Hy60BfIduM819kpk0njrRKjbAVbVRhE+R+AF/8= github.com/grafana/authlib v0.0.0-20240319083410-9d4a6e3861e5/go.mod h1:86rRD5P6u2JPWtNWTMOlqlU+YMv2fUvVz/DomA6L7w4= github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw= diff --git a/lerna.json b/lerna.json index 66814e00ff9..d3e534c4a4e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "npmClient": "yarn", - "version": "11.0.10" + "version": "11.0.11" } diff --git a/package.json b/package.json index 211db83bf03..a1c8f7f8ea1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "private": true, "name": "grafana", - "version": "11.0.10", + "version": "11.0.11", "repository": "github:grafana/grafana", "scripts": { "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index ef6f7977c4a..8a6ef969631 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/data", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana Data Library", "keywords": [ "typescript" @@ -36,7 +36,7 @@ }, "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.0.10", + "@grafana/schema": "11.0.11", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 30acf10c435..c1cd0b2bf0e 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/e2e-selectors", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index bb9d2989adf..6e713a39fbd 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "name": "@grafana/e2e", "private": true, - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana End-to-End Test Library", "keywords": [ "cli", @@ -64,8 +64,8 @@ "@babel/core": "7.23.2", "@babel/preset-env": "7.23.2", "@cypress/webpack-preprocessor": "5.17.1", - "@grafana/e2e-selectors": "11.0.10", - "@grafana/schema": "11.0.10", + "@grafana/e2e-selectors": "11.0.11", + "@grafana/schema": "11.0.11", "@grafana/tsconfig": "^1.3.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", "babel-loader": "9.1.3", diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json index b9f7a93c813..37d772dd159 100644 --- a/packages/grafana-eslint-rules/package.json +++ b/packages/grafana-eslint-rules/package.json @@ -1,7 +1,7 @@ { "name": "@grafana/eslint-plugin", "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.", - "version": "11.0.10", + "version": "11.0.11", "main": "./index.cjs", "author": "Grafana Labs", "license": "Apache-2.0", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index e39874bb13b..c299aea9f30 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/flamegraph", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana flamegraph visualization component", "keywords": [ "grafana", @@ -44,8 +44,8 @@ ], "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/ui": "11.0.11", "@leeoniya/ufuzzy": "1.0.14", "d3": "^7.8.5", "lodash": "4.17.21", diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index 8f8945a8907..3abd1c925f8 100644 --- a/packages/grafana-o11y-ds-frontend/package.json +++ b/packages/grafana-o11y-ds-frontend/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "name": "@grafana/o11y-ds-frontend", "private": true, - "version": "11.0.10", + "version": "11.0.11", "description": "Library to manage traces in Grafana.", "sideEffects": false, "repository": { @@ -18,12 +18,12 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", - "@grafana/e2e-selectors": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/e2e-selectors": "11.0.11", "@grafana/experimental": "1.7.10", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "react-use": "17.5.0", "rxjs": "7.8.1", "tslib": "2.6.2" diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json index f0777f4af44..d11c0882035 100644 --- a/packages/grafana-plugin-configs/package.json +++ b/packages/grafana-plugin-configs/package.json @@ -2,7 +2,7 @@ "name": "@grafana/plugin-configs", "description": "Shared dependencies and files for core plugins", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "tslib": "2.6.2" }, diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index cdd87e41d99..fc1545f81e0 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "AGPL-3.0-only", "name": "@grafana/prometheus", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana Prometheus Library", "keywords": [ "typescript" @@ -38,12 +38,12 @@ "dependencies": { "@emotion/css": "11.11.2", "@floating-ui/react": "0.26.10", - "@grafana/data": "11.0.10", + "@grafana/data": "11.0.11", "@grafana/experimental": "1.7.10", "@grafana/faro-web-sdk": "1.5.0", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "@leeoniya/ufuzzy": "1.0.14", "@lezer/common": "1.2.1", "@lezer/highlight": "1.2.0", @@ -76,8 +76,8 @@ }, "devDependencies": { "@emotion/eslint-plugin": "11.11.0", - "@grafana/e2e": "11.0.10", - "@grafana/e2e-selectors": "11.0.10", + "@grafana/e2e": "11.0.11", + "@grafana/e2e-selectors": "11.0.11", "@grafana/tsconfig": "^1.3.0-rc1", "@rollup/plugin-image": "3.0.3", "@rollup/plugin-node-resolve": "15.2.3", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index d67b3beb6d5..af5eee57e5b 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/runtime", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana Runtime Library", "keywords": [ "grafana", @@ -37,11 +37,11 @@ "postpack": "mv package.json.bak package.json" }, "dependencies": { - "@grafana/data": "11.0.10", - "@grafana/e2e-selectors": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/e2e-selectors": "11.0.11", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 525c16a18b7..061c43fcb20 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/schema", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana Schema Library", "keywords": [ "typescript" diff --git a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts index e618bcdd5a4..0440f6c3f8f 100644 --- a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { limit: number; diff --git a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts index fb2e378ec61..9bb138b892a 100644 --- a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting { /** diff --git a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts index 6cbf46fca97..8e93c52a957 100644 --- a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.SingleStatBaseOptions { displayMode: common.BarGaugeDisplayMode; diff --git a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts index 3e765d6b89d..e684b313498 100644 --- a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export enum VizDisplayMode { Candles = 'candles', diff --git a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts index 40ffaecb9da..342981625b9 100644 --- a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export enum HorizontalConstraint { Center = 'center', diff --git a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts index c5ce00a4b80..63112efe4b1 100644 --- a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface MetricStat { /** diff --git a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts index eca089f3267..aef11188dab 100644 --- a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { /** diff --git a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts index d01188cadb1..2becaf5123d 100644 --- a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { selectedSeries: number; diff --git a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts index ef09b461268..175fc847f56 100644 --- a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export type UpdateConfig = { render: boolean, diff --git a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts index 1ea0ba09e8e..43f45eb8ab5 100644 --- a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested); diff --git a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts index 8b3123178b3..3d21b88f7e8 100644 --- a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.SingleStatBaseOptions { minVizHeight: number; diff --git a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts index 236fc3fbc31..6a457ad69be 100644 --- a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { basemap: ui.MapLayerOptions; diff --git a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts index 8828d418e7b..a774b3ccef3 100644 --- a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; /** * Controls the color mode of the heatmap diff --git a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts index 269d386a390..d4749aacfbb 100644 --- a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip { /** diff --git a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts index 79a76b97a39..8cac3b52fcc 100644 --- a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { dedupStrategy: common.LogsDedupStrategy; diff --git a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts index c959a63b5e5..953c83bc5ce 100644 --- a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export enum QueryEditorMode { Builder = 'builder', diff --git a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts index e5f2db98b56..60dd4d9dd45 100644 --- a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { /** diff --git a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts index 3bf3e32784c..5f09f8eab23 100644 --- a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface ArcOption { /** diff --git a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts index 4abeed9325d..019a0b40444 100644 --- a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; /** * Select the pie chart display style. diff --git a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts index f5b28df5d42..525b32135c6 100644 --- a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.SingleStatBaseOptions { colorMode: common.BigValueColorMode; diff --git a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts index 483881fdd71..8d1a20faf6a 100644 --- a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones { /** diff --git a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts index 06e306bfa83..7359c211f6a 100644 --- a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones { /** diff --git a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts index e6a08f3761b..745414cacb3 100644 --- a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as ui from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options { /** diff --git a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts index 37c964b76cc..ce4e5049cc1 100644 --- a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts @@ -8,7 +8,7 @@ // // Run 'make gen-cue' from repository root to regenerate. -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export enum TextMode { Code = 'code', diff --git a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts index 29d7436be5d..b18bde57bb0 100644 --- a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; export interface Options extends common.OptionsWithTimezones { legend: common.VizLegendOptions; diff --git a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts index 4693a39cdc5..b16ea67ab95 100644 --- a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; /** * Identical to timeseries... except it does not have timezone settings diff --git a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts index 85b8466ef92..5ed4479bdc8 100644 --- a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts +++ b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts @@ -10,7 +10,7 @@ import * as common from '@grafana/schema'; -export const pluginVersion = "11.0.10"; +export const pluginVersion = "11.0.11"; /** * Auto is "table" in the UI diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index 06ccdb0ef38..f607191fe8a 100644 --- a/packages/grafana-sql/package.json +++ b/packages/grafana-sql/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "private": true, "name": "@grafana/sql", - "version": "11.0.10", + "version": "11.0.11", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git", @@ -15,10 +15,10 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", + "@grafana/data": "11.0.11", "@grafana/experimental": "1.7.10", - "@grafana/runtime": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/ui": "11.0.11", "@react-awesome-query-builder/ui": "6.4.2", "@types/lodash": "4.17.0", "@types/react-virtualized-auto-sizer": "1.0.4", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 29a6a05fe13..41cad7037d0 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/ui", - "version": "11.0.10", + "version": "11.0.11", "description": "Grafana Components Library", "keywords": [ "grafana", @@ -50,10 +50,10 @@ "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.10", - "@grafana/data": "11.0.10", - "@grafana/e2e-selectors": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/e2e-selectors": "11.0.11", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.0.10", + "@grafana/schema": "11.0.11", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", diff --git a/pkg/services/ngalert/api/tooling/definitions/contact_points.go b/pkg/services/ngalert/api/tooling/definitions/contact_points.go index b5569aa2845..b2462ddd851 100644 --- a/pkg/services/ngalert/api/tooling/definitions/contact_points.go +++ b/pkg/services/ngalert/api/tooling/definitions/contact_points.go @@ -223,7 +223,7 @@ type ThreemaIntegration struct { type VictoropsIntegration struct { DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"` - URL string `json:"url" yaml:"url" hcl:"url"` + URL Secret `json:"url" yaml:"url" hcl:"url"` MessageType *string `json:"messageType,omitempty" yaml:"messageType,omitempty" hcl:"message_type"` Title *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"` diff --git a/pkg/services/ngalert/notifier/channels_config/available_channels.go b/pkg/services/ngalert/notifier/channels_config/available_channels.go index bf6d5811c32..59413a323b8 100644 --- a/pkg/services/ngalert/notifier/channels_config/available_channels.go +++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go @@ -378,6 +378,7 @@ func GetAvailableNotifiers() []*NotifierPlugin { Placeholder: "VictorOps url", PropertyName: "url", Required: true, + Secure: true, }, { // New in 8.0. Label: "Message Type", diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 801d08cdd08..e073557c1bc 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -2,14 +2,14 @@ "name": "@grafana-plugins/grafana-azure-monitor-datasource", "description": "Grafana data source for Azure Monitor", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", + "@grafana/data": "11.0.11", "@grafana/experimental": "1.7.10", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "@kusto/monaco-kusto": "^10.0.0", "fast-deep-equal": "^3.1.3", "i18next": "^23.0.0", @@ -23,8 +23,8 @@ "tslib": "2.6.2" }, "devDependencies": { - "@grafana/e2e-selectors": "11.0.10", - "@grafana/plugin-configs": "11.0.10", + "@grafana/e2e-selectors": "11.0.11", + "@grafana/plugin-configs": "11.0.11", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.12", diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index efcf9d217b7..1490a35ff2b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/package.json +++ b/public/app/plugins/datasource/cloud-monitoring/package.json @@ -2,15 +2,15 @@ "name": "@grafana-plugins/stackdriver", "description": "Grafana data source for Google Cloud Monitoring", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", + "@grafana/data": "11.0.11", "@grafana/experimental": "1.7.10", "@grafana/google-sdk": "0.1.2", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "debounce-promise": "3.1.2", "fast-deep-equal": "^3.1.3", "i18next": "^23.0.0", @@ -24,8 +24,8 @@ "tslib": "2.6.2" }, "devDependencies": { - "@grafana/e2e-selectors": "11.0.10", - "@grafana/plugin-configs": "11.0.10", + "@grafana/e2e-selectors": "11.0.11", + "@grafana/plugin-configs": "11.0.11", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", "@types/debounce-promise": "3.1.9", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index 0879d172923..ccdbb3c4894 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -2,13 +2,13 @@ "name": "@grafana-plugins/grafana-pyroscope-datasource", "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.", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "fast-deep-equal": "^3.1.3", "lodash": "4.17.21", "monaco-editor": "0.34.0", @@ -20,7 +20,7 @@ "tslib": "2.6.2" }, "devDependencies": { - "@grafana/plugin-configs": "11.0.10", + "@grafana/plugin-configs": "11.0.11", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index e56cd9099fe..92fab445a2c 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -2,14 +2,14 @@ "name": "@grafana-plugins/grafana-testdata-datasource", "description": "Generates test data in different forms", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", + "@grafana/data": "11.0.11", "@grafana/experimental": "1.7.10", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "d3-random": "^3.0.1", "lodash": "4.17.21", "micro-memoize": "^4.1.2", @@ -20,8 +20,8 @@ "uuid": "9.0.1" }, "devDependencies": { - "@grafana/e2e-selectors": "11.0.10", - "@grafana/plugin-configs": "11.0.10", + "@grafana/e2e-selectors": "11.0.11", + "@grafana/plugin-configs": "11.0.11", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", "@types/d3-random": "^3.0.2", diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index 5aa042640c0..6306c6c065d 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -2,7 +2,7 @@ "name": "@grafana-plugins/jaeger", "description": "Jaeger plugin for Grafana", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index 337eff6f274..4ac2c9267eb 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -2,13 +2,13 @@ "name": "@grafana-plugins/parca", "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.", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.10", - "@grafana/runtime": "11.0.10", - "@grafana/schema": "11.0.10", - "@grafana/ui": "11.0.10", + "@grafana/data": "11.0.11", + "@grafana/runtime": "11.0.11", + "@grafana/schema": "11.0.11", + "@grafana/ui": "11.0.11", "lodash": "4.17.21", "monaco-editor": "0.34.0", "react": "18.2.0", @@ -17,7 +17,7 @@ "tslib": "2.6.2" }, "devDependencies": { - "@grafana/plugin-configs": "11.0.10", + "@grafana/plugin-configs": "11.0.11", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", "@types/lodash": "4.17.0", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index f55cb7b51b8..2186862113b 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -2,7 +2,7 @@ "name": "@grafana-plugins/tempo", "description": "Grafana plugin for the Tempo data source.", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", @@ -38,7 +38,7 @@ "uuid": "9.0.1" }, "devDependencies": { - "@grafana/plugin-configs": "11.0.10", + "@grafana/plugin-configs": "11.0.11", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 6f04ae9848d..600d6682ba6 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -2,7 +2,7 @@ "name": "@grafana-plugins/zipkin", "description": "Zipkin plugin for Grafana", "private": true, - "version": "11.0.10", + "version": "11.0.11", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 10584d3aa71..df4b51e6f78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4034,13 +4034,13 @@ __metadata: resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" - "@grafana/plugin-configs": "npm:11.0.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" - "@grafana/ui": "npm:11.0.10" + "@grafana/plugin-configs": "npm:11.0.11" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" + "@grafana/ui": "npm:11.0.11" "@kusto/monaco-kusto": "npm:^10.0.0" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" @@ -4074,11 +4074,11 @@ __metadata: resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/plugin-configs": "npm:11.0.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" - "@grafana/ui": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/plugin-configs": "npm:11.0.11" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" + "@grafana/ui": "npm:11.0.11" "@testing-library/jest-dom": "npm:6.4.2" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" @@ -4113,13 +4113,13 @@ __metadata: resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" - "@grafana/plugin-configs": "npm:11.0.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" - "@grafana/ui": "npm:11.0.10" + "@grafana/plugin-configs": "npm:11.0.11" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" + "@grafana/ui": "npm:11.0.11" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" "@types/d3-random": "npm:^3.0.2" @@ -4182,11 +4182,11 @@ __metadata: resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/plugin-configs": "npm:11.0.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" - "@grafana/ui": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/plugin-configs": "npm:11.0.11" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" + "@grafana/ui": "npm:11.0.11" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" "@types/lodash": "npm:4.17.0" @@ -4209,14 +4209,14 @@ __metadata: resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" "@grafana/google-sdk": "npm:0.1.2" - "@grafana/plugin-configs": "npm:11.0.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" - "@grafana/ui": "npm:11.0.10" + "@grafana/plugin-configs": "npm:11.0.11" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" + "@grafana/ui": "npm:11.0.11" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" "@types/debounce-promise": "npm:3.1.9" @@ -4260,7 +4260,7 @@ __metadata: "@grafana/lezer-traceql": "npm:0.0.16" "@grafana/monaco-logql": "npm:^0.0.7" "@grafana/o11y-ds-frontend": "workspace:*" - "@grafana/plugin-configs": "npm:11.0.10" + "@grafana/plugin-configs": "npm:11.0.11" "@grafana/runtime": "workspace:*" "@grafana/schema": "workspace:*" "@grafana/ui": "workspace:*" @@ -4353,12 +4353,12 @@ __metadata: languageName: node linkType: hard -"@grafana/data@npm:11.0.10, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": +"@grafana/data@npm:11.0.11, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": version: 0.0.0-use.local resolution: "@grafana/data@workspace:packages/grafana-data" dependencies: "@braintree/sanitize-url": "npm:7.0.1" - "@grafana/schema": "npm:11.0.10" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@rollup/plugin-node-resolve": "npm:15.2.3" "@types/d3-interpolate": "npm:^3.0.0" @@ -4407,7 +4407,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:11.0.10, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": +"@grafana/e2e-selectors@npm:11.0.11, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": version: 0.0.0-use.local resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors" dependencies: @@ -4436,15 +4436,15 @@ __metadata: languageName: node linkType: hard -"@grafana/e2e@npm:11.0.10, @grafana/e2e@workspace:packages/grafana-e2e": +"@grafana/e2e@npm:11.0.11, @grafana/e2e@workspace:packages/grafana-e2e": version: 0.0.0-use.local resolution: "@grafana/e2e@workspace:packages/grafana-e2e" dependencies: "@babel/core": "npm:7.23.2" "@babel/preset-env": "npm:7.23.2" "@cypress/webpack-preprocessor": "npm:5.17.1" - "@grafana/e2e-selectors": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" + "@grafana/e2e-selectors": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@mochajs/json-file-reporter": "npm:^1.2.0" "@rollup/plugin-node-resolve": "npm:15.2.3" @@ -4619,9 +4619,9 @@ __metadata: "@babel/preset-env": "npm:7.24.3" "@babel/preset-react": "npm:7.24.1" "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.10" + "@grafana/ui": "npm:11.0.11" "@leeoniya/ufuzzy": "npm:1.0.14" "@rollup/plugin-node-resolve": "npm:15.2.3" "@testing-library/jest-dom": "npm:^6.1.2" @@ -4700,13 +4700,13 @@ __metadata: resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.10" + "@grafana/ui": "npm:11.0.11" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" @@ -4728,7 +4728,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/plugin-configs@npm:11.0.10, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": +"@grafana/plugin-configs@npm:11.0.11, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": version: 0.0.0-use.local resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs" dependencies: @@ -4764,15 +4764,15 @@ __metadata: "@emotion/css": "npm:11.11.2" "@emotion/eslint-plugin": "npm:11.11.0" "@floating-ui/react": "npm:0.26.10" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" "@grafana/faro-web-sdk": "npm:1.5.0" - "@grafana/runtime": "npm:11.0.10" - "@grafana/schema": "npm:11.0.10" + "@grafana/runtime": "npm:11.0.11" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.10" + "@grafana/ui": "npm:11.0.11" "@leeoniya/ufuzzy": "npm:1.0.14" "@lezer/common": "npm:1.2.1" "@lezer/highlight": "npm:1.2.0" @@ -4871,16 +4871,16 @@ __metadata: languageName: unknown linkType: soft -"@grafana/runtime@npm:11.0.10, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": +"@grafana/runtime@npm:11.0.11, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": version: 0.0.0-use.local resolution: "@grafana/runtime@workspace:packages/grafana-runtime" dependencies: - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.0.10" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.10" + "@grafana/ui": "npm:11.0.11" "@rollup/plugin-node-resolve": "npm:15.2.3" "@rollup/plugin-terser": "npm:0.4.4" "@testing-library/dom": "npm:9.3.4" @@ -4965,7 +4965,7 @@ __metadata: languageName: node linkType: hard -"@grafana/schema@npm:11.0.10, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": +"@grafana/schema@npm:11.0.11, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": version: 0.0.0-use.local resolution: "@grafana/schema@workspace:packages/grafana-schema" dependencies: @@ -4988,11 +4988,11 @@ __metadata: resolution: "@grafana/sql@workspace:packages/grafana-sql" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" "@grafana/experimental": "npm:1.7.10" - "@grafana/runtime": "npm:11.0.10" + "@grafana/runtime": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.10" + "@grafana/ui": "npm:11.0.11" "@react-awesome-query-builder/ui": "npm:6.4.2" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:14.2.2" @@ -5037,7 +5037,7 @@ __metadata: languageName: node linkType: hard -"@grafana/ui@npm:11.0.10, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": +"@grafana/ui@npm:11.0.11, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": version: 0.0.0-use.local resolution: "@grafana/ui@workspace:packages/grafana-ui" dependencies: @@ -5045,10 +5045,10 @@ __metadata: "@emotion/css": "npm:11.11.2" "@emotion/react": "npm:11.11.4" "@floating-ui/react": "npm:0.26.10" - "@grafana/data": "npm:11.0.10" - "@grafana/e2e-selectors": "npm:11.0.10" + "@grafana/data": "npm:11.0.11" + "@grafana/e2e-selectors": "npm:11.0.11" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.0.10" + "@grafana/schema": "npm:11.0.11" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@leeoniya/ufuzzy": "npm:1.0.14" "@monaco-editor/react": "npm:4.6.0"