From f2449194d08738d9b6e9af0bccbbc79a2e26883e Mon Sep 17 00:00:00 2001 From: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:37:28 -0700 Subject: [PATCH] Release: 11.1.11 (#99689) * apply security patch: v11.1.x/309-202501232104.patch commit c4ee6f4b2c1d9388013a952e87d12181d68665e7 Author: Matt Jacobson Date: Thu Jan 23 15:55:00 2025 -0500 CVE-2024-11741 - victorops url * baldm0mma/ update changelog and bump * baldm0mma/ update deps --------- Co-authored-by: github-actions[bot] --- CHANGELOG.md | 14 ++ lerna.json | 2 +- package.json | 2 +- packages/grafana-data/package.json | 4 +- packages/grafana-e2e-selectors/package.json | 2 +- packages/grafana-eslint-rules/package.json | 2 +- packages/grafana-flamegraph/package.json | 6 +- packages/grafana-icons/package.json | 2 +- .../grafana-o11y-ds-frontend/package.json | 12 +- packages/grafana-plugin-configs/package.json | 2 +- packages/grafana-prometheus/package.json | 12 +- 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 | 10 +- 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 +- .../package.json | 14 +- .../grafana-pyroscope-datasource/package.json | 12 +- .../grafana-testdata-datasource/package.json | 14 +- .../plugins/datasource/jaeger/package.json | 2 +- .../app/plugins/datasource/mysql/package.json | 14 +- .../app/plugins/datasource/parca/package.json | 12 +- .../app/plugins/datasource/tempo/package.json | 4 +- .../plugins/datasource/zipkin/package.json | 2 +- yarn.lock | 144 +++++++++--------- 55 files changed, 204 insertions(+), 189 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85814cfbf90..5fb095fd938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + + +# 11.1.11 (2025-01-28) + +### Features and enhancements + +- **Security:** Update to Go 1.22.11 - Backport to v11.1.x [#99126](https://github.com/grafana/grafana/pull/99126), [@Proximyst](https://github.com/Proximyst) +- **Security:** Update to Go 1.22.11 - Backport to v11.1.x (Enterprise) + +### Bug fixes + +- **Azure/GCM:** Improve error display [#97595](https://github.com/grafana/grafana/pull/97595), [@aangelisc](https://github.com/aangelisc) + + # 11.1.10 (2024-12-04) diff --git a/lerna.json b/lerna.json index 5e40a0e4da7..421639b4133 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "npmClient": "yarn", - "version": "11.1.11" + "version": "11.1.12" } diff --git a/package.json b/package.json index cab0d4351ee..d7943617a20 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "private": true, "name": "grafana", - "version": "11.1.11", + "version": "11.1.12", "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 b76ec308518..ff7bea72137 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.1.11", + "version": "11.1.12", "description": "Grafana Data Library", "keywords": [ "typescript" @@ -36,7 +36,7 @@ }, "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.11", + "@grafana/schema": "11.1.12", "@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 6209b8cf878..19edb108e95 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.1.11", + "version": "11.1.12", "description": "Grafana End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json index cf2eff4bc64..e618d1c12ab 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.1.11", + "version": "11.1.12", "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 607d2f963f5..9fe0e37ab19 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.1.11", + "version": "11.1.12", "description": "Grafana flamegraph visualization component", "keywords": [ "grafana", @@ -44,8 +44,8 @@ ], "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/ui": "11.1.12", "@leeoniya/ufuzzy": "1.0.14", "d3": "^7.8.5", "lodash": "4.17.21", diff --git a/packages/grafana-icons/package.json b/packages/grafana-icons/package.json index c09d2b4abf9..7365d15e712 100644 --- a/packages/grafana-icons/package.json +++ b/packages/grafana-icons/package.json @@ -1,6 +1,6 @@ { "name": "@grafana/saga-icons", - "version": "11.1.11", + "version": "11.1.12", "private": true, "description": "Icons for Grafana", "author": "Grafana Labs", diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index f2b715ed885..e511a00d29b 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.1.11", + "version": "11.1.12", "description": "Library to manage traces in Grafana.", "sideEffects": false, "repository": { @@ -18,12 +18,12 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", - "@grafana/e2e-selectors": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/e2e-selectors": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "react-select": "5.8.0", "react-use": "17.5.0", "rxjs": "7.8.1", diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json index 9d18ef3c398..39f75c22a28 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.1.11", + "version": "11.1.12", "dependencies": { "tslib": "2.6.3" }, diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 0a0bc92d8eb..4163a0054a2 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.1.11", + "version": "11.1.12", "description": "Grafana Prometheus Library", "keywords": [ "typescript" @@ -38,12 +38,12 @@ "dependencies": { "@emotion/css": "11.11.2", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", "@grafana/faro-web-sdk": "1.7.3", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "@leeoniya/ufuzzy": "1.0.14", "@lezer/common": "1.2.1", "@lezer/highlight": "1.2.0", @@ -76,7 +76,7 @@ }, "devDependencies": { "@emotion/eslint-plugin": "11.11.0", - "@grafana/e2e-selectors": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", "@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 61d05c04a1a..0abd4b1935e 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.1.11", + "version": "11.1.12", "description": "Grafana Runtime Library", "keywords": [ "grafana", @@ -37,11 +37,11 @@ "postpack": "mv package.json.bak package.json" }, "dependencies": { - "@grafana/data": "11.1.11", - "@grafana/e2e-selectors": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/e2e-selectors": "11.1.12", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "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 f3d93dfb641..56b3b122616 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.1.11", + "version": "11.1.12", "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 2751208f1ee..382a04db9b6 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.1.11"; +export const pluginVersion = "11.1.12"; 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 afcee4cfe06..3350468c40d 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.1.11"; +export const pluginVersion = "11.1.12"; 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 981b8afc691..173727dd36a 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.1.11"; +export const pluginVersion = "11.1.12"; 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 30b27c3b12a..12b470cc07c 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.1.11"; +export const pluginVersion = "11.1.12"; 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 39e267c2292..a1288a8dcf7 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.1.11"; +export const pluginVersion = "11.1.12"; 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 b7b2a9bcbc2..165df54baab 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.1.11"; +export const pluginVersion = "11.1.12"; 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 c75a83d3340..684e6dba21e 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.1.11"; +export const pluginVersion = "11.1.12"; 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 d281d3bab6b..71c7b9c1992 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.1.11"; +export const pluginVersion = "11.1.12"; 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 cf10819af8a..eae260cc938 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.1.11"; +export const pluginVersion = "11.1.12"; 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 7b865557dd0..935571d17c3 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.1.11"; +export const pluginVersion = "11.1.12"; 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 f74d6462295..ed3a3ad92a1 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.1.11"; +export const pluginVersion = "11.1.12"; 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 38793285720..5ef21bd4910 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.1.11"; +export const pluginVersion = "11.1.12"; 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 c45cb3761ff..566c4ac5d5b 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.1.11"; +export const pluginVersion = "11.1.12"; /** * 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 f000a85e954..5ad50a64163 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.1.11"; +export const pluginVersion = "11.1.12"; 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 3d566a4cce6..5324a36e3f5 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.1.11"; +export const pluginVersion = "11.1.12"; 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 4991f7d13f4..7b786b75c56 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.1.11"; +export const pluginVersion = "11.1.12"; 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 a48c7c4c127..abf6416050c 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.1.11"; +export const pluginVersion = "11.1.12"; 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 4e14626c65f..f5c68dc0fa8 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.1.11"; +export const pluginVersion = "11.1.12"; 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 debb36c8d5c..817fb78e8e5 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.1.11"; +export const pluginVersion = "11.1.12"; /** * 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 e6f9382af92..80765ebb4c3 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.1.11"; +export const pluginVersion = "11.1.12"; 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 0b22777573e..2cdf9933b50 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.1.11"; +export const pluginVersion = "11.1.12"; 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 240a3b7e30d..ece08da7edc 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.1.11"; +export const pluginVersion = "11.1.12"; 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 dce915f2e3e..e0b83ef7602 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.1.11"; +export const pluginVersion = "11.1.12"; 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 f3bdfc41119..da2f1f73551 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.1.11"; +export const pluginVersion = "11.1.12"; 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 c192c1f9f54..9e53f37ad45 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.1.11"; +export const pluginVersion = "11.1.12"; 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 89039f92210..f273185a220 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.1.11"; +export const pluginVersion = "11.1.12"; /** * 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 a47d236b66a..01485addcdf 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.1.11"; +export const pluginVersion = "11.1.12"; /** * Auto is "table" in the UI diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index b879de70b09..63f8b46706e 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.1.11", + "version": "11.1.12", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git", @@ -15,11 +15,11 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", - "@grafana/e2e-selectors": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/e2e-selectors": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/ui": "11.1.12", "@react-awesome-query-builder/ui": "6.5.2", "immutable": "4.3.6", "lodash": "4.17.21", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index c45e6372300..9feaa944188 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.1.11", + "version": "11.1.12", "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.16", - "@grafana/data": "11.1.11", - "@grafana/e2e-selectors": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/e2e-selectors": "11.1.12", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.11", + "@grafana/schema": "11.1.12", "@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 238e65bce61..e1ec79288bd 100644 --- a/pkg/services/ngalert/api/tooling/definitions/contact_points.go +++ b/pkg/services/ngalert/api/tooling/definitions/contact_points.go @@ -245,7 +245,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 5fc42b809aa..08ea44dde77 100644 --- a/pkg/services/ngalert/notifier/channels_config/available_channels.go +++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go @@ -387,6 +387,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 cb2d87d2bcf..e649f7aae5d 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "@kusto/monaco-kusto": "^10.0.0", "fast-deep-equal": "^3.1.3", "i18next": "^23.0.0", @@ -25,8 +25,8 @@ "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.1.11", - "@grafana/plugin-configs": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 7faea37e1c5..6132080c272 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", "@grafana/google-sdk": "0.1.2", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "debounce-promise": "3.1.2", "fast-deep-equal": "^3.1.3", "i18next": "^23.0.0", @@ -26,8 +26,8 @@ "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.1.11", - "@grafana/plugin-configs": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json index eeb09ced031..671bf224acb 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json @@ -2,22 +2,22 @@ "name": "@grafana-plugins/grafana-postgresql-datasource", "description": "PostgreSQL data source plugin", "private": true, - "version": "11.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/sql": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/sql": "11.1.12", + "@grafana/ui": "11.1.12", "lodash": "4.17.21", "react": "18.2.0", "rxjs": "7.8.1", "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.1.11", - "@grafana/plugin-configs": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", + "@grafana/plugin-configs": "11.1.12", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.12", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index a958fbaa04f..f55012cdd06 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "fast-deep-equal": "^3.1.3", "lodash": "4.17.21", "monaco-editor": "0.34.1", @@ -20,7 +20,7 @@ "tslib": "2.6.3" }, "devDependencies": { - "@grafana/plugin-configs": "11.1.11", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "15.0.2", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index 200a52f2fd3..e881dad97aa 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "d3-random": "^3.0.1", "lodash": "4.17.21", "micro-memoize": "^4.1.2", @@ -22,8 +22,8 @@ "uuid": "9.0.1" }, "devDependencies": { - "@grafana/e2e-selectors": "11.1.11", - "@grafana/plugin-configs": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index 155d9b02c5d..2c3236a6913 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json index fbe7c879a74..b1aaa5b0df3 100644 --- a/public/app/plugins/datasource/mysql/package.json +++ b/public/app/plugins/datasource/mysql/package.json @@ -2,22 +2,22 @@ "name": "@grafana-plugins/mysql", "description": "MySQL data source plugin", "private": true, - "version": "11.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", + "@grafana/data": "11.1.12", "@grafana/experimental": "1.7.11", - "@grafana/runtime": "11.1.11", - "@grafana/sql": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/runtime": "11.1.12", + "@grafana/sql": "11.1.12", + "@grafana/ui": "11.1.12", "lodash": "4.17.21", "react": "18.2.0", "rxjs": "7.8.1", "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.1.11", - "@grafana/plugin-configs": "11.1.11", + "@grafana/e2e-selectors": "11.1.12", + "@grafana/plugin-configs": "11.1.12", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.12", diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index f91cecdcc97..e2d205bee4a 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.1.11", - "@grafana/runtime": "11.1.11", - "@grafana/schema": "11.1.11", - "@grafana/ui": "11.1.11", + "@grafana/data": "11.1.12", + "@grafana/runtime": "11.1.12", + "@grafana/schema": "11.1.12", + "@grafana/ui": "11.1.12", "lodash": "4.17.21", "monaco-editor": "0.34.1", "react": "18.2.0", @@ -18,7 +18,7 @@ "tslib": "2.6.3" }, "devDependencies": { - "@grafana/plugin-configs": "11.1.11", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/react": "15.0.2", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 7352646163c..1584686a3ff 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", @@ -39,7 +39,7 @@ "uuid": "9.0.1" }, "devDependencies": { - "@grafana/plugin-configs": "11.1.11", + "@grafana/plugin-configs": "11.1.12", "@testing-library/dom": "10.0.0", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "15.0.2", diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index c8563409284..8f8a8e8c85c 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.1.11", + "version": "11.1.12", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", diff --git a/yarn.lock b/yarn.lock index e174c473a06..6c82fafca31 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2571,13 +2571,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.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@kusto/monaco-kusto": "npm:^10.0.0" "@testing-library/dom": "npm:10.0.0" "@testing-library/react": "npm:15.0.2" @@ -2615,13 +2615,13 @@ __metadata: resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/sql": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/sql": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/react": "npm:15.0.2" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.12" @@ -2646,11 +2646,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.1.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/dom": "npm:10.0.0" "@testing-library/jest-dom": "npm:6.4.2" "@testing-library/react": "npm:15.0.2" @@ -2687,13 +2687,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.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/dom": "npm:10.0.0" "@testing-library/react": "npm:15.0.2" "@testing-library/user-event": "npm:14.5.2" @@ -2770,13 +2770,13 @@ __metadata: resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/sql": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/sql": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/react": "npm:15.0.2" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.12" @@ -2801,11 +2801,11 @@ __metadata: resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/dom": "npm:10.0.0" "@testing-library/react": "npm:15.0.2" "@testing-library/user-event": "npm:14.5.2" @@ -2833,14 +2833,14 @@ __metadata: resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" "@grafana/google-sdk": "npm:0.1.2" - "@grafana/plugin-configs": "npm:11.1.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" - "@grafana/ui": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" + "@grafana/ui": "npm:11.1.12" "@testing-library/dom": "npm:10.0.0" "@testing-library/react": "npm:15.0.2" "@testing-library/user-event": "npm:14.5.2" @@ -2888,7 +2888,7 @@ __metadata: "@grafana/lezer-traceql": "npm:0.0.17" "@grafana/monaco-logql": "npm:^0.0.7" "@grafana/o11y-ds-frontend": "workspace:*" - "@grafana/plugin-configs": "npm:11.1.11" + "@grafana/plugin-configs": "npm:11.1.12" "@grafana/runtime": "workspace:*" "@grafana/schema": "workspace:*" "@grafana/ui": "workspace:*" @@ -2998,12 +2998,12 @@ __metadata: languageName: node linkType: hard -"@grafana/data@npm:11.1.11, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": +"@grafana/data@npm:11.1.12, @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.1.11" + "@grafana/schema": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@rollup/plugin-node-resolve": "npm:15.2.3" "@types/d3-interpolate": "npm:^3.0.0" @@ -3051,7 +3051,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:11.1.11, @grafana/e2e-selectors@npm:^11.0.0, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": +"@grafana/e2e-selectors@npm:11.1.12, @grafana/e2e-selectors@npm:^11.0.0, @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: @@ -3176,9 +3176,9 @@ __metadata: "@babel/preset-env": "npm:7.24.7" "@babel/preset-react": "npm:7.24.7" "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.1.11" + "@grafana/ui": "npm:11.1.12" "@leeoniya/ufuzzy": "npm:1.0.14" "@rollup/plugin-node-resolve": "npm:15.2.3" "@testing-library/dom": "npm:10.0.0" @@ -3260,13 +3260,13 @@ __metadata: resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.1.11" + "@grafana/ui": "npm:11.1.12" "@testing-library/dom": "npm:10.0.0" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:15.0.2" @@ -3291,7 +3291,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/plugin-configs@npm:11.1.11, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": +"@grafana/plugin-configs@npm:11.1.12, @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: @@ -3331,14 +3331,14 @@ __metadata: "@emotion/css": "npm:11.11.2" "@emotion/eslint-plugin": "npm:11.11.0" "@floating-ui/react": "npm:0.26.16" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" "@grafana/faro-web-sdk": "npm:1.7.3" - "@grafana/runtime": "npm:11.1.11" - "@grafana/schema": "npm:11.1.11" + "@grafana/runtime": "npm:11.1.12" + "@grafana/schema": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.1.11" + "@grafana/ui": "npm:11.1.12" "@leeoniya/ufuzzy": "npm:1.0.14" "@lezer/common": "npm:1.2.1" "@lezer/highlight": "npm:1.2.0" @@ -3436,16 +3436,16 @@ __metadata: languageName: unknown linkType: soft -"@grafana/runtime@npm:11.1.11, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": +"@grafana/runtime@npm:11.1.12, @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.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.1.11" + "@grafana/schema": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.1.11" + "@grafana/ui": "npm:11.1.12" "@rollup/plugin-node-resolve": "npm:15.2.3" "@rollup/plugin-terser": "npm:0.4.4" "@testing-library/dom": "npm:10.0.0" @@ -3534,7 +3534,7 @@ __metadata: languageName: node linkType: hard -"@grafana/schema@npm:11.1.11, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": +"@grafana/schema@npm:11.1.12, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": version: 0.0.0-use.local resolution: "@grafana/schema@workspace:packages/grafana-schema" dependencies: @@ -3552,17 +3552,17 @@ __metadata: languageName: unknown linkType: soft -"@grafana/sql@npm:11.1.11, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql": +"@grafana/sql@npm:11.1.12, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql": version: 0.0.0-use.local resolution: "@grafana/sql@workspace:packages/grafana-sql" dependencies: "@emotion/css": "npm:11.11.2" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/experimental": "npm:1.7.11" - "@grafana/runtime": "npm:11.1.11" + "@grafana/runtime": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.1.11" + "@grafana/ui": "npm:11.1.12" "@react-awesome-query-builder/ui": "npm:6.5.2" "@testing-library/dom": "npm:10.0.0" "@testing-library/jest-dom": "npm:^6.1.2" @@ -3605,7 +3605,7 @@ __metadata: languageName: node linkType: hard -"@grafana/ui@npm:11.1.11, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": +"@grafana/ui@npm:11.1.12, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": version: 0.0.0-use.local resolution: "@grafana/ui@workspace:packages/grafana-ui" dependencies: @@ -3614,10 +3614,10 @@ __metadata: "@emotion/react": "npm:11.11.4" "@faker-js/faker": "npm:^8.4.1" "@floating-ui/react": "npm:0.26.16" - "@grafana/data": "npm:11.1.11" - "@grafana/e2e-selectors": "npm:11.1.11" + "@grafana/data": "npm:11.1.12" + "@grafana/e2e-selectors": "npm:11.1.12" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.1.11" + "@grafana/schema": "npm:11.1.12" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@leeoniya/ufuzzy": "npm:1.0.14" "@monaco-editor/react": "npm:4.6.0"