Compare commits

...

4 Commits

Author SHA1 Message Date
github-actions[bot]
ab79ac818f Release: 12.1.3+security-01 (#114150)
* Update changelog

* Update version to 12.1.3+security-01

* Revert "Update version to 12.1.3+security-01"

This reverts commit 8b7fd796d8.

* update changelog

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
2025-11-19 14:42:55 +00:00
Stephanie Hingtgen
7c01f54315 Frontend tests: Fix for timechange (#113338)
(cherry picked from commit 6d9e28a59f)
2025-11-12 08:28:33 +01:00
Kevin Minehart
2b14387b8e [release-12.1.3] update windows build (#113202)
* [release-12.1.4] pkg/build: Add nocgo option (#112893)

* pkg/build: Add nocgo option (#112834)

Add nocgo option

(cherry picked from commit 2a0f149a63)

* CI: release windows no cgo (#112870)

* fix nocgo option

* set nocgo for windows and darwin

(cherry picked from commit 6b2b9bd7c2)
(cherry picked from commit 9aaa364229)

* [release-12.1.4] CI: Windows builds with CGO cross-compiler toolchain (#112935)

CI: Windows builds with CGO cross-compiler toolchain (#112922)

* CI: Windows builds with CGO cross-compiler toolchain

* fix comments

(cherry picked from commit e7a49fc472)
(cherry picked from commit 444e7f42a8)
2025-10-30 10:06:28 +01:00
github-actions[bot]
fce1b2b6cf Release: 12.1.3 (#112735)
* Update changelog

* Update version to 12.1.3

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
2025-10-21 16:17:15 +02:00
65 changed files with 377 additions and 258 deletions

View File

@@ -1,3 +1,30 @@
<!-- 12.1.3+security-01 START -->
# 12.1.3+security-01 (2025-11-19)
### Bug fixes
- **Security:** fix for CVE-2025-41115 in SCIM (System for Cross-domain Identity Management) (Enterprise)
<!-- 12.1.3+security-01 END -->
<!-- 12.1.3 START -->
# 12.1.3 (2025-10-21)
### Features and enhancements
- **Go:** Update to 1.25.2 + golangci-lint v2.5.0 + golang.org/x/net v0.45.0 [#112159](https://github.com/grafana/grafana/pull/112159), [@macabu](https://github.com/macabu)
- **Go:** Update to 1.25.3 [#112362](https://github.com/grafana/grafana/pull/112362), [@macabu](https://github.com/macabu)
- **Table:** Avoid thrown error due to internal React issue [#111945](https://github.com/grafana/grafana/pull/111945), [@fastfrwrd](https://github.com/fastfrwrd)
### Bug fixes
- **Auth:** Fix render user OAuth passthrough [#112097](https://github.com/grafana/grafana/pull/112097), [@mgyongyosi](https://github.com/mgyongyosi)
- **FlameGraph:** Ensure total is only counted once for recursive function calls [#111605](https://github.com/grafana/grafana/pull/111605), [@simonswine](https://github.com/simonswine)
- **LDAP Authentication:** Fix URL to propagate username context as parameter [#111848](https://github.com/grafana/grafana/pull/111848), [@bradleypettit](https://github.com/bradleypettit)
- **Plugins:** Dependencies do not inherit parent URL for preinstall [#111767](https://github.com/grafana/grafana/pull/111767), [@wbrowne](https://github.com/wbrowne)
<!-- 12.1.3 END -->
<!-- 12.1.2 START -->
# 12.1.2 (2025-09-23)

View File

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

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"private": true,
"name": "grafana",
"version": "12.1.3",
"version": "12.1.4",
"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/alerting",
"version": "12.1.3",
"version": "12.1.4",
"description": "Grafana Alerting Library Build vertical integrations on top of the industry-leading alerting solution",
"keywords": [
"typescript",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/data",
"version": "12.1.3",
"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.3",
"@grafana/schema": "12.1.4",
"@leeoniya/ufuzzy": "1.0.18",
"@types/d3-interpolate": "^3.0.0",
"@types/string-hash": "1.1.3",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/e2e-selectors",
"version": "12.1.3",
"version": "12.1.4",
"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": "12.1.3",
"version": "12.1.4",
"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": "12.1.3",
"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.3",
"@grafana/ui": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/ui": "12.1.4",
"@leeoniya/ufuzzy": "1.0.18",
"d3": "^7.8.5",
"lodash": "4.17.21",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/i18n",
"version": "12.1.3",
"version": "12.1.4",
"description": "Grafana Internationalization Library",
"keywords": [
"grafana",

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"name": "@grafana/o11y-ds-frontend",
"private": true,
"version": "12.1.3",
"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.3",
"@grafana/e2e-selectors": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/e2e-selectors": "12.1.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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",

View File

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

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "AGPL-3.0-only",
"name": "@grafana/prometheus",
"version": "12.1.3",
"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.3",
"@grafana/e2e-selectors": "12.1.3",
"@grafana/i18n": "12.1.3",
"@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.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/runtime",
"version": "12.1.3",
"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.3",
"@grafana/e2e-selectors": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/e2e-selectors": "12.1.4",
"@grafana/faro-web-sdk": "^1.13.2",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@grafana/schema": "12.1.4",
"@grafana/ui": "12.1.4",
"@types/systemjs": "6.15.3",
"history": "4.10.1",
"lodash": "4.17.21",

View File

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

View File

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

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "12.1.3";
export const pluginVersion = "12.1.4";
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 = "12.1.3";
export const pluginVersion = "12.1.4";
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 = "12.1.3";
export const pluginVersion = "12.1.4";
export enum VizDisplayMode {
Candles = 'candles',

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "12.1.3";
export const pluginVersion = "12.1.4";
export interface Options {
controlsStorageKey?: string;

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "12.1.3";
export const pluginVersion = "12.1.4";
export interface Options {
controlsStorageKey?: string;

View File

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

View File

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

View File

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

View File

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

View File

@@ -10,7 +10,7 @@
import * as ui from '@grafana/schema';
export const pluginVersion = "12.1.3";
export const pluginVersion = "12.1.4";
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 = "12.1.3";
export const pluginVersion = "12.1.4";
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 = "12.1.3";
export const pluginVersion = "12.1.4";
export interface Options {
/**

View File

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

View File

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

View File

@@ -10,7 +10,7 @@
import * as common from '@grafana/schema';
export const pluginVersion = "12.1.3";
export const pluginVersion = "12.1.4";
/**
* 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 = "12.1.3";
export const pluginVersion = "12.1.4";
export enum PointShape {
Circle = 'circle',

View File

@@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"private": true,
"name": "@grafana/sql",
"version": "12.1.3",
"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.3",
"@grafana/e2e-selectors": "12.1.3",
"@grafana/i18n": "12.1.3",
"@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.3",
"@grafana/ui": "12.1.3",
"@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",

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/test-utils",
"version": "12.1.3",
"version": "12.1.4",
"private": true,
"description": "Grafana test utils & Mock API",
"keywords": [

View File

@@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/ui",
"version": "12.1.3",
"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.3",
"@grafana/e2e-selectors": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/e2e-selectors": "12.1.4",
"@grafana/faro-web-sdk": "^1.13.2",
"@grafana/i18n": "12.1.3",
"@grafana/schema": "12.1.3",
"@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",

View File

@@ -187,14 +187,14 @@ describe('TimePickerTooltip', () => {
it('renders time range without timezone if timezone is not passed in', () => {
render(<TimePickerTooltip timeRange={timeRange} />);
expect(screen.queryByText('United States, EDT')).not.toBeInTheDocument();
expect(screen.queryByText(/United States, E[DS]T/)).not.toBeInTheDocument();
});
it('renders time range with browser timezone', () => {
render(<TimePickerTooltip timeRange={timeRange} timeZone="browser" />);
expect(screen.getByText('Local browser time')).toBeInTheDocument();
expect(screen.getByText('United States, EDT')).toBeInTheDocument(); // this was mocked at the beginning, in beforeAll block
expect(screen.getByText(/United States, E[DS]T/)).toBeInTheDocument(); // this was mocked at the beginning, in beforeAll block. matches either daylight savings time or standard time
});
it('renders time range with specific timezone', () => {

View File

@@ -132,6 +132,7 @@ type NewBackendOpts struct {
Tags []string
Static bool
WireTag string
CGOEnabled bool
GoBuildCache *dagger.CacheVolume
GoModCache *dagger.CacheVolume
}
@@ -198,6 +199,12 @@ func NewBackendFromString(ctx context.Context, log *slog.Logger, artifact string
goCacheProg = val
}
cgoDisabled, err := options.Bool(flags.CGODisabled)
if err != nil {
return nil, err
}
cgoEnabled := !cgoDisabled
bopts := &backend.BuildOpts{
Version: p.Version,
Enterprise: p.Enterprise,
@@ -206,6 +213,7 @@ func NewBackendFromString(ctx context.Context, log *slog.Logger, artifact string
Static: static,
WireTag: wireTag,
Tags: tags,
CGOEnabled: cgoEnabled,
}
return pipeline.ArtifactWithLogging(ctx, log, &pipeline.Artifact{
@@ -233,9 +241,10 @@ func NewBackend(ctx context.Context, log *slog.Logger, artifact string, opts *Ne
Tags: opts.Tags,
Static: opts.Static,
WireTag: opts.WireTag,
CGOEnabled: opts.CGOEnabled,
}
log.Info("Initializing backend artifact with options", "static", opts.Static, "version", opts.Version, "name", opts.Name, "distro", opts.Distribution)
log.Info("Initializing backend artifact with options", "static", opts.Static, "version", opts.Version, "name", opts.Name, "distro", opts.Distribution, "cgo enabled", opts.CGOEnabled)
return pipeline.ArtifactWithLogging(ctx, log, &pipeline.Artifact{
ArtifactString: artifact,
Type: pipeline.ArtifactTypeDirectory,

View File

@@ -121,7 +121,12 @@ func NewTarballFromString(ctx context.Context, log *slog.Logger, artifact string
if err != nil {
return nil, err
}
return NewTarball(ctx, log, artifact, p.Distribution, p.Enterprise, p.Name, p.Version, p.BuildID, src, yarnCache, goModCache, goBuildCache, static, wireTag, tags, goVersion, viceroyVersion, experiments)
cgoDisabled, err := options.Bool(flags.CGODisabled)
if err != nil {
return nil, err
}
cgoEnabled := !cgoDisabled
return NewTarball(ctx, log, artifact, p.Distribution, p.Enterprise, p.Name, p.Version, p.BuildID, src, yarnCache, goModCache, goBuildCache, static, wireTag, tags, goVersion, viceroyVersion, experiments, cgoEnabled)
}
// NewTarball returns a properly initialized Tarball artifact.
@@ -145,6 +150,7 @@ func NewTarball(
goVersion string,
viceroyVersion string,
experiments []string,
cgoEnabled bool,
) (*pipeline.Artifact, error) {
backendArtifact, err := NewBackend(ctx, log, artifact, &NewBackendOpts{
Name: name,
@@ -160,6 +166,7 @@ func NewTarball(
Enterprise: enterprise,
GoBuildCache: goBuildCache,
GoModCache: goModCache,
CGOEnabled: cgoEnabled,
})
if err != nil {
return nil, err

View File

@@ -62,7 +62,7 @@ func Build(
ldflags := LDFlagsDynamic(vcsinfo)
if opts.Static {
if opts.Static && opts.CGOEnabled {
ldflags = LDFlagsStatic(vcsinfo)
}

View File

@@ -19,9 +19,23 @@ type BuildOpts struct {
GoCacheProg string
Static bool
Enterprise bool
CGOEnabled bool
}
func distroOptsFunc(log *slog.Logger, distro Distribution) (DistroBuildOptsFunc, error) {
func distroOptsFunc(log *slog.Logger, distro Distribution, opts *BuildOpts) (DistroBuildOptsFunc, error) {
if !opts.CGOEnabled {
return func(distro Distribution, experiments, tags []string) *GoBuildOpts {
os, arch := OSAndArch(distro)
archv := ArchVersion(distro)
return &GoBuildOpts{
OS: os,
Arch: arch,
GoARM: GoARM(archv),
CGOEnabled: false,
}
}, nil
}
if val, ok := DistributionGoOpts[distro]; ok {
return DistroOptsLogger(log, val), nil
}
@@ -29,7 +43,7 @@ func distroOptsFunc(log *slog.Logger, distro Distribution) (DistroBuildOptsFunc,
}
func WithGoEnv(log *slog.Logger, container *dagger.Container, distro Distribution, opts *BuildOpts) (*dagger.Container, error) {
fn, err := distroOptsFunc(log, distro)
fn, err := distroOptsFunc(log, distro, opts)
if err != nil {
return nil, err
}
@@ -39,7 +53,7 @@ func WithGoEnv(log *slog.Logger, container *dagger.Container, distro Distributio
}
func WithViceroyEnv(log *slog.Logger, container *dagger.Container, distro Distribution, opts *BuildOpts) (*dagger.Container, error) {
fn, err := distroOptsFunc(log, distro)
fn, err := distroOptsFunc(log, distro, opts)
if err != nil {
return nil, err
}
@@ -91,23 +105,30 @@ func GolangContainer(
opts *BuildOpts,
) (*dagger.Container, error) {
os, _ := OSAndArch(distro)
// Only use viceroy for all darwin and only windows/amd64
if os == "darwin" || distro == DistWindowsAMD64 {
// Only use viceroy for all darwin builds
if opts.CGOEnabled && os == "darwin" {
return ViceroyContainer(d, log, distro, goVersion, viceroyVersion, opts)
}
container := golang.Container(d, platform, goVersion).
WithExec([]string{"apk", "add", "--update", "wget", "build-base", "alpine-sdk", "musl", "musl-dev", "xz"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/zig-linux-x86_64-0.11.0.tar.xz"}).
WithExec([]string{"tar", "--strip-components=1", "-C", "/", "-xf", "zig-linux-x86_64-0.11.0.tar.xz"}).
WithExec([]string{"mv", "/zig", "/bin/zig"}).
// Install the toolchain specifically for armv7 until we figure out why it's crashing w/ zig container = container.
WithExec([]string{"mkdir", "/toolchain"}).
WithExec([]string{"wget", "-q", "http://dl.grafana.com/ci/arm-linux-musleabihf-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/arm-linux-musleabihf-cross.tgz", "-C", "/toolchain"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/s390x-linux-musl-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/s390x-linux-musl-cross.tgz", "-C", "/toolchain"})
container := golang.Container(d, platform, goVersion)
if opts.CGOEnabled {
container = container.
WithExec([]string{"apk", "add", "--update", "wget", "build-base", "alpine-sdk", "musl", "musl-dev", "xz"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/zig-linux-x86_64-0.11.0.tar.xz"}).
WithExec([]string{"tar", "--strip-components=1", "-C", "/", "-xf", "zig-linux-x86_64-0.11.0.tar.xz"}).
WithExec([]string{"mv", "/zig", "/bin/zig"}).
// Install the toolchain specifically for armv7 until we figure out why it's crashing w/ zig container = container.
WithExec([]string{"mkdir", "/toolchain"}).
WithExec([]string{"wget", "-q", "http://dl.grafana.com/ci/arm-linux-musleabihf-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/arm-linux-musleabihf-cross.tgz", "-C", "/toolchain"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/s390x-linux-musl-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/s390x-linux-musl-cross.tgz", "-C", "/toolchain"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/riscv64-linux-musl-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/riscv64-linux-musl-cross.tgz", "-C", "/toolchain"}).
WithExec([]string{"wget", "-q", "https://dl.grafana.com/ci/x86_64-w64-mingw32-cross.tgz", "-P", "/toolchain"}).
WithExec([]string{"tar", "-xf", "/toolchain/x86_64-w64-mingw32-cross.tgz", "-C", "/toolchain"})
}
return WithGoEnv(log, container, distro, opts)
}

View File

@@ -264,6 +264,38 @@ func BuildOptsStaticS390X(distro Distribution, experiments []string, tags []stri
}
}
// BuildOptsStaticRiscv64 builds Grafana statically for the riscv64 arch
func BuildOptsStaticRiscv64(distro Distribution, experiments []string, tags []string) *GoBuildOpts {
var (
os, _ = OSAndArch(distro)
)
return &GoBuildOpts{
CC: "/toolchain/riscv64-linux-musl-cross/bin/riscv64-linux-musl-gcc",
CXX: "/toolchain/riscv64-linux-musl-cross/bin/riscv64-linux-musl-cpp",
ExperimentalFlags: experiments,
OS: os,
Arch: "riscv64",
CGOEnabled: true,
}
}
// BuildOptsStaticWindows builds Grafana statically for Windows on amd64
func BuildOptsStaticWindows(distro Distribution, experiments []string, tags []string) *GoBuildOpts {
var (
os, _ = OSAndArch(distro)
)
return &GoBuildOpts{
CC: "/toolchain/x86_64-w64-mingw32-cross/bin/x86_64-w64-mingw32-gcc",
CXX: "/toolchain/x86_64-w64-mingw32-cross/bin/x86_64-w64-mingw32-cpp",
ExperimentalFlags: experiments,
OS: os,
Arch: "amd64",
CGOEnabled: true,
}
}
func StdZigBuildOpts(distro Distribution, experiments []string, tags []string) *GoBuildOpts {
var (
os, arch = OSAndArch(distro)
@@ -306,6 +338,19 @@ func ViceroyBuildOpts(distro Distribution, experiments []string, tags []string)
}
}
func BuildOptsNoCGO(distro Distribution, experiments []string, tags []string) *GoBuildOpts {
var (
os, arch = OSAndArch(distro)
)
return &GoBuildOpts{
ExperimentalFlags: experiments,
OS: os,
Arch: arch,
CGOEnabled: false,
}
}
var ZigTargets = map[Distribution]string{
DistLinuxAMD64: "x86_64-linux-musl",
DistLinuxAMD64Dynamic: "x86_64-linux-gnu",
@@ -331,11 +376,11 @@ var DistributionGoOpts = map[Distribution]DistroBuildOptsFunc{
DistLinuxAMD64: StdZigBuildOpts,
DistLinuxAMD64Dynamic: StdZigBuildOpts,
DistPlan9AMD64: StdZigBuildOpts,
DistLinuxRISCV64: StdZigBuildOpts,
DistLinuxRISCV64: BuildOptsStaticRiscv64,
// Non-Linux distros can have whatever they want in CC and CXX; it'll get overridden
// but it's probably not best to rely on that.
DistWindowsAMD64: ViceroyBuildOpts,
DistWindowsAMD64: BuildOptsStaticWindows,
DistWindowsARM64: StdZigBuildOpts,
DistDarwinAMD64: ViceroyBuildOpts,
DistDarwinARM64: ViceroyBuildOpts,

View File

@@ -82,6 +82,13 @@ func GoBuildEnv(opts *GoBuildOpts) []containers.Env {
// https://github.com/mattn/go-sqlite3/issues/1164#issuecomment-1635253695
env = append(env, containers.EnvVar("CGO_CFLAGS", "-D_LARGEFILE64_SOURCE"))
if opts.CC != "" {
env = append(env, containers.EnvVar("CC", opts.CC))
}
if opts.CXX != "" {
env = append(env, containers.EnvVar("CXX", opts.CXX))
}
} else {
env = append(env, containers.EnvVar("CGO_ENABLED", "0"))
}
@@ -90,14 +97,6 @@ func GoBuildEnv(opts *GoBuildOpts) []containers.Env {
env = append(env, containers.EnvVar("GOEXPERIMENT", strings.Join(opts.ExperimentalFlags, ",")))
}
if opts.CC != "" {
env = append(env, containers.EnvVar("CC", opts.CC))
}
if opts.CXX != "" {
env = append(env, containers.EnvVar("CXX", opts.CXX))
}
return env
}

View File

@@ -19,6 +19,7 @@ const (
GoTags pipeline.FlagOption = "go-tag"
GoExperiments pipeline.FlagOption = "go-experiments"
Sign pipeline.FlagOption = "sign"
CGODisabled pipeline.FlagOption = "nocgo"
// Pretty much only used to set the deb or RPM internal package name (and file name) to `{}-nightly` and/or `{}-rpi`
Nightly pipeline.FlagOption = "nightly"
@@ -81,6 +82,13 @@ var SignFlag = pipeline.Flag{
},
}
var CGODisabledFlag = pipeline.Flag{
Name: "nocgo",
Options: map[pipeline.FlagOption]any{
CGODisabled: true,
},
}
var NightlyFlag = pipeline.Flag{
Name: "nightly",
Options: map[pipeline.FlagOption]any{
@@ -95,5 +103,8 @@ func StdPackageFlags() []pipeline.Flag {
return JoinFlags(
distros,
names,
[]pipeline.Flag{
CGODisabledFlag,
},
)
}

View File

@@ -2,15 +2,15 @@
"name": "@grafana-plugins/grafana-azure-monitor-datasource",
"description": "Grafana data source for Azure Monitor",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/i18n": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/i18n": "12.1.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

View File

@@ -2,15 +2,15 @@
"name": "@grafana-plugins/stackdriver",
"description": "Grafana data source for Google Cloud Monitoring",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/google-sdk": "0.3.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

View File

@@ -2,22 +2,22 @@
"name": "@grafana-plugins/grafana-postgresql-datasource",
"description": "PostgreSQL data source plugin",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/sql": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

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": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@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",

View File

@@ -2,13 +2,13 @@
"name": "@grafana-plugins/grafana-testdata-datasource",
"description": "Generates test data in different forms",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

View File

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

View File

@@ -2,16 +2,16 @@
"name": "@grafana-plugins/loki",
"description": "Loki data source plugin for Grafana",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@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.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

View File

@@ -2,23 +2,23 @@
"name": "@grafana-plugins/mssql",
"description": "MSSQL data source plugin",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/i18n": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/i18n": "12.1.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/sql": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

View File

@@ -2,22 +2,22 @@
"name": "@grafana-plugins/mysql",
"description": "MySQL data source plugin",
"private": true,
"version": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/data": "12.1.4",
"@grafana/plugin-ui": "0.10.7",
"@grafana/runtime": "12.1.3",
"@grafana/sql": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@grafana/plugin-configs": "12.1.3",
"@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",

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": "12.1.3",
"version": "12.1.4",
"dependencies": {
"@emotion/css": "11.13.5",
"@grafana/data": "12.1.3",
"@grafana/runtime": "12.1.3",
"@grafana/schema": "12.1.3",
"@grafana/ui": "12.1.3",
"@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.3",
"@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",

View File

@@ -2,7 +2,7 @@
"name": "@grafana-plugins/tempo",
"description": "Grafana plugin for the Tempo data source.",
"private": true,
"version": "12.1.3",
"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.3",
"@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",

View File

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

180
yarn.lock
View File

@@ -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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/i18n": "npm:12.1.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@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.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@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.3"
"@grafana/sql": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@grafana/runtime": "npm:12.1.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@grafana/runtime": "npm:12.1.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@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.3"
"@grafana/runtime": "npm:12.1.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/i18n": "npm:12.1.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@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.3"
"@grafana/sql": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@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.3"
"@grafana/sql": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/plugin-configs": "npm:12.1.3"
"@grafana/runtime": "npm:12.1.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@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.3"
"@grafana/plugin-configs": "npm:12.1.4"
"@grafana/plugin-ui": "npm:0.10.7"
"@grafana/runtime": "npm:12.1.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/ui": "npm:12.1.3"
"@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.3"
"@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.3, @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.3"
"@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.3, @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.3"
"@grafana/data": "npm:12.1.4"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:12.1.3"
"@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.3, @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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@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.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/runtime": "npm:12.1.4"
"@grafana/schema": "npm:12.1.4"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:12.1.3"
"@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.3, @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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/i18n": "npm:12.1.3"
"@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.3"
"@grafana/schema": "npm:12.1.3"
"@grafana/runtime": "npm:12.1.4"
"@grafana/schema": "npm:12.1.4"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:12.1.3"
"@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.3, @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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@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.3"
"@grafana/schema": "npm:12.1.4"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:12.1.3"
"@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.3, @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.3, @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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@grafana/i18n": "npm:12.1.3"
"@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.3"
"@grafana/runtime": "npm:12.1.4"
"@grafana/tsconfig": "npm:^2.0.0"
"@grafana/ui": "npm:12.1.3"
"@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.3, @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.3"
"@grafana/e2e-selectors": "npm:12.1.3"
"@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.3"
"@grafana/schema": "npm:12.1.3"
"@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"