merge main

This commit is contained in:
Ryan McKinley 2024-06-14 09:08:14 +03:00
commit 9478befbcd
64 changed files with 363 additions and 394 deletions

View File

@ -27,9 +27,9 @@ refs:
# Stat
{{% admonition type="note" %}}
{{< admonition type="note" >}}
This visualization replaces the Singlestat visualization, which was deprecated in Grafana 7.0 and removed in Grafana 8.0.
{{% /admonition %}}
{{< /admonition >}}
A stat visualization displays your data in single values of interest&mdash;such as the latest or current value of a series&mdash;with an optional graph sparkline. A graph sparkline, which is only available in stat visualizations, is a small time-series graph shown in the background of each value in the visualization.
@ -157,9 +157,9 @@ Set whether wide layout is enabled or not. Wide layout is enabled by default.
- **On -** Wide layout is enabled.
- **Off -** Wide layout is disabled.
{{% admonition type="note" %}}
{{< admonition type="note" >}}
This option is only applicable when **Text mode** is set to **Value and name**. When wide layout is enabled, the value and name are displayed side-by-side with the value on the right, if the panel is wide enough. When wide layout is disabled, the value is always rendered underneath the name.
{{% /admonition %}}
{{< /admonition >}}
### Color mode
@ -188,19 +188,17 @@ Choose an alignment mode.
Set whether percent change is displayed or not. Disabled by default.
{{% admonition type="note" %}}
{{< admonition type="note" >}}
This option is not applicable when the **Show** setting, under **Value options**, is set to **All values**.
{{% /admonition %}}
{{< /admonition >}}
### Percent change color mode
- **Standard** -- Green if the percent change is positive, red if the percent change is negative.
- **Inverted** -- Red if the percent change is positive, green if the percent change is negative.
- **Same as Value** -- Use the same color as the value.
This option is only displayed when **Show percent change** is enabled. Choose from:
{{% admonition type="note" %}}
This option only appears when **Show percent change** is enabled.
{{% /admonition %}}
- **Standard -** Green if the percent change is positive, red if the percent change is negative.
- **Inverted -** Red if the percent change is positive, green if the percent change is negative.
- **Same as Value -** Use the same color as the value.
## Text size

View File

@ -120,9 +120,9 @@ If you set these in the Field tab, then the type will apply to all fields, inclu
### Auto
The Auto cell type will automatically display values with sensible defaults applied.
The **Auto** cell type automatically displays values, with sensible defaults applied.
Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides.
Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched field, if you've set a field override.
### Color text
@ -130,7 +130,7 @@ If thresholds are set, then the field text is displayed in the appropriate thres
{{< figure src="/static/img/docs/tables/color-text.png" max-width="500px" caption="Color text" class="docs-image--no-shadow" >}}
Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides.
Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched field, if you've set a field override.
### Color background (gradient or solid)
@ -142,7 +142,7 @@ Toggle the **Apply to entire row** switch, to apply the background color that's
{{< figure src="/static/img/docs/tables/colored-rows.png" max-width="500px" alt="Colored row background" class="docs-image--no-shadow" >}}
Toggle the **Wrap text** switch, to wrap text in the cell with the longest content or the matched field in the case of field overrides.
Toggle the **Wrap text** switch to wrap text in the cell with the longest content or the matched, if field you've set a field override.
### Gauge

View File

@ -59,6 +59,10 @@ refs:
# XY chart
{{< admonition type="note">}}
To use xy charts, enable the `autoMigrateXYChartPanel` [feature toggle](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/).
{{< /admonition >}}
XY charts provide a way to visualize arbitrary x and y values in a graph so that you can easily show the relationship between two variables. XY charts are typically used to create scatter plots. You can also use them to create bubble charts where field values determine the size of each bubble:
![An xy chart showing height weight distribution](/media/docs/grafana/panels-visualizations/screenshot-xy-charts-v11.0.png)

View File

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

View File

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

View File

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

View File

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

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.0.0",
"version": "11.2.0-pre",
"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.0.0",
"version": "11.2.0-pre",
"description": "Grafana flamegraph visualization component",
"keywords": [
"grafana",
@ -44,8 +44,8 @@
],
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"@leeoniya/ufuzzy": "1.0.14",
"d3": "^7.8.5",
"lodash": "4.17.21",

View File

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

View File

@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"name": "@grafana/o11y-ds-frontend",
"private": true,
"version": "11.0.0",
"version": "11.2.0-pre",
"description": "Library to manage traces in Grafana.",
"sideEffects": false,
"repository": {
@ -18,12 +18,12 @@
},
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/e2e-selectors": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/runtime": "11.0.0",
"@grafana/schema": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/schema": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",

View File

@ -2,7 +2,7 @@
"name": "@grafana/plugin-configs",
"description": "Shared dependencies and files for core plugins",
"private": true,
"version": "11.0.0",
"version": "11.2.0-pre",
"dependencies": {
"tslib": "2.6.3"
},

View File

@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "AGPL-3.0-only",
"name": "@grafana/prometheus",
"version": "11.0.0",
"version": "11.2.0-pre",
"description": "Grafana Prometheus Library",
"keywords": [
"typescript"
@ -38,12 +38,12 @@
"dependencies": {
"@emotion/css": "11.11.2",
"@floating-ui/react": "0.26.16",
"@grafana/data": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/faro-web-sdk": "1.7.3",
"@grafana/runtime": "11.0.0",
"@grafana/schema": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/schema": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"@leeoniya/ufuzzy": "1.0.14",
"@lezer/common": "1.2.1",
"@lezer/highlight": "1.2.0",
@ -76,7 +76,7 @@
},
"devDependencies": {
"@emotion/eslint-plugin": "11.11.0",
"@grafana/e2e-selectors": "11.0.0",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/tsconfig": "^1.3.0-rc1",
"@rollup/plugin-image": "3.0.3",
"@rollup/plugin-node-resolve": "15.2.3",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
"license": "AGPL-3.0-only",
"private": true,
"name": "@grafana/sql",
"version": "11.0.0",
"version": "11.2.0-pre",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git",
@ -15,11 +15,11 @@
},
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/e2e-selectors": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/runtime": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"@react-awesome-query-builder/ui": "6.5.2",
"immutable": "4.3.6",
"lodash": "4.17.21",

View File

@ -2,7 +2,7 @@
"author": "Grafana Labs",
"license": "Apache-2.0",
"name": "@grafana/ui",
"version": "11.0.0",
"version": "11.2.0-pre",
"description": "Grafana Components Library",
"keywords": [
"grafana",
@ -50,10 +50,10 @@
"@emotion/css": "11.11.2",
"@emotion/react": "11.11.4",
"@floating-ui/react": "0.26.16",
"@grafana/data": "11.0.0",
"@grafana/e2e-selectors": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/faro-web-sdk": "^1.3.6",
"@grafana/schema": "11.0.0",
"@grafana/schema": "11.2.0-pre",
"@leeoniya/ufuzzy": "1.0.14",
"@monaco-editor/react": "4.6.0",
"@popperjs/core": "2.11.8",

View File

@ -17,126 +17,10 @@ func TestRequesterFromContext(t *testing.T) {
})
t.Run("should return user set by ContextWithUser", func(t *testing.T) {
expected := &dummyUser{UID: "AAA"}
expected := &identity.StaticRequester{UserUID: "AAA"}
ctx := identity.WithRequester(context.Background(), expected)
actual, err := identity.GetRequester(ctx)
require.NoError(t, err)
require.Equal(t, expected.GetUID(), actual.GetUID())
})
}
type dummyUser struct {
UID string
}
// GetAuthID implements identity.Requester.
func (d *dummyUser) GetAuthID() string {
panic("unimplemented")
}
// GetAuthenticatedBy implements identity.Requester.
func (d *dummyUser) GetAuthenticatedBy() string {
panic("unimplemented")
}
// GetCacheKey implements identity.Requester.
func (d *dummyUser) GetCacheKey() string {
panic("unimplemented")
}
// GetDisplayName implements identity.Requester.
func (d *dummyUser) GetDisplayName() string {
panic("unimplemented")
}
// GetEmail implements identity.Requester.
func (d *dummyUser) GetEmail() string {
panic("unimplemented")
}
// GetGlobalPermissions implements identity.Requester.
func (d *dummyUser) GetGlobalPermissions() map[string][]string {
panic("unimplemented")
}
// GetID implements identity.Requester.
func (d *dummyUser) GetID() identity.NamespaceID {
panic("unimplemented")
}
// GetIDToken implements identity.Requester.
func (d *dummyUser) GetIDToken() string {
panic("unimplemented")
}
// GetIsGrafanaAdmin implements identity.Requester.
func (d *dummyUser) GetIsGrafanaAdmin() bool {
panic("unimplemented")
}
// GetLogin implements identity.Requester.
func (d *dummyUser) GetLogin() string {
panic("unimplemented")
}
// GetNamespacedID implements identity.Requester.
func (d *dummyUser) GetNamespacedID() (namespace identity.Namespace, identifier string) {
panic("unimplemented")
}
// GetOrgID implements identity.Requester.
func (d *dummyUser) GetOrgID() int64 {
panic("unimplemented")
}
// GetOrgName implements identity.Requester.
func (d *dummyUser) GetOrgName() string {
panic("unimplemented")
}
// GetOrgRole implements identity.Requester.
func (d *dummyUser) GetOrgRole() identity.RoleType {
panic("unimplemented")
}
// GetPermissions implements identity.Requester.
func (d *dummyUser) GetPermissions() map[string][]string {
panic("unimplemented")
}
// GetTeams implements identity.Requester.
func (d *dummyUser) GetTeams() []int64 {
panic("unimplemented")
}
// GetUID implements identity.Requester.
func (d *dummyUser) GetUID() identity.NamespaceID {
return identity.NewNamespaceIDString(identity.NamespaceUser, d.UID)
}
// HasRole implements identity.Requester.
func (d *dummyUser) HasRole(role identity.RoleType) bool {
panic("unimplemented")
}
// HasUniqueId implements identity.Requester.
func (d *dummyUser) HasUniqueId() bool {
panic("unimplemented")
}
// IsAuthenticatedBy implements identity.Requester.
func (d *dummyUser) IsAuthenticatedBy(providers ...string) bool {
panic("unimplemented")
}
// IsEmailVerified implements identity.Requester.
func (d *dummyUser) IsEmailVerified() bool {
panic("unimplemented")
}
// IsNil implements identity.Requester.
func (d *dummyUser) IsNil() bool {
return false
}
var _ identity.Requester = &dummyUser{}

View File

@ -4,7 +4,8 @@ import "fmt"
var _ Requester = &StaticRequester{}
// StaticRequester is helpful for tests
// StaticRequester allows creating requester values explicitly.
// It is helpful in tests!
// This is mostly copied from:
// https://github.com/grafana/grafana/blob/v11.0.0/pkg/services/user/identity.go#L16
type StaticRequester struct {
@ -22,8 +23,6 @@ type StaticRequester struct {
AuthID string
AuthenticatedBy string
IsGrafanaAdmin bool
IsAnonymous bool
IsDisabled bool
// Permissions grouped by orgID and actions
Permissions map[int64]map[string][]string
IDToken string

View File

@ -3,6 +3,7 @@ package utils
import (
"fmt"
"reflect"
"strconv"
"time"
"k8s.io/apimachinery/pkg/api/meta"
@ -53,6 +54,11 @@ type GrafanaMetaAccessor interface {
GetGroupVersionKind() schema.GroupVersionKind
// Helper to get resource versions as int64, however this is not required
// See: https://kubernetes.io/docs/reference/using-api/api-concepts/#resource-versions
GetResourceVersionInt64() (int64, error)
SetResourceVersionInt64(int64)
GetUpdatedTimestamp() (*time.Time, error)
SetUpdatedTimestamp(v *time.Time)
SetUpdatedTimestampMillis(unix int64)
@ -62,6 +68,8 @@ type GrafanaMetaAccessor interface {
SetUpdatedBy(user string)
GetFolder() string
SetFolder(uid string)
SetAnnotation(key string, val string)
GetSlug() string
SetSlug(v string)
@ -99,7 +107,7 @@ func MetaAccessor(raw interface{}) (GrafanaMetaAccessor, error) {
return nil, err
}
// look for Spec.Title or Spec.Name
// reflection to find title and other non object properties
r := reflect.ValueOf(raw)
if r.Kind() == reflect.Ptr || r.Kind() == reflect.Interface {
r = r.Elem()
@ -107,11 +115,19 @@ func MetaAccessor(raw interface{}) (GrafanaMetaAccessor, error) {
return &grafanaMetaAccessor{raw, obj, r}, nil
}
func (m *grafanaMetaAccessor) Object() metav1.Object {
return m.obj
func (m *grafanaMetaAccessor) GetResourceVersionInt64() (int64, error) {
v := m.obj.GetResourceVersion()
if v == "" {
return 0, nil
}
return strconv.ParseInt(v, 10, 64)
}
func (m *grafanaMetaAccessor) set(key string, val string) {
func (m *grafanaMetaAccessor) SetResourceVersionInt64(rv int64) {
m.obj.SetResourceVersion(strconv.FormatInt(rv, 10))
}
func (m *grafanaMetaAccessor) SetAnnotation(key string, val string) {
anno := m.obj.GetAnnotations()
if val == "" {
if anno != nil {
@ -148,7 +164,7 @@ func (m *grafanaMetaAccessor) SetUpdatedTimestampMillis(v int64) {
t := time.UnixMilli(v)
m.SetUpdatedTimestamp(&t)
} else {
m.set(AnnoKeyUpdatedTimestamp, "") // will clear the annotation
m.SetAnnotation(AnnoKeyUpdatedTimestamp, "") // will clear the annotation
}
}
@ -157,7 +173,7 @@ func (m *grafanaMetaAccessor) SetUpdatedTimestamp(v *time.Time) {
if v != nil && v.Unix() != 0 {
txt = v.UTC().Format(time.RFC3339)
}
m.set(AnnoKeyUpdatedTimestamp, txt)
m.SetAnnotation(AnnoKeyUpdatedTimestamp, txt)
}
func (m *grafanaMetaAccessor) GetCreatedBy() string {
@ -165,7 +181,7 @@ func (m *grafanaMetaAccessor) GetCreatedBy() string {
}
func (m *grafanaMetaAccessor) SetCreatedBy(user string) {
m.set(AnnoKeyCreatedBy, user)
m.SetAnnotation(AnnoKeyCreatedBy, user)
}
func (m *grafanaMetaAccessor) GetUpdatedBy() string {
@ -173,7 +189,7 @@ func (m *grafanaMetaAccessor) GetUpdatedBy() string {
}
func (m *grafanaMetaAccessor) SetUpdatedBy(user string) {
m.set(AnnoKeyUpdatedBy, user)
m.SetAnnotation(AnnoKeyUpdatedBy, user)
}
func (m *grafanaMetaAccessor) GetFolder() string {
@ -181,7 +197,7 @@ func (m *grafanaMetaAccessor) GetFolder() string {
}
func (m *grafanaMetaAccessor) SetFolder(uid string) {
m.set(AnnoKeyFolder, uid)
m.SetAnnotation(AnnoKeyFolder, uid)
}
func (m *grafanaMetaAccessor) GetSlug() string {
@ -189,7 +205,7 @@ func (m *grafanaMetaAccessor) GetSlug() string {
}
func (m *grafanaMetaAccessor) SetSlug(v string) {
m.set(AnnoKeySlug, v)
m.SetAnnotation(AnnoKeySlug, v)
}
func (m *grafanaMetaAccessor) SetOriginInfo(info *ResourceOriginInfo) {

View File

@ -163,8 +163,13 @@ func TestMetaAccessor(t *testing.T) {
}, res.GetAnnotations())
meta.SetNamespace("aaa")
meta.SetResourceVersionInt64(12345)
require.Equal(t, "aaa", res.GetNamespace())
require.Equal(t, "aaa", meta.GetNamespace())
rv, err := meta.GetResourceVersionInt64()
require.NoError(t, err)
require.Equal(t, int64(12345), rv)
})
t.Run("find titles", func(t *testing.T) {

View File

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

View File

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

View File

@ -2,22 +2,22 @@
"name": "@grafana-plugins/grafana-postgresql-datasource",
"description": "PostgreSQL data source plugin",
"private": true,
"version": "11.0.0",
"version": "11.2.0-pre",
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/runtime": "11.0.0",
"@grafana/sql": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/sql": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"lodash": "4.17.21",
"react": "18.2.0",
"rxjs": "7.8.1",
"tslib": "2.6.3"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.0.0",
"@grafana/plugin-configs": "11.0.0",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/plugin-configs": "11.2.0-pre",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",

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

View File

@ -2,14 +2,14 @@
"name": "@grafana-plugins/grafana-testdata-datasource",
"description": "Generates test data in different forms",
"private": true,
"version": "11.0.0",
"version": "11.2.0-pre",
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/runtime": "11.0.0",
"@grafana/schema": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/schema": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"d3-random": "^3.0.1",
"lodash": "4.17.21",
"micro-memoize": "^4.1.2",
@ -22,8 +22,8 @@
"uuid": "9.0.1"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.0.0",
"@grafana/plugin-configs": "11.0.0",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/plugin-configs": "11.2.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

View File

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

View File

@ -2,22 +2,22 @@
"name": "@grafana-plugins/mysql",
"description": "MySQL data source plugin",
"private": true,
"version": "11.0.0",
"version": "11.2.0-pre",
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.0.0",
"@grafana/data": "11.2.0-pre",
"@grafana/experimental": "1.7.12",
"@grafana/runtime": "11.0.0",
"@grafana/sql": "11.0.0",
"@grafana/ui": "11.0.0",
"@grafana/runtime": "11.2.0-pre",
"@grafana/sql": "11.2.0-pre",
"@grafana/ui": "11.2.0-pre",
"lodash": "4.17.21",
"react": "18.2.0",
"rxjs": "7.8.1",
"tslib": "2.6.3"
},
"devDependencies": {
"@grafana/e2e-selectors": "11.0.0",
"@grafana/plugin-configs": "11.0.0",
"@grafana/e2e-selectors": "11.2.0-pre",
"@grafana/plugin-configs": "11.2.0-pre",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",

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

View File

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

View File

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

View File

@ -1487,7 +1487,8 @@
"public-share-type-option-description": "",
"public-share-type-option-label": "",
"resume-access-button": "",
"revoke-access-button": ""
"revoke-access-button": "",
"revoke-access-description": ""
},
"sharing": {
"success-creation": ""
@ -1594,23 +1595,22 @@
"dismissable-button": "Schließen"
},
"scopes": {
"advancedSelector": {
"filters": {
"apply": "",
"cancel": "",
"input": {
"placeholder": "",
"removeAll": ""
},
"title": ""
},
"basicSelector": {
"openAdvanced": "",
"placeholder": "",
"removeAll": ""
},
"root": {
"collapse": "",
"expand": ""
},
"suggestedDashboards": {
"loading": "",
"search": ""
"search": "",
"toggle": {
"collapse": "",
"expand": ""
}
},
"tree": {
"collapse": "",
@ -1655,6 +1655,11 @@
"title": ""
}
},
"share-drawer": {
"confirm-action": {
"back-arrow-button": ""
}
},
"share-modal": {
"dashboard": {
"title": "Teilen"

View File

@ -1487,7 +1487,8 @@
"public-share-type-option-description": "",
"public-share-type-option-label": "",
"resume-access-button": "",
"revoke-access-button": ""
"revoke-access-button": "",
"revoke-access-description": ""
},
"sharing": {
"success-creation": ""
@ -1594,23 +1595,22 @@
"dismissable-button": "Cerrar"
},
"scopes": {
"advancedSelector": {
"filters": {
"apply": "",
"cancel": "",
"input": {
"placeholder": "",
"removeAll": ""
},
"title": ""
},
"basicSelector": {
"openAdvanced": "",
"placeholder": "",
"removeAll": ""
},
"root": {
"collapse": "",
"expand": ""
},
"suggestedDashboards": {
"loading": "",
"search": ""
"search": "",
"toggle": {
"collapse": "",
"expand": ""
}
},
"tree": {
"collapse": "",
@ -1655,6 +1655,11 @@
"title": ""
}
},
"share-drawer": {
"confirm-action": {
"back-arrow-button": ""
}
},
"share-modal": {
"dashboard": {
"title": "Compartir"

View File

@ -1487,7 +1487,8 @@
"public-share-type-option-description": "",
"public-share-type-option-label": "",
"resume-access-button": "",
"revoke-access-button": ""
"revoke-access-button": "",
"revoke-access-description": ""
},
"sharing": {
"success-creation": ""
@ -1594,23 +1595,22 @@
"dismissable-button": "Fermer"
},
"scopes": {
"advancedSelector": {
"filters": {
"apply": "",
"cancel": "",
"input": {
"placeholder": "",
"removeAll": ""
},
"title": ""
},
"basicSelector": {
"openAdvanced": "",
"placeholder": "",
"removeAll": ""
},
"root": {
"collapse": "",
"expand": ""
},
"suggestedDashboards": {
"loading": "",
"search": ""
"search": "",
"toggle": {
"collapse": "",
"expand": ""
}
},
"tree": {
"collapse": "",
@ -1655,6 +1655,11 @@
"title": ""
}
},
"share-drawer": {
"confirm-action": {
"back-arrow-button": ""
}
},
"share-modal": {
"dashboard": {
"title": "Partager"

View File

@ -1487,7 +1487,8 @@
"public-share-type-option-description": "",
"public-share-type-option-label": "",
"resume-access-button": "",
"revoke-access-button": ""
"revoke-access-button": "",
"revoke-access-description": ""
},
"sharing": {
"success-creation": ""
@ -1594,23 +1595,22 @@
"dismissable-button": "Fechar"
},
"scopes": {
"advancedSelector": {
"filters": {
"apply": "",
"cancel": "",
"input": {
"placeholder": "",
"removeAll": ""
},
"title": ""
},
"basicSelector": {
"openAdvanced": "",
"placeholder": "",
"removeAll": ""
},
"root": {
"collapse": "",
"expand": ""
},
"suggestedDashboards": {
"loading": "",
"search": ""
"search": "",
"toggle": {
"collapse": "",
"expand": ""
}
},
"tree": {
"collapse": "",
@ -1655,6 +1655,11 @@
"title": ""
}
},
"share-drawer": {
"confirm-action": {
"back-arrow-button": ""
}
},
"share-modal": {
"dashboard": {
"title": "Compartilhar"

View File

@ -1481,7 +1481,8 @@
"public-share-type-option-description": "",
"public-share-type-option-label": "",
"resume-access-button": "",
"revoke-access-button": ""
"revoke-access-button": "",
"revoke-access-description": ""
},
"sharing": {
"success-creation": ""
@ -1587,23 +1588,22 @@
"dismissable-button": "关闭"
},
"scopes": {
"advancedSelector": {
"filters": {
"apply": "",
"cancel": "",
"input": {
"placeholder": "",
"removeAll": ""
},
"title": ""
},
"basicSelector": {
"openAdvanced": "",
"placeholder": "",
"removeAll": ""
},
"root": {
"collapse": "",
"expand": ""
},
"suggestedDashboards": {
"loading": "",
"search": ""
"search": "",
"toggle": {
"collapse": "",
"expand": ""
}
},
"tree": {
"collapse": "",
@ -1648,6 +1648,11 @@
"title": ""
}
},
"share-drawer": {
"confirm-action": {
"back-arrow-button": ""
}
},
"share-modal": {
"dashboard": {
"title": "分享"

182
yarn.lock
View File

@ -2571,13 +2571,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@kusto/monaco-kusto": "npm:^10.0.0"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
@ -2615,13 +2615,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/sql": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/sql": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
"@types/jest": "npm:29.5.12"
@ -2646,11 +2646,11 @@ __metadata:
resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:6.4.2"
"@testing-library/react": "npm:15.0.2"
@ -2687,13 +2687,13 @@ __metadata:
resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@ -2770,13 +2770,13 @@ __metadata:
resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/sql": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/sql": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
"@types/jest": "npm:29.5.12"
@ -2801,11 +2801,11 @@ __metadata:
resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@ -2833,14 +2833,14 @@ __metadata:
resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/google-sdk": "npm:0.1.2"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/ui": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/react": "npm:15.0.2"
"@testing-library/user-event": "npm:14.5.2"
@ -2888,7 +2888,7 @@ __metadata:
"@grafana/lezer-traceql": "npm:0.0.17"
"@grafana/monaco-logql": "npm:^0.0.7"
"@grafana/o11y-ds-frontend": "workspace:*"
"@grafana/plugin-configs": "npm:11.0.0"
"@grafana/plugin-configs": "npm:11.2.0-pre"
"@grafana/runtime": "workspace:*"
"@grafana/schema": "workspace:*"
"@grafana/ui": "workspace:*"
@ -2998,12 +2998,12 @@ __metadata:
languageName: node
linkType: hard
"@grafana/data@npm:11.0.0, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
"@grafana/data@npm:11.2.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
version: 0.0.0-use.local
resolution: "@grafana/data@workspace:packages/grafana-data"
dependencies:
"@braintree/sanitize-url": "npm:7.0.1"
"@grafana/schema": "npm:11.0.0"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@rollup/plugin-node-resolve": "npm:15.2.3"
"@types/d3-interpolate": "npm:^3.0.0"
@ -3051,7 +3051,7 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/e2e-selectors@npm:11.0.0, @grafana/e2e-selectors@npm:^11.0.0, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
"@grafana/e2e-selectors@npm:11.2.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
version: 0.0.0-use.local
resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
dependencies:
@ -3069,6 +3069,17 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/e2e-selectors@npm:^11.0.0":
version: 11.0.0
resolution: "@grafana/e2e-selectors@npm:11.0.0"
dependencies:
"@grafana/tsconfig": "npm:^1.3.0-rc1"
tslib: "npm:2.6.2"
typescript: "npm:5.3.3"
checksum: 10/0e327c5afc342bca9be46b0b3fb7b55d69e8b7b6e9912be3255ce52abcb8832265246a0e6b2f877112a752b6e44f6f7edf5c4d2a32b5edc84800d19c880dfc6c
languageName: node
linkType: hard
"@grafana/eslint-config@npm:7.0.0":
version: 7.0.0
resolution: "@grafana/eslint-config@npm:7.0.0"
@ -3176,9 +3187,9 @@ __metadata:
"@babel/preset-env": "npm:7.24.7"
"@babel/preset-react": "npm:7.24.7"
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@grafana/ui": "npm:11.0.0"
"@grafana/ui": "npm:11.2.0-pre"
"@leeoniya/ufuzzy": "npm:1.0.14"
"@rollup/plugin-node-resolve": "npm:15.2.3"
"@testing-library/dom": "npm:10.0.0"
@ -3260,13 +3271,13 @@ __metadata:
resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@grafana/ui": "npm:11.0.0"
"@grafana/ui": "npm:11.2.0-pre"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:^6.1.2"
"@testing-library/react": "npm:15.0.2"
@ -3291,7 +3302,7 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/plugin-configs@npm:11.0.0, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
"@grafana/plugin-configs@npm:11.2.0-pre, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
version: 0.0.0-use.local
resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
dependencies:
@ -3331,14 +3342,14 @@ __metadata:
"@emotion/css": "npm:11.11.2"
"@emotion/eslint-plugin": "npm:11.11.0"
"@floating-ui/react": "npm:0.26.16"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/faro-web-sdk": "npm:1.7.3"
"@grafana/runtime": "npm:11.0.0"
"@grafana/schema": "npm:11.0.0"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@grafana/ui": "npm:11.0.0"
"@grafana/ui": "npm:11.2.0-pre"
"@leeoniya/ufuzzy": "npm:1.0.14"
"@lezer/common": "npm:1.2.1"
"@lezer/highlight": "npm:1.2.0"
@ -3436,16 +3447,16 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/runtime@npm:11.0.0, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
"@grafana/runtime@npm:11.2.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
version: 0.0.0-use.local
resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
dependencies:
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/faro-web-sdk": "npm:^1.3.6"
"@grafana/schema": "npm:11.0.0"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@grafana/ui": "npm:11.0.0"
"@grafana/ui": "npm:11.2.0-pre"
"@rollup/plugin-node-resolve": "npm:15.2.3"
"@rollup/plugin-terser": "npm:0.4.4"
"@testing-library/dom": "npm:10.0.0"
@ -3534,7 +3545,7 @@ __metadata:
languageName: node
linkType: hard
"@grafana/schema@npm:11.0.0, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
"@grafana/schema@npm:11.2.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
version: 0.0.0-use.local
resolution: "@grafana/schema@workspace:packages/grafana-schema"
dependencies:
@ -3552,17 +3563,17 @@ __metadata:
languageName: unknown
linkType: soft
"@grafana/sql@npm:11.0.0, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
"@grafana/sql@npm:11.2.0-pre, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
version: 0.0.0-use.local
resolution: "@grafana/sql@workspace:packages/grafana-sql"
dependencies:
"@emotion/css": "npm:11.11.2"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/experimental": "npm:1.7.12"
"@grafana/runtime": "npm:11.0.0"
"@grafana/runtime": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@grafana/ui": "npm:11.0.0"
"@grafana/ui": "npm:11.2.0-pre"
"@react-awesome-query-builder/ui": "npm:6.5.2"
"@testing-library/dom": "npm:10.0.0"
"@testing-library/jest-dom": "npm:^6.1.2"
@ -3605,7 +3616,7 @@ __metadata:
languageName: node
linkType: hard
"@grafana/ui@npm:11.0.0, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
"@grafana/ui@npm:11.2.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
version: 0.0.0-use.local
resolution: "@grafana/ui@workspace:packages/grafana-ui"
dependencies:
@ -3614,10 +3625,10 @@ __metadata:
"@emotion/react": "npm:11.11.4"
"@faker-js/faker": "npm:^8.4.1"
"@floating-ui/react": "npm:0.26.16"
"@grafana/data": "npm:11.0.0"
"@grafana/e2e-selectors": "npm:11.0.0"
"@grafana/data": "npm:11.2.0-pre"
"@grafana/e2e-selectors": "npm:11.2.0-pre"
"@grafana/faro-web-sdk": "npm:^1.3.6"
"@grafana/schema": "npm:11.0.0"
"@grafana/schema": "npm:11.2.0-pre"
"@grafana/tsconfig": "npm:^1.3.0-rc1"
"@leeoniya/ufuzzy": "npm:1.0.14"
"@monaco-editor/react": "npm:4.6.0"
@ -29179,6 +29190,13 @@ __metadata:
languageName: node
linkType: hard
"tslib@npm:2.6.2":
version: 2.6.2
resolution: "tslib@npm:2.6.2"
checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
languageName: node
linkType: hard
"tslib@npm:2.6.3, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.6.2":
version: 2.6.3
resolution: "tslib@npm:2.6.3"
@ -29417,6 +29435,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:5.3.3":
version: 5.3.3
resolution: "typescript@npm:5.3.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18
languageName: node
linkType: hard
"typescript@npm:5.4.5, typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.2.2":
version: 5.4.5
resolution: "typescript@npm:5.4.5"
@ -29437,6 +29465,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>":
version: 5.3.3
resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d
languageName: node
linkType: hard
"typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A>=2.7#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
version: 5.4.5
resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"