From 40e3601982b861b9a78c1af6feaa0e6d5a016b08 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:08:07 -0500 Subject: [PATCH 1/5] Release: Bump version to 11.2.0-pre (#89184) * "Release: Updated versions in package to 11.2.0-pre" * fix newline --------- Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Co-authored-by: Kevin Minehart --- 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 +- .../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 | 182 +++++++++++------- 52 files changed, 226 insertions(+), 188 deletions(-) diff --git a/lerna.json b/lerna.json index 44473253da9..e0ddde2398a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "npmClient": "yarn", - "version": "11.0.0" + "version": "11.2.0-pre" } diff --git a/package.json b/package.json index bbcda8d2c52..bb49dde03d4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "private": true, "name": "grafana", - "version": "11.1.0-pre", + "version": "11.2.0-pre", "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 bb0c9285018..c791a8eb51d 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.0", + "version": "11.2.0-pre", "description": "Grafana Data Library", "keywords": [ "typescript" @@ -36,7 +36,7 @@ }, "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.0.0", + "@grafana/schema": "11.2.0-pre", "@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 4e9bbf3b9ee..dc99af6214b 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.0", + "version": "11.2.0-pre", "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 058652b83f8..cfa7668cbe6 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.0", + "version": "11.2.0-pre", "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 589bf260eb3..d3118320e08 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.0", + "version": "11.2.0-pre", "description": "Grafana flamegraph visualization component", "keywords": [ "grafana", @@ -44,8 +44,8 @@ ], "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "@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 3a3a5c6bf22..f0c0c7d8a27 100644 --- a/packages/grafana-icons/package.json +++ b/packages/grafana-icons/package.json @@ -1,6 +1,6 @@ { "name": "@grafana/saga-icons", - "version": "11.0.0", + "version": "11.2.0-pre", "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 2e87d3a65d4..8a3cbb8434b 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.0", + "version": "11.2.0-pre", "description": "Library to manage traces in Grafana.", "sideEffects": false, "repository": { @@ -18,12 +18,12 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", - "@grafana/e2e-selectors": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/e2e-selectors": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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 69423f529cc..b96f22de269 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.0", + "version": "11.2.0-pre", "dependencies": { "tslib": "2.6.3" }, diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 12263fb3980..2f762843707 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.0", + "version": "11.2.0-pre", "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.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", "@grafana/faro-web-sdk": "1.7.3", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "@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.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", "@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 8c21f429867..24a813d7cb8 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.0", + "version": "11.2.0-pre", "description": "Grafana Runtime Library", "keywords": [ "grafana", @@ -37,11 +37,11 @@ "postpack": "mv package.json.bak package.json" }, "dependencies": { - "@grafana/data": "11.0.0", - "@grafana/e2e-selectors": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/e2e-selectors": "11.2.0-pre", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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 e0d5ce53e74..5b99bf3496d 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.0", + "version": "11.2.0-pre", "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 110d99431a5..5ce304ac6ba 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 383d215d7f7..2a47f916ce3 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 754da14a317..04ab4bc08ca 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 a9561b1fc37..59e21e28834 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 8fb27b3851c..955ada22eb7 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 b86bf35eb6c..dc54af845e0 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 5902634f965..9686c53d545 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 e29b88621c2..a17ddfbbd32 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 f91f2d67021..d5ba8eb8008 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 541240e4a47..0fdf5d23f46 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 abd7d5eccee..b5cfa9d3c23 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 a1545be6d7b..fa6bf48f9f8 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 6021fbab6a5..0da60652bd3 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; /** * 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 a682bd15567..10ad5681b8e 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 250f6d83143..92e3cb32e29 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 72bd206068f..518ffe39426 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 17dd883f88b..ef2f1c75e6b 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 8c20f2783a9..50ce8f07fc0 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 6663b2da32a..c61d5b90d3e 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; /** * 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 597ad6cae8c..6ec283b76c1 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 c697d156a48..5ca2b9b988e 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 5eac9054dd1..93b685c4df0 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 6536f980534..5b521629e12 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 ee5e89b575f..a8e7dba879a 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 50f30630a75..810c2ff93ea 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; 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 b8c80e9aac4..3cf487be608 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; /** * 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 ebb3667aff2..0bd7ca39a90 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.0-pre"; +export const pluginVersion = "11.2.0-pre"; /** * Auto is "table" in the UI diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index f0971de38a4..1b3edd1dfdf 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.0", + "version": "11.2.0-pre", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git", @@ -15,11 +15,11 @@ }, "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", - "@grafana/e2e-selectors": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/e2e-selectors": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "@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 78a915e534b..8a05ff5148e 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.0", + "version": "11.2.0-pre", "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.0.0", - "@grafana/e2e-selectors": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/e2e-selectors": "11.2.0-pre", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.0.0", + "@grafana/schema": "11.2.0-pre", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index fb37fa00e45..b74602f0baf 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "@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.0.0", - "@grafana/plugin-configs": "11.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", + "@grafana/plugin-configs": "11.2.0-pre", "@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 f1a271bf79d..3c9b7567e18 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", "@grafana/google-sdk": "0.1.2", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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.0.0", - "@grafana/plugin-configs": "11.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", + "@grafana/plugin-configs": "11.2.0-pre", "@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 2086155cd44..c3a9bedc8e5 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.0.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/sql": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/sql": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "lodash": "4.17.21", "react": "18.2.0", "rxjs": "7.8.1", "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.0.0", - "@grafana/plugin-configs": "11.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", + "@grafana/plugin-configs": "11.2.0-pre", "@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 1f6787269b7..4d550c34ad8 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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.0.0", + "@grafana/plugin-configs": "11.2.0-pre", "@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 32cd809309f..eb9c8cd29c5 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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.0.0", - "@grafana/plugin-configs": "11.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", + "@grafana/plugin-configs": "11.2.0-pre", "@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 bb1df958d75..650ef144831 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.0", + "version": "11.2.0-pre", "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 0b785605838..37e1e314ee5 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.0.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", + "@grafana/data": "11.2.0-pre", "@grafana/experimental": "1.7.12", - "@grafana/runtime": "11.0.0", - "@grafana/sql": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/runtime": "11.2.0-pre", + "@grafana/sql": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "lodash": "4.17.21", "react": "18.2.0", "rxjs": "7.8.1", "tslib": "2.6.3" }, "devDependencies": { - "@grafana/e2e-selectors": "11.0.0", - "@grafana/plugin-configs": "11.0.0", + "@grafana/e2e-selectors": "11.2.0-pre", + "@grafana/plugin-configs": "11.2.0-pre", "@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 e4208a123f1..b66a0470c4d 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", - "@grafana/data": "11.0.0", - "@grafana/runtime": "11.0.0", - "@grafana/schema": "11.0.0", - "@grafana/ui": "11.0.0", + "@grafana/data": "11.2.0-pre", + "@grafana/runtime": "11.2.0-pre", + "@grafana/schema": "11.2.0-pre", + "@grafana/ui": "11.2.0-pre", "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.0.0", + "@grafana/plugin-configs": "11.2.0-pre", "@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 ba687ff8104..314fbb0e477 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", @@ -39,7 +39,7 @@ "uuid": "9.0.1" }, "devDependencies": { - "@grafana/plugin-configs": "11.0.0", + "@grafana/plugin-configs": "11.2.0-pre", "@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 34554cdd784..8450b2b5268 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.0", + "version": "11.2.0-pre", "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 6be3c8126af..365f011f4a0 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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/sql": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/sql": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/sql": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/sql": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" "@grafana/google-sdk": "npm:0.1.2" - "@grafana/plugin-configs": "npm:11.0.0" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" - "@grafana/ui": "npm:11.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" + "@grafana/ui": "npm:11.2.0-pre" "@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.0.0" + "@grafana/plugin-configs": "npm:11.2.0-pre" "@grafana/runtime": "workspace:*" "@grafana/schema": "workspace:*" "@grafana/ui": "workspace:*" @@ -2998,12 +2998,12 @@ __metadata: languageName: node linkType: hard -"@grafana/data@npm:11.0.0, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data": +"@grafana/data@npm:11.2.0-pre, @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.0" + "@grafana/schema": "npm:11.2.0-pre" "@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.0.0, @grafana/e2e-selectors@npm:^11.0.0, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors": +"@grafana/e2e-selectors@npm:11.2.0-pre, @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: @@ -3069,6 +3069,17 @@ __metadata: languageName: unknown linkType: soft +"@grafana/e2e-selectors@npm:^11.0.0": + version: 11.0.0 + resolution: "@grafana/e2e-selectors@npm:11.0.0" + dependencies: + "@grafana/tsconfig": "npm:^1.3.0-rc1" + tslib: "npm:2.6.2" + typescript: "npm:5.3.3" + checksum: 10/0e327c5afc342bca9be46b0b3fb7b55d69e8b7b6e9912be3255ce52abcb8832265246a0e6b2f877112a752b6e44f6f7edf5c4d2a32b5edc84800d19c880dfc6c + languageName: node + linkType: hard + "@grafana/eslint-config@npm:7.0.0": version: 7.0.0 resolution: "@grafana/eslint-config@npm:7.0.0" @@ -3176,9 +3187,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.0.0" + "@grafana/data": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.0" + "@grafana/ui": "npm:11.2.0-pre" "@leeoniya/ufuzzy": "npm:1.0.14" "@rollup/plugin-node-resolve": "npm:15.2.3" "@testing-library/dom": "npm:10.0.0" @@ -3260,13 +3271,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.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.0" + "@grafana/ui": "npm:11.2.0-pre" "@testing-library/dom": "npm:10.0.0" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:15.0.2" @@ -3291,7 +3302,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/plugin-configs@npm:11.0.0, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": +"@grafana/plugin-configs@npm:11.2.0-pre, @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 +3342,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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" "@grafana/faro-web-sdk": "npm:1.7.3" - "@grafana/runtime": "npm:11.0.0" - "@grafana/schema": "npm:11.0.0" + "@grafana/runtime": "npm:11.2.0-pre" + "@grafana/schema": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.0" + "@grafana/ui": "npm:11.2.0-pre" "@leeoniya/ufuzzy": "npm:1.0.14" "@lezer/common": "npm:1.2.1" "@lezer/highlight": "npm:1.2.0" @@ -3436,16 +3447,16 @@ __metadata: languageName: unknown linkType: soft -"@grafana/runtime@npm:11.0.0, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": +"@grafana/runtime@npm:11.2.0-pre, @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.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.0.0" + "@grafana/schema": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.0" + "@grafana/ui": "npm:11.2.0-pre" "@rollup/plugin-node-resolve": "npm:15.2.3" "@rollup/plugin-terser": "npm:0.4.4" "@testing-library/dom": "npm:10.0.0" @@ -3534,7 +3545,7 @@ __metadata: languageName: node linkType: hard -"@grafana/schema@npm:11.0.0, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema": +"@grafana/schema@npm:11.2.0-pre, @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 +3563,17 @@ __metadata: languageName: unknown linkType: soft -"@grafana/sql@npm:11.0.0, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql": +"@grafana/sql@npm:11.2.0-pre, @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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/experimental": "npm:1.7.12" - "@grafana/runtime": "npm:11.0.0" + "@grafana/runtime": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" - "@grafana/ui": "npm:11.0.0" + "@grafana/ui": "npm:11.2.0-pre" "@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 +3616,7 @@ __metadata: languageName: node linkType: hard -"@grafana/ui@npm:11.0.0, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui": +"@grafana/ui@npm:11.2.0-pre, @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 +3625,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.0.0" - "@grafana/e2e-selectors": "npm:11.0.0" + "@grafana/data": "npm:11.2.0-pre" + "@grafana/e2e-selectors": "npm:11.2.0-pre" "@grafana/faro-web-sdk": "npm:^1.3.6" - "@grafana/schema": "npm:11.0.0" + "@grafana/schema": "npm:11.2.0-pre" "@grafana/tsconfig": "npm:^1.3.0-rc1" "@leeoniya/ufuzzy": "npm:1.0.14" "@monaco-editor/react": "npm:4.6.0" @@ -29179,6 +29190,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:2.6.2": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca + languageName: node + linkType: hard + "tslib@npm:2.6.3, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.6.2": version: 2.6.3 resolution: "tslib@npm:2.6.3" @@ -29417,6 +29435,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:5.3.3": + version: 5.3.3 + resolution: "typescript@npm:5.3.3" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18 + languageName: node + linkType: hard + "typescript@npm:5.4.5, typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.2.2": version: 5.4.5 resolution: "typescript@npm:5.4.5" @@ -29437,6 +29465,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A5.3.3#optional!builtin": + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A5.4.5#optional!builtin, typescript@patch:typescript@npm%3A>=2.7#optional!builtin, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": version: 5.4.5 resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" From e807f4201bdd7caf3b1008d864cbbac94df1dec2 Mon Sep 17 00:00:00 2001 From: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:57:51 -0400 Subject: [PATCH 2/5] Docs: Fixes for 11.1 visualizations docs (#89193) * Updated table wrapping and auto wording * Fixed formatting to match other lists * Fixed admonition styling and moved content out of note into body * Added note re feature toggle * Fixed typo * Added comma Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com> --------- Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com> --- .../visualizations/stat/index.md | 22 +++++++++---------- .../visualizations/table/index.md | 8 +++---- .../visualizations/xy-chart/index.md | 4 ++++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/docs/sources/panels-visualizations/visualizations/stat/index.md b/docs/sources/panels-visualizations/visualizations/stat/index.md index c44aaec868f..ad6da7f2889 100644 --- a/docs/sources/panels-visualizations/visualizations/stat/index.md +++ b/docs/sources/panels-visualizations/visualizations/stat/index.md @@ -27,9 +27,9 @@ refs: # Stat -{{% admonition type="note" %}} +{{< admonition type="note" >}} This visualization replaces the Singlestat visualization, which was deprecated in Grafana 7.0 and removed in Grafana 8.0. -{{% /admonition %}} +{{< /admonition >}} A stat visualization displays your data in single values of interest—such as the latest or current value of a series—with an optional graph sparkline. A graph sparkline, which is only available in stat visualizations, is a small time-series graph shown in the background of each value in the visualization. @@ -157,9 +157,9 @@ Set whether wide layout is enabled or not. Wide layout is enabled by default. - **On -** Wide layout is enabled. - **Off -** Wide layout is disabled. -{{% admonition type="note" %}} +{{< admonition type="note" >}} This option is only applicable when **Text mode** is set to **Value and name**. When wide layout is enabled, the value and name are displayed side-by-side with the value on the right, if the panel is wide enough. When wide layout is disabled, the value is always rendered underneath the name. -{{% /admonition %}} +{{< /admonition >}} ### Color mode @@ -188,19 +188,17 @@ Choose an alignment mode. Set whether percent change is displayed or not. Disabled by default. -{{% admonition type="note" %}} +{{< admonition type="note" >}} This option is not applicable when the **Show** setting, under **Value options**, is set to **All values**. -{{% /admonition %}} +{{< /admonition >}} ### Percent change color mode -- **Standard** -- Green if the percent change is positive, red if the percent change is negative. -- **Inverted** -- Red if the percent change is positive, green if the percent change is negative. -- **Same as Value** -- Use the same color as the value. +This option is only displayed when **Show percent change** is enabled. Choose from: -{{% admonition type="note" %}} -This option only appears when **Show percent change** is enabled. -{{% /admonition %}} +- **Standard -** Green if the percent change is positive, red if the percent change is negative. +- **Inverted -** Red if the percent change is positive, green if the percent change is negative. +- **Same as Value -** Use the same color as the value. ## Text size diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md index 8e318158df8..4b337fd5134 100644 --- a/docs/sources/panels-visualizations/visualizations/table/index.md +++ b/docs/sources/panels-visualizations/visualizations/table/index.md @@ -120,9 +120,9 @@ If you set these in the Field tab, then the type will apply to all fields, inclu ### Auto -The Auto cell type will automatically display values with sensible defaults applied. +The **Auto** cell type automatically displays values, with sensible defaults applied. -Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides. +Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched field, if you've set a field override. ### Color text @@ -130,7 +130,7 @@ If thresholds are set, then the field text is displayed in the appropriate thres {{< figure src="/static/img/docs/tables/color-text.png" max-width="500px" caption="Color text" class="docs-image--no-shadow" >}} -Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides. +Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched field, if you've set a field override. ### Color background (gradient or solid) @@ -142,7 +142,7 @@ Toggle the **Apply to entire row** switch, to apply the background color that's {{< figure src="/static/img/docs/tables/colored-rows.png" max-width="500px" alt="Colored row background" class="docs-image--no-shadow" >}} -Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides. +Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched, if field you've set a field override. ### Gauge diff --git a/docs/sources/panels-visualizations/visualizations/xy-chart/index.md b/docs/sources/panels-visualizations/visualizations/xy-chart/index.md index 1e3f4d341dd..d28cc0f153e 100644 --- a/docs/sources/panels-visualizations/visualizations/xy-chart/index.md +++ b/docs/sources/panels-visualizations/visualizations/xy-chart/index.md @@ -59,6 +59,10 @@ refs: # XY chart +{{< admonition type="note">}} +To use xy charts, enable the `autoMigrateXYChartPanel` [feature toggle](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/). +{{< /admonition >}} + XY charts provide a way to visualize arbitrary x and y values in a graph so that you can easily show the relationship between two variables. XY charts are typically used to create scatter plots. You can also use them to create bubble charts where field values determine the size of each bubble: ![An xy chart showing height weight distribution](/media/docs/grafana/panels-visualizations/screenshot-xy-charts-v11.0.png) From f2b6a9aa3dba7050bd1dbf03265ab60bf9492c2a Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Fri, 14 Jun 2024 02:35:23 +0300 Subject: [PATCH 3/5] K8s: Add numeric revisionVersion helpers to grafanaMetaAccessor (#89191) --- pkg/apimachinery/utils/meta.go | 36 +++++++++++++++++++++-------- pkg/apimachinery/utils/meta_test.go | 5 ++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/pkg/apimachinery/utils/meta.go b/pkg/apimachinery/utils/meta.go index ac5079a2a8e..ebc90171781 100644 --- a/pkg/apimachinery/utils/meta.go +++ b/pkg/apimachinery/utils/meta.go @@ -3,6 +3,7 @@ package utils import ( "fmt" "reflect" + "strconv" "time" "k8s.io/apimachinery/pkg/api/meta" @@ -53,6 +54,11 @@ type GrafanaMetaAccessor interface { GetGroupVersionKind() schema.GroupVersionKind + // Helper to get resource versions as int64, however this is not required + // See: https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions + GetResourceVersionInt64() (int64, error) + SetResourceVersionInt64(int64) + GetUpdatedTimestamp() (*time.Time, error) SetUpdatedTimestamp(v *time.Time) SetUpdatedTimestampMillis(unix int64) @@ -62,6 +68,8 @@ type GrafanaMetaAccessor interface { SetUpdatedBy(user string) GetFolder() string SetFolder(uid string) + SetAnnotation(key string, val string) + GetSlug() string SetSlug(v string) @@ -99,7 +107,7 @@ func MetaAccessor(raw interface{}) (GrafanaMetaAccessor, error) { return nil, err } - // look for Spec.Title or Spec.Name + // reflection to find title and other non object properties r := reflect.ValueOf(raw) if r.Kind() == reflect.Ptr || r.Kind() == reflect.Interface { r = r.Elem() @@ -107,11 +115,19 @@ func MetaAccessor(raw interface{}) (GrafanaMetaAccessor, error) { return &grafanaMetaAccessor{raw, obj, r}, nil } -func (m *grafanaMetaAccessor) Object() metav1.Object { - return m.obj +func (m *grafanaMetaAccessor) GetResourceVersionInt64() (int64, error) { + v := m.obj.GetResourceVersion() + if v == "" { + return 0, nil + } + return strconv.ParseInt(v, 10, 64) } -func (m *grafanaMetaAccessor) set(key string, val string) { +func (m *grafanaMetaAccessor) SetResourceVersionInt64(rv int64) { + m.obj.SetResourceVersion(strconv.FormatInt(rv, 10)) +} + +func (m *grafanaMetaAccessor) SetAnnotation(key string, val string) { anno := m.obj.GetAnnotations() if val == "" { if anno != nil { @@ -148,7 +164,7 @@ func (m *grafanaMetaAccessor) SetUpdatedTimestampMillis(v int64) { t := time.UnixMilli(v) m.SetUpdatedTimestamp(&t) } else { - m.set(AnnoKeyUpdatedTimestamp, "") // will clear the annotation + m.SetAnnotation(AnnoKeyUpdatedTimestamp, "") // will clear the annotation } } @@ -157,7 +173,7 @@ func (m *grafanaMetaAccessor) SetUpdatedTimestamp(v *time.Time) { if v != nil && v.Unix() != 0 { txt = v.UTC().Format(time.RFC3339) } - m.set(AnnoKeyUpdatedTimestamp, txt) + m.SetAnnotation(AnnoKeyUpdatedTimestamp, txt) } func (m *grafanaMetaAccessor) GetCreatedBy() string { @@ -165,7 +181,7 @@ func (m *grafanaMetaAccessor) GetCreatedBy() string { } func (m *grafanaMetaAccessor) SetCreatedBy(user string) { - m.set(AnnoKeyCreatedBy, user) + m.SetAnnotation(AnnoKeyCreatedBy, user) } func (m *grafanaMetaAccessor) GetUpdatedBy() string { @@ -173,7 +189,7 @@ func (m *grafanaMetaAccessor) GetUpdatedBy() string { } func (m *grafanaMetaAccessor) SetUpdatedBy(user string) { - m.set(AnnoKeyUpdatedBy, user) + m.SetAnnotation(AnnoKeyUpdatedBy, user) } func (m *grafanaMetaAccessor) GetFolder() string { @@ -181,7 +197,7 @@ func (m *grafanaMetaAccessor) GetFolder() string { } func (m *grafanaMetaAccessor) SetFolder(uid string) { - m.set(AnnoKeyFolder, uid) + m.SetAnnotation(AnnoKeyFolder, uid) } func (m *grafanaMetaAccessor) GetSlug() string { @@ -189,7 +205,7 @@ func (m *grafanaMetaAccessor) GetSlug() string { } func (m *grafanaMetaAccessor) SetSlug(v string) { - m.set(AnnoKeySlug, v) + m.SetAnnotation(AnnoKeySlug, v) } func (m *grafanaMetaAccessor) SetOriginInfo(info *ResourceOriginInfo) { diff --git a/pkg/apimachinery/utils/meta_test.go b/pkg/apimachinery/utils/meta_test.go index cee670a0870..af8c0ed2c48 100644 --- a/pkg/apimachinery/utils/meta_test.go +++ b/pkg/apimachinery/utils/meta_test.go @@ -163,8 +163,13 @@ func TestMetaAccessor(t *testing.T) { }, res.GetAnnotations()) meta.SetNamespace("aaa") + meta.SetResourceVersionInt64(12345) require.Equal(t, "aaa", res.GetNamespace()) require.Equal(t, "aaa", meta.GetNamespace()) + + rv, err := meta.GetResourceVersionInt64() + require.NoError(t, err) + require.Equal(t, int64(12345), rv) }) t.Run("find titles", func(t *testing.T) { From 4ee754d69b5ee10428dc8f855ccbff182fd6b0ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:17:36 +0300 Subject: [PATCH 4/5] I18n: Download translations from Crowdin (#89175) New Crowdin translations by GitHub Action Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- public/locales/de-DE/grafana.json | 29 +++++++++++++++++------------ public/locales/es-ES/grafana.json | 29 +++++++++++++++++------------ public/locales/fr-FR/grafana.json | 29 +++++++++++++++++------------ public/locales/pt-BR/grafana.json | 29 +++++++++++++++++------------ public/locales/zh-Hans/grafana.json | 29 +++++++++++++++++------------ 5 files changed, 85 insertions(+), 60 deletions(-) diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json index fd946b729a6..b9e7776d417 100644 --- a/public/locales/de-DE/grafana.json +++ b/public/locales/de-DE/grafana.json @@ -1487,7 +1487,8 @@ "public-share-type-option-description": "", "public-share-type-option-label": "", "resume-access-button": "", - "revoke-access-button": "" + "revoke-access-button": "", + "revoke-access-description": "" }, "sharing": { "success-creation": "" @@ -1594,23 +1595,22 @@ "dismissable-button": "Schließen" }, "scopes": { - "advancedSelector": { + "filters": { "apply": "", "cancel": "", + "input": { + "placeholder": "", + "removeAll": "" + }, "title": "" }, - "basicSelector": { - "openAdvanced": "", - "placeholder": "", - "removeAll": "" - }, - "root": { - "collapse": "", - "expand": "" - }, "suggestedDashboards": { "loading": "", - "search": "" + "search": "", + "toggle": { + "collapse": "", + "expand": "" + } }, "tree": { "collapse": "", @@ -1655,6 +1655,11 @@ "title": "" } }, + "share-drawer": { + "confirm-action": { + "back-arrow-button": "" + } + }, "share-modal": { "dashboard": { "title": "Teilen" diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json index b36bdb76687..2fd555955b8 100644 --- a/public/locales/es-ES/grafana.json +++ b/public/locales/es-ES/grafana.json @@ -1487,7 +1487,8 @@ "public-share-type-option-description": "", "public-share-type-option-label": "", "resume-access-button": "", - "revoke-access-button": "" + "revoke-access-button": "", + "revoke-access-description": "" }, "sharing": { "success-creation": "" @@ -1594,23 +1595,22 @@ "dismissable-button": "Cerrar" }, "scopes": { - "advancedSelector": { + "filters": { "apply": "", "cancel": "", + "input": { + "placeholder": "", + "removeAll": "" + }, "title": "" }, - "basicSelector": { - "openAdvanced": "", - "placeholder": "", - "removeAll": "" - }, - "root": { - "collapse": "", - "expand": "" - }, "suggestedDashboards": { "loading": "", - "search": "" + "search": "", + "toggle": { + "collapse": "", + "expand": "" + } }, "tree": { "collapse": "", @@ -1655,6 +1655,11 @@ "title": "" } }, + "share-drawer": { + "confirm-action": { + "back-arrow-button": "" + } + }, "share-modal": { "dashboard": { "title": "Compartir" diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json index 786dff71b71..865cd291607 100644 --- a/public/locales/fr-FR/grafana.json +++ b/public/locales/fr-FR/grafana.json @@ -1487,7 +1487,8 @@ "public-share-type-option-description": "", "public-share-type-option-label": "", "resume-access-button": "", - "revoke-access-button": "" + "revoke-access-button": "", + "revoke-access-description": "" }, "sharing": { "success-creation": "" @@ -1594,23 +1595,22 @@ "dismissable-button": "Fermer" }, "scopes": { - "advancedSelector": { + "filters": { "apply": "", "cancel": "", + "input": { + "placeholder": "", + "removeAll": "" + }, "title": "" }, - "basicSelector": { - "openAdvanced": "", - "placeholder": "", - "removeAll": "" - }, - "root": { - "collapse": "", - "expand": "" - }, "suggestedDashboards": { "loading": "", - "search": "" + "search": "", + "toggle": { + "collapse": "", + "expand": "" + } }, "tree": { "collapse": "", @@ -1655,6 +1655,11 @@ "title": "" } }, + "share-drawer": { + "confirm-action": { + "back-arrow-button": "" + } + }, "share-modal": { "dashboard": { "title": "Partager" diff --git a/public/locales/pt-BR/grafana.json b/public/locales/pt-BR/grafana.json index 564843dda42..ec8e2689a80 100644 --- a/public/locales/pt-BR/grafana.json +++ b/public/locales/pt-BR/grafana.json @@ -1487,7 +1487,8 @@ "public-share-type-option-description": "", "public-share-type-option-label": "", "resume-access-button": "", - "revoke-access-button": "" + "revoke-access-button": "", + "revoke-access-description": "" }, "sharing": { "success-creation": "" @@ -1594,23 +1595,22 @@ "dismissable-button": "Fechar" }, "scopes": { - "advancedSelector": { + "filters": { "apply": "", "cancel": "", + "input": { + "placeholder": "", + "removeAll": "" + }, "title": "" }, - "basicSelector": { - "openAdvanced": "", - "placeholder": "", - "removeAll": "" - }, - "root": { - "collapse": "", - "expand": "" - }, "suggestedDashboards": { "loading": "", - "search": "" + "search": "", + "toggle": { + "collapse": "", + "expand": "" + } }, "tree": { "collapse": "", @@ -1655,6 +1655,11 @@ "title": "" } }, + "share-drawer": { + "confirm-action": { + "back-arrow-button": "" + } + }, "share-modal": { "dashboard": { "title": "Compartilhar" diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json index 2f4f5116ca5..2511dc32c60 100644 --- a/public/locales/zh-Hans/grafana.json +++ b/public/locales/zh-Hans/grafana.json @@ -1481,7 +1481,8 @@ "public-share-type-option-description": "", "public-share-type-option-label": "", "resume-access-button": "", - "revoke-access-button": "" + "revoke-access-button": "", + "revoke-access-description": "" }, "sharing": { "success-creation": "" @@ -1587,23 +1588,22 @@ "dismissable-button": "关闭" }, "scopes": { - "advancedSelector": { + "filters": { "apply": "", "cancel": "", + "input": { + "placeholder": "", + "removeAll": "" + }, "title": "" }, - "basicSelector": { - "openAdvanced": "", - "placeholder": "", - "removeAll": "" - }, - "root": { - "collapse": "", - "expand": "" - }, "suggestedDashboards": { "loading": "", - "search": "" + "search": "", + "toggle": { + "collapse": "", + "expand": "" + } }, "tree": { "collapse": "", @@ -1648,6 +1648,11 @@ "title": "" } }, + "share-drawer": { + "confirm-action": { + "back-arrow-button": "" + } + }, "share-modal": { "dashboard": { "title": "分享" From 2173429ce2bc33a241f6f0fbb8ed3e125be21c43 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Fri, 14 Jun 2024 09:04:06 +0300 Subject: [PATCH 5/5] Identity: Add static requester struct (#89190) --- pkg/apimachinery/identity/context_test.go | 118 +-------------- pkg/apimachinery/identity/static.go | 175 ++++++++++++++++++++++ 2 files changed, 176 insertions(+), 117 deletions(-) create mode 100644 pkg/apimachinery/identity/static.go diff --git a/pkg/apimachinery/identity/context_test.go b/pkg/apimachinery/identity/context_test.go index 6464a7360fb..87f31a17763 100644 --- a/pkg/apimachinery/identity/context_test.go +++ b/pkg/apimachinery/identity/context_test.go @@ -17,126 +17,10 @@ func TestRequesterFromContext(t *testing.T) { }) t.Run("should return user set by ContextWithUser", func(t *testing.T) { - expected := &dummyUser{UID: "AAA"} + expected := &identity.StaticRequester{UserUID: "AAA"} ctx := identity.WithRequester(context.Background(), expected) actual, err := identity.GetRequester(ctx) require.NoError(t, err) require.Equal(t, expected.GetUID(), actual.GetUID()) }) } - -type dummyUser struct { - UID string -} - -// GetAuthID implements identity.Requester. -func (d *dummyUser) GetAuthID() string { - panic("unimplemented") -} - -// GetAuthenticatedBy implements identity.Requester. -func (d *dummyUser) GetAuthenticatedBy() string { - panic("unimplemented") -} - -// GetCacheKey implements identity.Requester. -func (d *dummyUser) GetCacheKey() string { - panic("unimplemented") -} - -// GetDisplayName implements identity.Requester. -func (d *dummyUser) GetDisplayName() string { - panic("unimplemented") -} - -// GetEmail implements identity.Requester. -func (d *dummyUser) GetEmail() string { - panic("unimplemented") -} - -// GetGlobalPermissions implements identity.Requester. -func (d *dummyUser) GetGlobalPermissions() map[string][]string { - panic("unimplemented") -} - -// GetID implements identity.Requester. -func (d *dummyUser) GetID() identity.NamespaceID { - panic("unimplemented") -} - -// GetIDToken implements identity.Requester. -func (d *dummyUser) GetIDToken() string { - panic("unimplemented") -} - -// GetIsGrafanaAdmin implements identity.Requester. -func (d *dummyUser) GetIsGrafanaAdmin() bool { - panic("unimplemented") -} - -// GetLogin implements identity.Requester. -func (d *dummyUser) GetLogin() string { - panic("unimplemented") -} - -// GetNamespacedID implements identity.Requester. -func (d *dummyUser) GetNamespacedID() (namespace identity.Namespace, identifier string) { - panic("unimplemented") -} - -// GetOrgID implements identity.Requester. -func (d *dummyUser) GetOrgID() int64 { - panic("unimplemented") -} - -// GetOrgName implements identity.Requester. -func (d *dummyUser) GetOrgName() string { - panic("unimplemented") -} - -// GetOrgRole implements identity.Requester. -func (d *dummyUser) GetOrgRole() identity.RoleType { - panic("unimplemented") -} - -// GetPermissions implements identity.Requester. -func (d *dummyUser) GetPermissions() map[string][]string { - panic("unimplemented") -} - -// GetTeams implements identity.Requester. -func (d *dummyUser) GetTeams() []int64 { - panic("unimplemented") -} - -// GetUID implements identity.Requester. -func (d *dummyUser) GetUID() identity.NamespaceID { - return identity.NewNamespaceIDString(identity.NamespaceUser, d.UID) -} - -// HasRole implements identity.Requester. -func (d *dummyUser) HasRole(role identity.RoleType) bool { - panic("unimplemented") -} - -// HasUniqueId implements identity.Requester. -func (d *dummyUser) HasUniqueId() bool { - panic("unimplemented") -} - -// IsAuthenticatedBy implements identity.Requester. -func (d *dummyUser) IsAuthenticatedBy(providers ...string) bool { - panic("unimplemented") -} - -// IsEmailVerified implements identity.Requester. -func (d *dummyUser) IsEmailVerified() bool { - panic("unimplemented") -} - -// IsNil implements identity.Requester. -func (d *dummyUser) IsNil() bool { - return false -} - -var _ identity.Requester = &dummyUser{} diff --git a/pkg/apimachinery/identity/static.go b/pkg/apimachinery/identity/static.go new file mode 100644 index 00000000000..84df3966b80 --- /dev/null +++ b/pkg/apimachinery/identity/static.go @@ -0,0 +1,175 @@ +package identity + +import "fmt" + +var _ Requester = &StaticRequester{} + +// StaticRequester allows creating requester values explicitly. +// It is helpful in tests! +// This is mostly copied from: +// https://github.com/grafana/grafana/blob/v11.0.0/pkg/services/user/identity.go#L16 +type StaticRequester struct { + Namespace Namespace + UserID int64 + UserUID string + OrgID int64 + OrgName string + OrgRole RoleType + Login string + Name string + DisplayName string + Email string + EmailVerified bool + AuthID string + AuthenticatedBy string + IsGrafanaAdmin bool + // Permissions grouped by orgID and actions + Permissions map[int64]map[string][]string + IDToken string + CacheKey string +} + +func (u *StaticRequester) HasRole(role RoleType) bool { + if u.IsGrafanaAdmin { + return true + } + + return u.OrgRole.Includes(role) +} + +// GetIsGrafanaAdmin returns true if the user is a server admin +func (u *StaticRequester) GetIsGrafanaAdmin() bool { + return u.IsGrafanaAdmin +} + +// GetLogin returns the login of the active entity +// Can be empty if the user is anonymous +func (u *StaticRequester) GetLogin() string { + return u.Login +} + +// GetOrgID returns the ID of the active organization +func (u *StaticRequester) GetOrgID() int64 { + return u.OrgID +} + +// DEPRECATED: GetOrgName returns the name of the active organization +// Retrieve the organization name from the organization service instead of using this method. +func (u *StaticRequester) GetOrgName() string { + return u.OrgName +} + +// GetPermissions returns the permissions of the active entity +func (u *StaticRequester) GetPermissions() map[string][]string { + if u.Permissions == nil { + return make(map[string][]string) + } + + if u.Permissions[u.GetOrgID()] == nil { + return make(map[string][]string) + } + + return u.Permissions[u.GetOrgID()] +} + +// GetGlobalPermissions returns the permissions of the active entity that are available across all organizations +func (u *StaticRequester) GetGlobalPermissions() map[string][]string { + if u.Permissions == nil { + return make(map[string][]string) + } + + const globalOrgID = 0 + + if u.Permissions[globalOrgID] == nil { + return make(map[string][]string) + } + + return u.Permissions[globalOrgID] +} + +// DEPRECATED: GetTeams returns the teams the entity is a member of +// Retrieve the teams from the team service instead of using this method. +func (u *StaticRequester) GetTeams() []int64 { + return []int64{} // Not implemented +} + +// GetOrgRole returns the role of the active entity in the active organization +func (u *StaticRequester) GetOrgRole() RoleType { + return u.OrgRole +} + +// HasUniqueId returns true if the entity has a unique id +func (u *StaticRequester) HasUniqueId() bool { + return u.UserID > 0 +} + +// GetID returns namespaced id for the entity +func (u *StaticRequester) GetID() NamespaceID { + return NewNamespaceIDString(u.Namespace, fmt.Sprintf("%d", u.UserID)) +} + +// GetUID returns namespaced uid for the entity +func (u *StaticRequester) GetUID() NamespaceID { + return NewNamespaceIDString(u.Namespace, u.UserUID) +} + +// GetNamespacedID returns the namespace and ID of the active entity +// The namespace is one of the constants defined in pkg/apimachinery/identity +func (u *StaticRequester) GetNamespacedID() (Namespace, string) { + return u.Namespace, fmt.Sprintf("%d", u.UserID) +} + +func (u *StaticRequester) GetAuthID() string { + return u.AuthID +} + +func (u *StaticRequester) GetAuthenticatedBy() string { + return u.AuthenticatedBy +} + +func (u *StaticRequester) IsAuthenticatedBy(providers ...string) bool { + for _, p := range providers { + if u.AuthenticatedBy == p { + return true + } + } + return false +} + +// FIXME: remove this method once all services are using an interface +func (u *StaticRequester) IsNil() bool { + return u == nil +} + +// GetEmail returns the email of the active entity +// Can be empty. +func (u *StaticRequester) GetEmail() string { + return u.Email +} + +func (u *StaticRequester) IsEmailVerified() bool { + return u.EmailVerified +} + +func (u *StaticRequester) GetCacheKey() string { + return u.CacheKey +} + +// GetDisplayName returns the display name of the active entity +// The display name is the name if it is set, otherwise the login or email +func (u *StaticRequester) GetDisplayName() string { + if u.DisplayName != "" { + return u.DisplayName + } + if u.Name != "" { + return u.Name + } + if u.Login != "" { + return u.Login + } + return u.Email +} + +func (u *StaticRequester) GetIDToken() string { + return u.IDToken +}