Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 41f95b2307 |
@@ -311,29 +311,20 @@ jobs:
|
||||
repositories: '["grafana"]'
|
||||
permissions: '{"issues": "write", "pull_requests": "write", "contents": "read"}'
|
||||
- name: Find PR
|
||||
continue-on-error: true
|
||||
id: find-pr
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
|
||||
GRAFANA_COMMIT: ${{ needs.setup.outputs.grafana-commit }}
|
||||
REPO: ${{ github.repository }}
|
||||
run: |
|
||||
set -eo pipefail
|
||||
gh api "/repos/${REPO}/commits/${GRAFANA_COMMIT}/pulls" | jq -r '.[0].number' | tee issue_number.txt
|
||||
echo "ISSUE_NUMBER=$(cat issue_number.txt)" >> "$GITHUB_ENV"
|
||||
run: echo "ISSUE_NUMBER=$(gh api "/repos/grafana/grafana/commits/${GRAFANA_COMMIT}/pulls" | jq -r '.[0].number')" >> "$GITHUB_ENV"
|
||||
- name: Find Comment
|
||||
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
|
||||
if: ${{ steps.find-pr.outcome == 'success' }}
|
||||
id: fc
|
||||
continue-on-error: true
|
||||
with:
|
||||
issue-number: ${{ env.ISSUE_NUMBER }}
|
||||
comment-author: 'grafana-delivery-bot[bot]'
|
||||
body-includes: GitHub Actions Build
|
||||
token: ${{ steps.generate_token.outputs.token }}
|
||||
- name: Create or update comment
|
||||
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v4
|
||||
if: ${{ steps.find-pr.outcome == 'success' }} # Run even if comment wasn't found
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
|
||||
with:
|
||||
token: ${{ steps.generate_token.outputs.token }}
|
||||
comment-id: ${{ steps.fc.outputs.comment-id }}
|
||||
|
||||
@@ -1,15 +1,3 @@
|
||||
<!-- 12.1.4 START -->
|
||||
|
||||
# 12.1.4 (2025-11-19)
|
||||
|
||||
### Bug fixes
|
||||
|
||||
- **Alerting:** Fix unmarshalling of GettableStatus to include time intervals [#112733](https://github.com/grafana/grafana/pull/112733), [@yuri-tceretian](https://github.com/yuri-tceretian)
|
||||
- **AnalyticsSummaries:** Fix dashboard rollup not resetting "last X days" metrics to zero (Enterprise)
|
||||
- **AnalyticsSummaries:** Fix dashboard rollup totals resetting incorrectly (Enterprise)
|
||||
- **Security:** fix for CVE-2025-41115 in SCIM (System for Cross-domain Identity Management) (Enterprise)
|
||||
|
||||
<!-- 12.1.4 END -->
|
||||
<!-- 12.1.3 START -->
|
||||
|
||||
# 12.1.3 (2025-10-21)
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"npmClient": "yarn",
|
||||
"version": "12.1.5"
|
||||
"version": "12.1.4"
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
"license": "AGPL-3.0-only",
|
||||
"private": true,
|
||||
"name": "grafana",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"repository": "github:grafana/grafana",
|
||||
"scripts": {
|
||||
"build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/alerting",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Alerting Library – Build vertical integrations on top of the industry-leading alerting solution",
|
||||
"keywords": [
|
||||
"typescript",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/data",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Data Library",
|
||||
"keywords": [
|
||||
"typescript"
|
||||
@@ -56,7 +56,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@braintree/sanitize-url": "7.0.1",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@leeoniya/ufuzzy": "1.0.18",
|
||||
"@types/d3-interpolate": "^3.0.0",
|
||||
"@types/string-hash": "1.1.3",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/e2e-selectors",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana End-to-End Test Selectors Library",
|
||||
"keywords": [
|
||||
"cli",
|
||||
|
||||
@@ -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": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"main": "./index.cjs",
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/flamegraph",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana flamegraph visualization component",
|
||||
"keywords": [
|
||||
"grafana",
|
||||
@@ -44,8 +44,8 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"@leeoniya/ufuzzy": "1.0.18",
|
||||
"d3": "^7.8.5",
|
||||
"lodash": "4.17.21",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/i18n",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Internationalization Library",
|
||||
"keywords": [
|
||||
"grafana",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"license": "AGPL-3.0-only",
|
||||
"name": "@grafana/o11y-ds-frontend",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Library to manage traces in Grafana.",
|
||||
"sideEffects": false,
|
||||
"repository": {
|
||||
@@ -18,12 +18,12 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"react-select": "5.10.1",
|
||||
"react-use": "17.6.0",
|
||||
"rxjs": "7.8.2",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@grafana/plugin-configs",
|
||||
"description": "Shared dependencies and files for core plugins",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "AGPL-3.0-only",
|
||||
"name": "@grafana/prometheus",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Prometheus Library",
|
||||
"keywords": [
|
||||
"typescript",
|
||||
@@ -41,13 +41,13 @@
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@floating-ui/react": "0.27.13",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/i18n": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/i18n": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"@hello-pangea/dnd": "18.0.1",
|
||||
"@leeoniya/ufuzzy": "1.0.18",
|
||||
"@lezer/common": "1.2.3",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/runtime",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Runtime Library",
|
||||
"keywords": [
|
||||
"grafana",
|
||||
@@ -53,11 +53,11 @@
|
||||
"postpack": "mv package.json.bak package.json && rimraf ./unstable"
|
||||
},
|
||||
"dependencies": {
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/faro-web-sdk": "^1.13.2",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"@types/systemjs": "6.15.3",
|
||||
"history": "4.10.1",
|
||||
"lodash": "4.17.21",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/schema",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Schema Library",
|
||||
"keywords": [
|
||||
"typescript"
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
limit: number;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.OptionsWithLegend, common.SingleStatBaseOptions {
|
||||
displayMode: common.BarGaugeDisplayMode;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export enum VizDisplayMode {
|
||||
Candles = 'candles',
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export enum HorizontalConstraint {
|
||||
Center = 'center',
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface MetricStat {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
selectedSeries: number;
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export type UpdateConfig = {
|
||||
render: boolean,
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.SingleStatBaseOptions {
|
||||
minVizHeight: number;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
basemap: ui.MapLayerOptions;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
/**
|
||||
* Controls the color mode of the heatmap
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
controlsStorageKey?: string;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
controlsStorageKey?: string;
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface ArcOption {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
/**
|
||||
* Select the pie chart display style.
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.SingleStatBaseOptions {
|
||||
colorMode: common.BigValueColorMode;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as ui from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options {
|
||||
/**
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// Run 'make gen-cue' from repository root to regenerate.
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export enum TextMode {
|
||||
Code = 'code',
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export interface Options extends common.OptionsWithTimezones {
|
||||
legend: common.VizLegendOptions;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
/**
|
||||
* Identical to timeseries... except it does not have timezone settings
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
import * as common from '@grafana/schema';
|
||||
|
||||
export const pluginVersion = "12.1.5";
|
||||
export const pluginVersion = "12.1.4";
|
||||
|
||||
export enum PointShape {
|
||||
Circle = 'circle',
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"license": "AGPL-3.0-only",
|
||||
"private": true,
|
||||
"name": "@grafana/sql",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "http://github.com/grafana/grafana.git",
|
||||
@@ -16,12 +16,12 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/i18n": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/i18n": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"@react-awesome-query-builder/ui": "6.6.15",
|
||||
"immutable": "5.1.3",
|
||||
"lodash": "4.17.21",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/test-utils",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"private": true,
|
||||
"description": "Grafana test utils & Mock API",
|
||||
"keywords": [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Grafana Labs",
|
||||
"license": "Apache-2.0",
|
||||
"name": "@grafana/ui",
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"description": "Grafana Components Library",
|
||||
"keywords": [
|
||||
"grafana",
|
||||
@@ -66,11 +66,11 @@
|
||||
"@emotion/react": "11.14.0",
|
||||
"@emotion/serialize": "1.3.3",
|
||||
"@floating-ui/react": "0.27.13",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/faro-web-sdk": "^1.13.2",
|
||||
"@grafana/i18n": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/i18n": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@hello-pangea/dnd": "18.0.1",
|
||||
"@monaco-editor/react": "4.7.0",
|
||||
"@popperjs/core": "2.11.8",
|
||||
|
||||
+20
-6
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"path"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
@@ -40,10 +41,8 @@ var getViewIndex = func() string {
|
||||
return viewIndex
|
||||
}
|
||||
|
||||
var redirectAllowRe = regexp.MustCompile(`^/[a-zA-Z0-9-_./]*$`)
|
||||
|
||||
// Do not allow redirect URLs that contain "//" or ".."
|
||||
var redirectDenyRe = regexp.MustCompile(`(//|\.\.)`)
|
||||
// Only allow redirects that start with a slash followed by an alphanumerical character, a dash or an underscore.
|
||||
var redirectRe = regexp.MustCompile(`^/[a-zA-Z0-9-_].*`)
|
||||
|
||||
var (
|
||||
errAbsoluteRedirectTo = errors.New("absolute URLs are not allowed for redirect_to cookie value")
|
||||
@@ -65,11 +64,26 @@ func (hs *HTTPServer) ValidateRedirectTo(redirectTo string) error {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
if redirectDenyRe.MatchString(to.Path) {
|
||||
// path should have exactly one leading slash
|
||||
if !strings.HasPrefix(to.Path, "/") {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
if to.Path != "/" && !redirectAllowRe.MatchString(to.Path) {
|
||||
if strings.HasPrefix(to.Path, "//") {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
if to.Path != "/" && !redirectRe.MatchString(to.Path) {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
cleanPath := path.Clean(to.Path)
|
||||
// "." is what path.Clean returns for empty paths
|
||||
if cleanPath == "." {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
if cleanPath != "/" && !redirectRe.MatchString(cleanPath) {
|
||||
return errForbiddenRedirectTo
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package middleware
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"path"
|
||||
"regexp"
|
||||
"strconv"
|
||||
|
||||
@@ -12,10 +13,8 @@ import (
|
||||
"github.com/grafana/grafana/pkg/web"
|
||||
)
|
||||
|
||||
var redirectAllowRe = regexp.MustCompile(`^/?[a-zA-Z0-9-_./]*$`)
|
||||
|
||||
// Do not allow redirect URLs that contain "//" or ".."
|
||||
var redirectDenyRe = regexp.MustCompile(`(//|\.\.)`)
|
||||
// Only allow redirects that start with a slash followed by an alphanumerical character, a dash or an underscore.
|
||||
var redirectRe = regexp.MustCompile(`^/?[a-zA-Z0-9-_].*`)
|
||||
|
||||
// OrgRedirect changes org and redirects users if the
|
||||
// querystring `orgId` doesn't match the active org.
|
||||
@@ -67,9 +66,9 @@ func OrgRedirect(cfg *setting.Cfg, userSvc user.Service) web.Handler {
|
||||
}
|
||||
|
||||
func validRedirectPath(p string) bool {
|
||||
if redirectDenyRe.MatchString(p) {
|
||||
if p != "" && p != "/" && !redirectRe.MatchString(p) {
|
||||
return false
|
||||
}
|
||||
|
||||
return p == "" || p == "/" || redirectAllowRe.MatchString(p)
|
||||
cleanPath := path.Clean(p)
|
||||
return cleanPath == "." || cleanPath == "/" || redirectRe.MatchString(cleanPath)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import { contextSrv } from 'app/core/services/context_srv';
|
||||
|
||||
import { SaveLibraryVizPanelModal } from '../panel-edit/SaveLibraryVizPanelModal';
|
||||
import { DashboardScene } from '../scene/DashboardScene';
|
||||
import { getLibraryPanelBehavior, hasActualSaveChanges, isLibraryPanel } from '../utils/utils';
|
||||
import { getLibraryPanelBehavior, isLibraryPanel } from '../utils/utils';
|
||||
|
||||
interface DashboardPromptProps {
|
||||
dashboard: DashboardScene;
|
||||
@@ -183,5 +183,5 @@ export function ignoreChanges(scene: DashboardScene | null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !canSave || fromScript || fromFile || (scene.state.isEditing && !hasActualSaveChanges(scene));
|
||||
return !canSave || fromScript || fromFile;
|
||||
}
|
||||
|
||||
@@ -72,7 +72,6 @@ import {
|
||||
getDefaultVizPanel,
|
||||
getLayoutManagerFor,
|
||||
getPanelIdForVizPanel,
|
||||
hasActualSaveChanges,
|
||||
} from '../utils/utils';
|
||||
import { SchemaV2EditorDrawer } from '../v2schema/SchemaV2EditorDrawer';
|
||||
|
||||
@@ -317,7 +316,7 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> impleme
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.state.isDirty || skipConfirm || !hasActualSaveChanges(this) || this.managedResourceCannotBeEdited()) {
|
||||
if (!this.state.isDirty || skipConfirm || this.managedResourceCannotBeEdited()) {
|
||||
this.exitEditModeConfirmed(restoreInitialState || this.state.isDirty);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -471,11 +471,3 @@ export function getLayoutOrchestratorFor(scene: SceneObject): DashboardLayoutOrc
|
||||
}
|
||||
|
||||
export const dashboardLog = createLogger('Dashboard');
|
||||
|
||||
/**
|
||||
* Checks if there are save changes but not counting time range, refresh rate and default variable value change
|
||||
*/
|
||||
export function hasActualSaveChanges(dashboard: DashboardScene) {
|
||||
const changes = dashboard.getDashboardChanges();
|
||||
return !!changes.diffCount;
|
||||
}
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
"name": "@grafana-plugins/grafana-azure-monitor-datasource",
|
||||
"description": "Grafana data source for Azure Monitor",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/i18n": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/i18n": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"@kusto/monaco-kusto": "^10.0.0",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"i18next": "^25.0.0",
|
||||
@@ -26,8 +26,8 @@
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/jest-dom": "6.6.3",
|
||||
"@testing-library/react": "16.2.0",
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
"name": "@grafana-plugins/stackdriver",
|
||||
"description": "Grafana data source for Google Cloud Monitoring",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/google-sdk": "0.3.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"debounce-promise": "3.1.2",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"i18next": "^25.0.0",
|
||||
@@ -26,8 +26,8 @@
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/jest-dom": "6.6.3",
|
||||
"@testing-library/react": "16.2.0",
|
||||
|
||||
@@ -2,22 +2,22 @@
|
||||
"name": "@grafana-plugins/grafana-postgresql-datasource",
|
||||
"description": "PostgreSQL data source plugin",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/sql": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/sql": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"lodash": "4.17.21",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "7.8.2",
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -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": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"lodash": "4.17.21",
|
||||
"monaco-editor": "0.34.1",
|
||||
@@ -20,7 +20,7 @@
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/jest-dom": "6.6.3",
|
||||
"@testing-library/react": "16.2.0",
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
"name": "@grafana-plugins/grafana-testdata-datasource",
|
||||
"description": "Generates test data in different forms",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"d3-random": "^3.0.1",
|
||||
"lodash": "4.17.21",
|
||||
"micro-memoize": "^4.1.2",
|
||||
@@ -21,8 +21,8 @@
|
||||
"uuid": "11.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@grafana-plugins/jaeger",
|
||||
"description": "Jaeger plugin for Grafana",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "workspace:*",
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
"name": "@grafana-plugins/loki",
|
||||
"description": "Loki data source plugin for Grafana",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/lezer-logql": "0.2.8",
|
||||
"@grafana/llm": "0.22.1",
|
||||
"@grafana/monaco-logql": "^0.0.8",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"d3-random": "^3.0.1",
|
||||
"lodash": "4.17.21",
|
||||
"micro-memoize": "^4.1.2",
|
||||
@@ -24,8 +24,8 @@
|
||||
"uuid": "11.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -2,23 +2,23 @@
|
||||
"name": "@grafana-plugins/mssql",
|
||||
"description": "MSSQL data source plugin",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/i18n": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/i18n": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/sql": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/sql": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"lodash": "4.17.21",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "7.8.2",
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -2,22 +2,22 @@
|
||||
"name": "@grafana-plugins/mysql",
|
||||
"description": "MySQL data source plugin",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/plugin-ui": "0.10.7",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/sql": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/sql": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"lodash": "4.17.21",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "7.8.2",
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/e2e-selectors": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/e2e-selectors": "12.1.4",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -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": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "12.1.5",
|
||||
"@grafana/runtime": "12.1.5",
|
||||
"@grafana/schema": "12.1.5",
|
||||
"@grafana/ui": "12.1.5",
|
||||
"@grafana/data": "12.1.4",
|
||||
"@grafana/runtime": "12.1.4",
|
||||
"@grafana/schema": "12.1.4",
|
||||
"@grafana/ui": "12.1.4",
|
||||
"lodash": "4.17.21",
|
||||
"monaco-editor": "0.34.1",
|
||||
"react": "18.3.1",
|
||||
@@ -18,7 +18,7 @@
|
||||
"tslib": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/react": "16.2.0",
|
||||
"@testing-library/user-event": "14.6.1",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@grafana-plugins/tempo",
|
||||
"description": "Grafana plugin for the Tempo data source.",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "workspace:*",
|
||||
@@ -38,7 +38,7 @@
|
||||
"uuid": "11.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/plugin-configs": "12.1.5",
|
||||
"@grafana/plugin-configs": "12.1.4",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/jest-dom": "6.6.3",
|
||||
"@testing-library/react": "16.2.0",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@grafana-plugins/zipkin",
|
||||
"description": "Zipkin plugin for Grafana",
|
||||
"private": true,
|
||||
"version": "12.1.5",
|
||||
"version": "12.1.4",
|
||||
"dependencies": {
|
||||
"@emotion/css": "11.13.5",
|
||||
"@grafana/data": "workspace:*",
|
||||
|
||||
@@ -2527,14 +2527,14 @@ __metadata:
|
||||
resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/i18n": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/i18n": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@kusto/monaco-kusto": "npm:^10.0.0"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/jest-dom": "npm:6.6.3"
|
||||
@@ -2573,13 +2573,13 @@ __metadata:
|
||||
resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/sql": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/sql": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2604,11 +2604,11 @@ __metadata:
|
||||
resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/jest-dom": "npm:6.6.3"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
@@ -2644,12 +2644,12 @@ __metadata:
|
||||
resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2725,15 +2725,15 @@ __metadata:
|
||||
resolution: "@grafana-plugins/loki@workspace:public/app/plugins/datasource/loki"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/lezer-logql": "npm:0.2.8"
|
||||
"@grafana/llm": "npm:0.22.1"
|
||||
"@grafana/monaco-logql": "npm:^0.0.8"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2767,14 +2767,14 @@ __metadata:
|
||||
resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/i18n": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/i18n": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/sql": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/sql": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2800,13 +2800,13 @@ __metadata:
|
||||
resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/sql": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/sql": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2831,11 +2831,11 @@ __metadata:
|
||||
resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
"@testing-library/user-event": "npm:14.6.1"
|
||||
@@ -2863,14 +2863,14 @@ __metadata:
|
||||
resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/google-sdk": "npm:0.3.4"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/jest-dom": "npm:6.6.3"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
@@ -2914,7 +2914,7 @@ __metadata:
|
||||
"@grafana/lezer-traceql": "npm:0.0.22"
|
||||
"@grafana/monaco-logql": "npm:^0.0.8"
|
||||
"@grafana/o11y-ds-frontend": "workspace:*"
|
||||
"@grafana/plugin-configs": "npm:12.1.5"
|
||||
"@grafana/plugin-configs": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "workspace:*"
|
||||
"@grafana/schema": "workspace:*"
|
||||
@@ -3063,12 +3063,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@grafana/data@npm:12.1.5, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
|
||||
"@grafana/data@npm:12.1.4, @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:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@leeoniya/ufuzzy": "npm:1.0.18"
|
||||
"@rollup/plugin-node-resolve": "npm:16.0.1"
|
||||
@@ -3116,7 +3116,7 @@ __metadata:
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@grafana/e2e-selectors@npm:12.1.5, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
|
||||
"@grafana/e2e-selectors@npm:12.1.4, @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:
|
||||
@@ -3217,9 +3217,9 @@ __metadata:
|
||||
"@babel/preset-env": "npm:7.26.9"
|
||||
"@babel/preset-react": "npm:7.26.3"
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@leeoniya/ufuzzy": "npm:1.0.18"
|
||||
"@rollup/plugin-node-resolve": "npm:16.0.1"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
@@ -3268,7 +3268,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@grafana/i18n@npm:12.1.5, @grafana/i18n@workspace:*, @grafana/i18n@workspace:packages/grafana-i18n":
|
||||
"@grafana/i18n@npm:12.1.4, @grafana/i18n@workspace:*, @grafana/i18n@workspace:packages/grafana-i18n":
|
||||
version: 0.0.0-use.local
|
||||
resolution: "@grafana/i18n@workspace:packages/grafana-i18n"
|
||||
dependencies:
|
||||
@@ -3339,13 +3339,13 @@ __metadata:
|
||||
resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/jest-dom": "npm:^6.1.2"
|
||||
"@testing-library/react": "npm:16.2.0"
|
||||
@@ -3369,7 +3369,7 @@ __metadata:
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@grafana/plugin-configs@npm:12.1.5, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
|
||||
"@grafana/plugin-configs@npm:12.1.4, @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:
|
||||
@@ -3441,14 +3441,14 @@ __metadata:
|
||||
dependencies:
|
||||
"@emotion/css": "npm:11.13.5"
|
||||
"@floating-ui/react": "npm:0.27.13"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/i18n": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/i18n": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@hello-pangea/dnd": "npm:18.0.1"
|
||||
"@leeoniya/ufuzzy": "npm:1.0.18"
|
||||
"@lezer/common": "npm:1.2.3"
|
||||
@@ -3507,16 +3507,16 @@ __metadata:
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@grafana/runtime@npm:12.1.5, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
|
||||
"@grafana/runtime@npm:12.1.4, @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:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/faro-web-sdk": "npm:^1.13.2"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@rollup/plugin-node-resolve": "npm:16.0.1"
|
||||
"@rollup/plugin-terser": "npm:0.4.4"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
@@ -3595,7 +3595,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@grafana/schema@npm:12.1.5, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
|
||||
"@grafana/schema@npm:12.1.4, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
|
||||
version: 0.0.0-use.local
|
||||
resolution: "@grafana/schema@workspace:packages/grafana-schema"
|
||||
dependencies:
|
||||
@@ -3612,18 +3612,18 @@ __metadata:
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@grafana/sql@npm:12.1.5, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
|
||||
"@grafana/sql@npm:12.1.4, @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.13.5"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/i18n": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/i18n": "npm:12.1.4"
|
||||
"@grafana/plugin-ui": "npm:0.10.7"
|
||||
"@grafana/runtime": "npm:12.1.5"
|
||||
"@grafana/runtime": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@grafana/ui": "npm:12.1.5"
|
||||
"@grafana/ui": "npm:12.1.4"
|
||||
"@react-awesome-query-builder/ui": "npm:6.6.15"
|
||||
"@testing-library/dom": "npm:10.4.0"
|
||||
"@testing-library/jest-dom": "npm:^6.1.2"
|
||||
@@ -3676,7 +3676,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@grafana/ui@npm:12.1.5, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
|
||||
"@grafana/ui@npm:12.1.4, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
|
||||
version: 0.0.0-use.local
|
||||
resolution: "@grafana/ui@workspace:packages/grafana-ui"
|
||||
dependencies:
|
||||
@@ -3686,11 +3686,11 @@ __metadata:
|
||||
"@emotion/serialize": "npm:1.3.3"
|
||||
"@faker-js/faker": "npm:^9.0.0"
|
||||
"@floating-ui/react": "npm:0.27.13"
|
||||
"@grafana/data": "npm:12.1.5"
|
||||
"@grafana/e2e-selectors": "npm:12.1.5"
|
||||
"@grafana/data": "npm:12.1.4"
|
||||
"@grafana/e2e-selectors": "npm:12.1.4"
|
||||
"@grafana/faro-web-sdk": "npm:^1.13.2"
|
||||
"@grafana/i18n": "npm:12.1.5"
|
||||
"@grafana/schema": "npm:12.1.5"
|
||||
"@grafana/i18n": "npm:12.1.4"
|
||||
"@grafana/schema": "npm:12.1.4"
|
||||
"@grafana/tsconfig": "npm:^2.0.0"
|
||||
"@hello-pangea/dnd": "npm:18.0.1"
|
||||
"@monaco-editor/react": "npm:4.7.0"
|
||||
|
||||
Reference in New Issue
Block a user