Compare commits

...

3 Commits

Author SHA1 Message Date
github-actions[bot]
5c0fc245ed Release: 11.3.7+security-01 (#106659)
* Update changelog

* Update version to 11.3.7+security-01

* Update changelog

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
Co-authored-by: Matias Chomicki <matyax@gmail.com>
2025-06-12 19:04:59 +02:00
Yuri Tseretyan
ee4fa56835 fix integration test 2025-05-23 13:57:21 -04:00
Yuri Tseretyan
19c912476d declare dingding url as secret
patch raw settings before parsing because DingDing's config parser does not know about secrets
2025-05-14 12:09:32 -04:00
60 changed files with 274 additions and 211 deletions

View File

@@ -1,3 +1,12 @@
<!-- 11.3.7+security-01 START -->
# 11.3.7+security-01 (2025-06-12)
### Bug fixes
- **Security:** Fixed CVE-2025-3415
<!-- 11.3.7+security-01 END -->
<!-- 11.3.6 START -->
# 11.3.6 (2025-04-22)

View File

@@ -1,6 +1,6 @@
{
"name": "@test-plugins/extensions-test-app",
"version": "11.3.7",
"version": "11.3.8",
"private": true,
"scripts": {
"build": "webpack -c ./webpack.config.ts --env production",
@@ -12,7 +12,7 @@
"license": "Apache-2.0",
"devDependencies": {
"@grafana/eslint-config": "7.0.0",
"@grafana/plugin-configs": "11.3.7",
"@grafana/plugin-configs": "11.3.8",
"@types/lodash": "4.17.7",
"@types/node": "20.14.14",
"@types/prismjs": "1.26.4",

View File

@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"npmClient": "yarn",
"version": "11.3.7"
"version": "11.3.8"
}

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"private": true,
"name": "grafana",
"version": "11.3.7",
"version": "11.3.8",
"repository": "github:grafana/grafana",
"scripts": {
"build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/data",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana Data Library",
"keywords": [
"typescript"
@@ -36,7 +36,7 @@
},
"dependencies": {
"@braintree/sanitize-url": "7.0.1",
"@grafana/schema": "11.3.7",
"@grafana/schema": "11.3.8",
"@types/d3-interpolate": "^3.0.0",
"@types/string-hash": "1.1.3",
"d3-interpolate": "3.0.1",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/e2e-selectors",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana End-to-End Test Selectors Library",
"keywords": [
"cli",

View File

@@ -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.3.7",
"version": "11.3.8",
"main": "./index.cjs",
"author": "Grafana Labs",
"license": "Apache-2.0",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/flamegraph",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana flamegraph visualization component",
"keywords": [
"grafana",
@@ -44,8 +44,8 @@
],
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/ui": "11.3.8",
"@leeoniya/ufuzzy": "1.0.14",
"d3": "^7.8.5",
"lodash": "4.17.21",

View File

@@ -1,6 +1,6 @@
{
"name": "@grafana/saga-icons",
"version": "11.3.7",
"version": "11.3.8",
"private": true,
"description": "Icons for Grafana",
"author": "Grafana Labs",

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"name": "@grafana/o11y-ds-frontend",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"description": "Library to manage traces in Grafana.",
"sideEffects": false,
"repository": {
@@ -18,12 +18,12 @@
},
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/e2e-selectors": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"react-select": "5.8.1",
"react-use": "17.5.1",
"rxjs": "7.8.1",

View File

@@ -2,7 +2,7 @@
"name": "@grafana/plugin-configs",
"description": "Shared dependencies and files for core plugins",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"tslib": "2.7.0"
},

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "AGPL-3.0-only",
"name": "@grafana/prometheus",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana Prometheus Library",
"keywords": [
"typescript"
@@ -38,12 +38,12 @@
"dependencies": {
"@emotion/css": "11.13.4",
"@floating-ui/react": "0.26.24",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/faro-web-sdk": "1.10.2",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"@hello-pangea/dnd": "16.6.0",
"@leeoniya/ufuzzy": "1.0.14",
"@lezer/common": "1.2.2",
@@ -76,7 +76,7 @@
},
"devDependencies": {
"@emotion/eslint-plugin": "11.12.0",
"@grafana/e2e-selectors": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/tsconfig": "^2.0.0",
"@rollup/plugin-image": "3.0.3",
"@rollup/plugin-node-resolve": "15.3.0",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/runtime",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana Runtime Library",
"keywords": [
"grafana",
@@ -37,11 +37,11 @@
"postpack": "mv package.json.bak package.json"
},
"dependencies": {
"@grafana/data": "11.3.7",
"@grafana/e2e-selectors": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/faro-web-sdk": "^1.3.6",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"history": "4.10.1",
"lodash": "4.17.21",
"rxjs": "7.8.1",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/schema",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana Schema Library",
"keywords": [
"typescript"

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
limit: number;

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
/**

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.OptionsWithLegend, common.SingleStatBaseOptions {
displayMode: common.BarGaugeDisplayMode;

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export enum VizDisplayMode {
Candles = 'candles',

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export enum HorizontalConstraint {
Center = 'center',

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface MetricStat {
/**

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
/**

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
selectedSeries: number;

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export type UpdateConfig = {
render: boolean,

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.SingleStatBaseOptions {
minVizHeight: number;

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
basemap: ui.MapLayerOptions;

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
/**
* Controls the color mode of the heatmap

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
/**

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
dedupStrategy: common.LogsDedupStrategy;

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export enum QueryEditorMode {
Builder = 'builder',

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
/**

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface ArcOption {
/**

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
/**
* Select the pie chart display style.

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.SingleStatBaseOptions {
colorMode: common.BigValueColorMode;

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
/**

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
/**

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options {
/**

View File

@@ -8,7 +8,7 @@
//
// Run 'make gen-cue' from repository root to regenerate.
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export enum TextMode {
Code = 'code',

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
export interface Options extends common.OptionsWithTimezones {
legend: common.VizLegendOptions;

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
/**
* Identical to timeseries... except it does not have timezone settings

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "11.3.7";
export const pluginVersion = "11.3.8";
/**
* Auto is "table" in the UI

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"private": true,
"name": "@grafana/sql",
"version": "11.3.7",
"version": "11.3.8",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git",
@@ -15,11 +15,11 @@
},
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/e2e-selectors": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/ui": "11.3.8",
"@react-awesome-query-builder/ui": "6.6.3",
"immutable": "4.3.7",
"lodash": "4.17.21",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/ui",
"version": "11.3.7",
"version": "11.3.8",
"description": "Grafana Components Library",
"keywords": [
"grafana",
@@ -51,10 +51,10 @@
"@emotion/react": "11.13.3",
"@emotion/serialize": "1.3.2",
"@floating-ui/react": "0.26.24",
"@grafana/data": "11.3.7",
"@grafana/e2e-selectors": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/faro-web-sdk": "^1.3.6",
"@grafana/schema": "11.3.7",
"@grafana/schema": "11.3.8",
"@hello-pangea/dnd": "16.6.0",
"@leeoniya/ufuzzy": "1.0.14",
"@monaco-editor/react": "4.6.0",

View File

@@ -385,6 +385,10 @@ func (am *alertmanager) AppURL() string {
// buildReceiverIntegrations builds a list of integration notifiers off of a receiver config.
func (am *alertmanager) buildReceiverIntegrations(receiver *alertingNotify.APIReceiver, tmpl *alertingTemplates.Template) ([]*alertingNotify.Integration, error) {
err := patchNewSecureFields(context.Background(), receiver, am.decryptFn)
if err != nil {
return nil, err
}
receiverCfg, err := alertingNotify.BuildReceiverConfiguration(context.Background(), receiver, am.decryptFn)
if err != nil {
return nil, err
@@ -411,6 +415,52 @@ func (am *alertmanager) buildReceiverIntegrations(receiver *alertingNotify.APIRe
return integrations, nil
}
func patchNewSecureFields(ctx context.Context, api *alertingNotify.APIReceiver, decrypt alertingNotify.GetDecryptedValueFn) error {
for _, integration := range api.Integrations {
switch integration.Type {
case "dingding":
err := patchSettingsFromSecureSettings(ctx, integration, "url", decrypt)
if err != nil {
return err
}
}
}
return nil
}
func patchSettingsFromSecureSettings(ctx context.Context, integration *alertingNotify.GrafanaIntegrationConfig, key string, decrypt alertingNotify.GetDecryptedValueFn) error {
var encrypted string
var ok bool
if encrypted, ok = integration.SecureSettings[key]; !ok {
return nil
}
decoded, err := decode(encrypted)
if err != nil {
return err
}
settings := map[string]any{}
err = json.Unmarshal(integration.Settings, &settings)
if err != nil {
return err
}
currentValue, ok := settings[key]
currentString := ""
if ok {
currentString, _ = currentValue.(string)
}
secretValue := decrypt(ctx, map[string][]byte{key: decoded}, key, currentString)
if secretValue == currentString {
return nil
}
settings[key] = secretValue
data, err := json.Marshal(settings)
if err != nil {
return err
}
integration.Settings = data
return nil
}
// PutAlerts receives the alerts and then sends them through the corresponding route based on whenever the alert has a receiver embedded or not
func (am *alertmanager) PutAlerts(_ context.Context, postableAlerts apimodels.PostableAlerts) error {
alerts := make(alertingNotify.PostableAlerts, 0, len(postableAlerts.PostableAlerts))

View File

@@ -126,6 +126,7 @@ func GetAvailableNotifiers() []*NotifierPlugin {
Placeholder: "https://oapi.dingtalk.com/robot/send?access_token=xxxxxxxxx",
PropertyName: "url",
Required: true,
Secure: true,
},
{
Label: "Message Type",

View File

@@ -11,7 +11,7 @@ func TestGetSecretKeysForContactPointType(t *testing.T) {
receiverType string
expectedSecretFields []string
}{
{receiverType: "dingding", expectedSecretFields: []string{}},
{receiverType: "dingding", expectedSecretFields: []string{"url"}},
{receiverType: "kafka", expectedSecretFields: []string{"password"}},
{receiverType: "email", expectedSecretFields: []string{}},
{receiverType: "pagerduty", expectedSecretFields: []string{"integrationKey"}},

View File

@@ -23,12 +23,17 @@ func (am *alertmanager) TestReceivers(ctx context.Context, c apimodels.TestRecei
SecureSettings: gr.SecureSettings,
})
}
receivers = append(receivers, &alertingNotify.APIReceiver{
recv := &alertingNotify.APIReceiver{
ConfigReceiver: r.Receiver,
GrafanaIntegrations: alertingNotify.GrafanaIntegrations{
Integrations: integrations,
},
})
}
err := patchNewSecureFields(ctx, recv, am.decryptFn)
if err != nil {
return nil, 0, err
}
receivers = append(receivers, recv)
}
var alert *alertingNotify.TestReceiversConfigAlertParams
if c.Alert != nil {

View File

@@ -2146,10 +2146,8 @@ var expAlertmanagerConfigFromAPI = `
"name": "dingding_test",
"type": "dingding",
"disableResolveMessage": false,
"settings": {
"url": "http://CHANNEL_ADDR/dingding_recv/dingding_test"
},
"secureFields": {}
"settings": {},
"secureFields": {"url": true}
}
]
},

View File

@@ -2,14 +2,14 @@
"name": "@grafana-plugins/grafana-azure-monitor-datasource",
"description": "Grafana data source for Azure Monitor",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"@kusto/monaco-kusto": "^10.0.0",
"fast-deep-equal": "^3.1.3",
"i18next": "^23.0.0",
@@ -25,8 +25,8 @@
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

View File

@@ -2,15 +2,15 @@
"name": "@grafana-plugins/stackdriver",
"description": "Grafana data source for Google Cloud Monitoring",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/google-sdk": "0.1.2",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"debounce-promise": "3.1.2",
"fast-deep-equal": "^3.1.3",
"i18next": "^23.0.0",
@@ -26,8 +26,8 @@
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

View File

@@ -2,22 +2,22 @@
"name": "@grafana-plugins/grafana-postgresql-datasource",
"description": "PostgreSQL data source plugin",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/sql": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/sql": "11.3.8",
"@grafana/ui": "11.3.8",
"lodash": "4.17.21",
"react": "18.2.0",
"rxjs": "7.8.1",
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.13",

View File

@@ -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.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"fast-deep-equal": "^3.1.3",
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
@@ -20,7 +20,7 @@
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/plugin-configs": "11.3.7",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",

View File

@@ -2,14 +2,14 @@
"name": "@grafana-plugins/grafana-testdata-datasource",
"description": "Generates test data in different forms",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"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.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

View File

@@ -2,7 +2,7 @@
"name": "@grafana-plugins/jaeger",
"description": "Jaeger plugin for Grafana",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "workspace:*",

View File

@@ -2,22 +2,22 @@
"name": "@grafana-plugins/mssql",
"description": "MSSQL data source plugin",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/sql": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/sql": "11.3.8",
"@grafana/ui": "11.3.8",
"lodash": "4.17.21",
"react": "18.2.0",
"rxjs": "7.8.1",
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.13",

View File

@@ -2,22 +2,22 @@
"name": "@grafana-plugins/mysql",
"description": "MySQL data source plugin",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/experimental": "2.1.1",
"@grafana/runtime": "11.3.7",
"@grafana/sql": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/runtime": "11.3.8",
"@grafana/sql": "11.3.8",
"@grafana/ui": "11.3.8",
"lodash": "4.17.21",
"react": "18.2.0",
"rxjs": "7.8.1",
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.3.7",
"@grafana/plugin-configs": "11.3.7",
"@grafana/e2e-selectors": "11.3.8",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.13",

View File

@@ -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.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "11.3.7",
"@grafana/runtime": "11.3.7",
"@grafana/schema": "11.3.7",
"@grafana/ui": "11.3.7",
"@grafana/data": "11.3.8",
"@grafana/runtime": "11.3.8",
"@grafana/schema": "11.3.8",
"@grafana/ui": "11.3.8",
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"react": "18.2.0",
@@ -18,7 +18,7 @@
"tslib": "2.7.0"
},
"devDependencies": {
"@grafana/plugin-configs": "11.3.7",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

View File

@@ -2,7 +2,7 @@
"name": "@grafana-plugins/tempo",
"description": "Grafana plugin for the Tempo data source.",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "workspace:*",
@@ -39,7 +39,7 @@
"uuid": "9.0.1"
},
"devDependencies": {
"@grafana/plugin-configs": "11.3.7",
"@grafana/plugin-configs": "11.3.8",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",

View File

@@ -2,7 +2,7 @@
"name": "@grafana-plugins/zipkin",
"description": "Zipkin plugin for Grafana",
"private": true,
"version": "11.3.7",
"version": "11.3.8",
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "workspace:*",

158
yarn.lock
View File

@@ -3133,13 +3133,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@kusto/monaco-kusto": "npm:^10.0.0"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
@@ -3177,13 +3177,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/sql": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/sql": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
"@types/jest": "npm:29.5.13"
@@ -3208,11 +3208,11 @@ __metadata:
resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:6.4.2"
"@testing-library/react": "npm:15.0.2"
@@ -3249,13 +3249,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@@ -3332,13 +3332,13 @@ __metadata:
resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/sql": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/sql": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
"@types/jest": "npm:29.5.13"
@@ -3363,13 +3363,13 @@ __metadata:
resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/sql": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/sql": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
"@types/jest": "npm:29.5.13"
@@ -3394,11 +3394,11 @@ __metadata:
resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@@ -3426,14 +3426,14 @@ __metadata:
resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/google-sdk": "npm:0.1.2"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/ui": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/ui": "npm:11.3.8"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@@ -3481,7 +3481,7 @@ __metadata:
"@grafana/lezer-traceql": "npm:0.0.19"
"@grafana/monaco-logql": "npm:^0.0.7"
"@grafana/o11y-ds-frontend": "workspace:*"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "workspace:*"
"@grafana/schema": "workspace:*"
"@grafana/ui": "workspace:*"
@@ -3591,12 +3591,12 @@ __metadata:
languageName: node
linkType: hard
"@grafana/data@npm:11.3.7, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
"@grafana/data@npm:11.3.8, @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.3.7"
"@grafana/schema": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@rollup/plugin-node-resolve": "npm:15.3.0"
"@types/d3-interpolate": "npm:^3.0.0"
@@ -3644,7 +3644,7 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/e2e-selectors@npm:11.3.7, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
"@grafana/e2e-selectors@npm:11.3.8, @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:
@@ -3770,9 +3770,9 @@ __metadata:
"@babel/preset-env": "npm:7.25.7"
"@babel/preset-react": "npm:7.25.7"
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:11.3.7"
"@grafana/ui": "npm:11.3.8"
"@leeoniya/ufuzzy": "npm:1.0.14"
"@rollup/plugin-node-resolve": "npm:15.3.0"
"@testing-library/dom": "npm:10.0.0"
@@ -3854,13 +3854,13 @@ __metadata:
resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
dependencies:
"@emotion/css": "npm:11.13.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:11.3.7"
"@grafana/ui": "npm:11.3.8"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:^6.1.2"
"@testing-library/react": "npm:15.0.2"
@@ -3885,7 +3885,7 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/plugin-configs@npm:11.3.7, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
"@grafana/plugin-configs@npm:11.3.8, @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:
@@ -3925,14 +3925,14 @@ __metadata:
"@emotion/css": "npm:11.13.4"
"@emotion/eslint-plugin": "npm:11.12.0"
"@floating-ui/react": "npm:0.26.24"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/faro-web-sdk": "npm:1.10.2"
"@grafana/runtime": "npm:11.3.7"
"@grafana/schema": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.8"
"@grafana/schema": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:11.3.7"
"@grafana/ui": "npm:11.3.8"
"@hello-pangea/dnd": "npm:16.6.0"
"@leeoniya/ufuzzy": "npm:1.0.14"
"@lezer/common": "npm:1.2.2"
@@ -4029,16 +4029,16 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/runtime@npm:11.3.7, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
"@grafana/runtime@npm:11.3.8, @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.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/faro-web-sdk": "npm:^1.3.6"
"@grafana/schema": "npm:11.3.7"
"@grafana/schema": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:11.3.7"
"@grafana/ui": "npm:11.3.8"
"@rollup/plugin-node-resolve": "npm:15.3.0"
"@rollup/plugin-terser": "npm:0.4.4"
"@testing-library/dom": "npm:10.0.0"
@@ -4129,7 +4129,7 @@ __metadata:
languageName: node
linkType: hard
"@grafana/schema@npm:11.3.7, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
"@grafana/schema@npm:11.3.8, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
version: 0.0.0-use.local
resolution: "@grafana/schema@workspace:packages/grafana-schema"
dependencies:
@@ -4147,17 +4147,17 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/sql@npm:11.3.7, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
"@grafana/sql@npm:11.3.8, @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.4"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/experimental": "npm:2.1.1"
"@grafana/runtime": "npm:11.3.7"
"@grafana/runtime": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:11.3.7"
"@grafana/ui": "npm:11.3.8"
"@react-awesome-query-builder/ui": "npm:6.6.3"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:^6.1.2"
@@ -4200,7 +4200,7 @@ __metadata:
languageName: node
linkType: hard
"@grafana/ui@npm:11.3.7, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
"@grafana/ui@npm:11.3.8, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
version: 0.0.0-use.local
resolution: "@grafana/ui@workspace:packages/grafana-ui"
dependencies:
@@ -4210,10 +4210,10 @@ __metadata:
"@emotion/serialize": "npm:1.3.2"
"@faker-js/faker": "npm:^9.0.0"
"@floating-ui/react": "npm:0.26.24"
"@grafana/data": "npm:11.3.7"
"@grafana/e2e-selectors": "npm:11.3.7"
"@grafana/data": "npm:11.3.8"
"@grafana/e2e-selectors": "npm:11.3.8"
"@grafana/faro-web-sdk": "npm:^1.3.6"
"@grafana/schema": "npm:11.3.7"
"@grafana/schema": "npm:11.3.8"
"@grafana/tsconfig": "npm:^2.0.0"
"@hello-pangea/dnd": "npm:16.6.0"
"@leeoniya/ufuzzy": "npm:1.0.14"
@@ -9162,7 +9162,7 @@ __metadata:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "workspace:*"
"@grafana/eslint-config": "npm:7.0.0"
"@grafana/plugin-configs": "npm:11.3.7"
"@grafana/plugin-configs": "npm:11.3.8"
"@grafana/runtime": "workspace:*"
"@grafana/schema": "workspace:*"
"@grafana/ui": "workspace:*"