mirror of
https://github.com/grafana/grafana.git
synced 2025-12-21 03:54:29 +08:00
Compare commits
140 Commits
andreas/pl
...
docs/add-t
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d44841640 | ||
|
|
3459c67bfb | ||
|
|
37ccd8bc3d | ||
|
|
5156177079 | ||
|
|
4817ecf6a3 | ||
|
|
c73cab8eef | ||
|
|
a37ebf609e | ||
|
|
b29e8ccb45 | ||
|
|
644f7b7001 | ||
|
|
629570926d | ||
|
|
1b59c82b74 | ||
|
|
f35447435f | ||
|
|
c0dc92e8cd | ||
|
|
7114b9cd3b | ||
|
|
b40d0e6ff4 | ||
|
|
584615cf3f | ||
|
|
5f80a29a28 | ||
|
|
eab5d2b30e | ||
|
|
f3421b9718 | ||
|
|
1addfd69b4 | ||
|
|
d4a627c5fc | ||
|
|
46ef9aaa0a | ||
|
|
6ce672dd00 | ||
|
|
403f4d41de | ||
|
|
6512259acc | ||
|
|
b2dd095bd8 | ||
|
|
e525b529a8 | ||
|
|
7805e18368 | ||
|
|
7a07a49ecc | ||
|
|
9a4e13800d | ||
|
|
a0c4e8b4f4 | ||
|
|
fa62113b41 | ||
|
|
b863acab05 | ||
|
|
c7c052480d | ||
|
|
478ae15f0e | ||
|
|
8ebb1c2bc9 | ||
|
|
5572ce966a | ||
|
|
e3510f6eb3 | ||
|
|
a832e5f222 | ||
|
|
c5a5482d7d | ||
|
|
169ffc15c6 | ||
|
|
296fe610ba | ||
|
|
eceff8d26e | ||
|
|
3cdfe34ec8 | ||
|
|
35c214249f | ||
|
|
c3224411c0 | ||
|
|
b407f0062d | ||
|
|
0385a7a4a4 | ||
|
|
1611489b84 | ||
|
|
e8039d1c3d | ||
|
|
652b4f2fab | ||
|
|
c35642b04d | ||
|
|
91a72f2572 | ||
|
|
f8027e4d75 | ||
|
|
f5b2dde4a1 | ||
|
|
0c264b7a5f | ||
|
|
d83b216a32 | ||
|
|
ada14df9fd | ||
|
|
f63c2cb2dd | ||
|
|
fe4c615b3d | ||
|
|
02d3fd7b31 | ||
|
|
5dcfc19060 | ||
|
|
5bda17be3f | ||
|
|
bc88796e6e | ||
|
|
5d7b9c5050 | ||
|
|
73bcfbcc74 | ||
|
|
4ab198b201 | ||
|
|
0c82f92539 | ||
|
|
73de5f98e1 | ||
|
|
b6ba8a0fd4 | ||
|
|
350c3578c7 | ||
|
|
e6b5ece559 | ||
|
|
eef14d2cee | ||
|
|
c71c0b33ee | ||
|
|
d568798c64 | ||
|
|
9bec62a080 | ||
|
|
7fe3214f16 | ||
|
|
e2d12f4cce | ||
|
|
d48455cd20 | ||
|
|
439d2c806c | ||
|
|
8aab6302c5 | ||
|
|
33c5cbf4de | ||
|
|
d686a49cf7 | ||
|
|
cedf08c9ce | ||
|
|
5ca221743f | ||
|
|
2fc1210b38 | ||
|
|
8542b2f6a2 | ||
|
|
a6043deb33 | ||
|
|
3697c8dafc | ||
|
|
3a4022061d | ||
|
|
2a65e0cdcb | ||
|
|
000c00aee9 | ||
|
|
e433cfa02d | ||
|
|
30045c02c0 | ||
|
|
63bfc1596c | ||
|
|
da14be859e | ||
|
|
30d3bb39c0 | ||
|
|
b3f98d4cc3 | ||
|
|
f368139802 | ||
|
|
7ae9f94de7 | ||
|
|
a46f0a222e | ||
|
|
1146ac790c | ||
|
|
a847f36df2 | ||
|
|
9e1fe16873 | ||
|
|
3ec1c27ad4 | ||
|
|
094b6a36dc | ||
|
|
47f7b3e095 | ||
|
|
5e7b900416 | ||
|
|
5eae7d4f22 | ||
|
|
8c6ccdd1ab | ||
|
|
85c643ece9 | ||
|
|
8272edda96 | ||
|
|
e56c2c5156 | ||
|
|
ac55fad1ba | ||
|
|
c4c1708e38 | ||
|
|
92a8dd8b53 | ||
|
|
cc1bba85e4 | ||
|
|
27482194e3 | ||
|
|
ea331dc0d3 | ||
|
|
baee9fb214 | ||
|
|
39f4b2a959 | ||
|
|
755b479be4 | ||
|
|
532a2e5f4d | ||
|
|
a7bbca3451 | ||
|
|
633332c750 | ||
|
|
8911785fdf | ||
|
|
4fd03bc05e | ||
|
|
d1761606fb | ||
|
|
4fe481ec81 | ||
|
|
6b50e2d730 | ||
|
|
ff43c175c8 | ||
|
|
ae03b08c25 | ||
|
|
0088e55b8f | ||
|
|
d9fc183e39 | ||
|
|
6bbb00d0a2 | ||
|
|
83b0b14af6 | ||
|
|
18280e1aa6 | ||
|
|
b3980eeec8 | ||
|
|
b8acfade21 | ||
|
|
1013d74f13 |
3
.github/CODEOWNERS
vendored
3
.github/CODEOWNERS
vendored
@@ -520,7 +520,7 @@ i18next.config.ts @grafana/grafana-frontend-platform
|
||||
/e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
|
||||
/e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
|
||||
/e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
|
||||
/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dashboards-squad
|
||||
/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dataviz-squad
|
||||
/e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform
|
||||
|
||||
# Packages
|
||||
@@ -956,6 +956,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
|
||||
/public/app/features/notifications/ @grafana/grafana-search-navigate-organise
|
||||
/public/app/features/org/ @grafana/grafana-search-navigate-organise
|
||||
/public/app/features/panel/ @grafana/dashboards-squad
|
||||
/public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx @grafana/dataviz-squad
|
||||
/public/app/features/panel/suggestions/ @grafana/dataviz-squad
|
||||
/public/app/features/playlist/ @grafana/dashboards-squad
|
||||
/public/app/features/plugins/ @grafana/plugins-platform-frontend
|
||||
|
||||
8
.github/commands.json
vendored
8
.github/commands.json
vendored
@@ -1226,5 +1226,13 @@
|
||||
"addToProject": {
|
||||
"url": "https://github.com/orgs/grafana/projects/69"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"name": "area/suggestions",
|
||||
"action": "addToProject",
|
||||
"addToProject": {
|
||||
"url": "https://github.com/orgs/grafana/projects/56"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
10
.github/pr-commands.json
vendored
10
.github/pr-commands.json
vendored
@@ -469,5 +469,15 @@
|
||||
"addToProject": {
|
||||
"url": "https://github.com/orgs/grafana/projects/190"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "changedfiles",
|
||||
"matches": [
|
||||
"public/app/features/panel/suggestions/**/*",
|
||||
"public/app/plugins/panel/**/suggestions.ts",
|
||||
"packages/grafana-data/src/types/suggestions*"
|
||||
],
|
||||
"action": "updateLabel",
|
||||
"addLabel": "area/suggestions"
|
||||
}
|
||||
]
|
||||
|
||||
1
.github/workflows/auto-triager/labels.txt
vendored
1
.github/workflows/auto-triager/labels.txt
vendored
@@ -85,6 +85,7 @@ area/scenes
|
||||
area/search
|
||||
area/security
|
||||
area/streaming
|
||||
area/suggestions
|
||||
area/templating/repeating
|
||||
area/tooltip
|
||||
area/transformations
|
||||
|
||||
@@ -14,7 +14,7 @@ ARG JS_SRC=js-builder
|
||||
|
||||
# Dependabot cannot update dependencies listed in ARGs
|
||||
# By using FROM instructions we can delegate dependency updates to dependabot
|
||||
FROM alpine:3.22.2 AS alpine-base
|
||||
FROM alpine:3.23.0 AS alpine-base
|
||||
FROM ubuntu:22.04 AS ubuntu-base
|
||||
FROM golang:1.25.5-alpine AS go-builder-base
|
||||
FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base
|
||||
|
||||
@@ -8,9 +8,8 @@ import (
|
||||
func (stars *StarsSpec) Add(group, kind, name string) {
|
||||
for i, r := range stars.Resource {
|
||||
if r.Group == group && r.Kind == kind {
|
||||
r.Names = append(r.Names, name)
|
||||
slices.Sort(r.Names)
|
||||
stars.Resource[i].Names = slices.Compact(r.Names)
|
||||
stars.Resource[i].Names = append(r.Names, name)
|
||||
stars.Normalize()
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -46,8 +45,15 @@ func (stars *StarsSpec) Normalize() {
|
||||
resources := make([]StarsResource, 0, len(stars.Resource))
|
||||
for _, r := range stars.Resource {
|
||||
if len(r.Names) > 0 {
|
||||
slices.Sort(r.Names)
|
||||
r.Names = slices.Compact(r.Names) // removes any duplicates
|
||||
unique := make([]string, 0, len(r.Names))
|
||||
found := make(map[string]bool, len(r.Names))
|
||||
for _, name := range r.Names {
|
||||
if !found[name] {
|
||||
unique = append(unique, name)
|
||||
found[name] = true
|
||||
}
|
||||
}
|
||||
r.Names = unique
|
||||
resources = append(resources, r)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ func TestStarsWrite(t *testing.T) {
|
||||
Resource: []StarsResource{{
|
||||
Group: "g",
|
||||
Kind: "k",
|
||||
Names: []string{"a", "b", "c", "x"}, // added "b" (and sorted)
|
||||
Names: []string{"a", "b", "x", "c"}, // added c to the end
|
||||
}},
|
||||
},
|
||||
}, {
|
||||
|
||||
@@ -57,6 +57,7 @@ require (
|
||||
github.com/hashicorp/go-hclog v1.6.3 // indirect
|
||||
github.com/hashicorp/go-multierror v1.1.1 // indirect
|
||||
github.com/hashicorp/go-plugin v1.7.0 // indirect
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
|
||||
github.com/hashicorp/yamux v0.1.2 // indirect
|
||||
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
|
||||
github.com/josharian/intern v1.0.0 // indirect
|
||||
|
||||
@@ -112,6 +112,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
|
||||
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
|
||||
github.com/hashicorp/go-plugin v1.7.0 h1:YghfQH/0QmPNc/AZMTFE3ac8fipZyZECHdDPshfk+mA=
|
||||
github.com/hashicorp/go-plugin v1.7.0/go.mod h1:BExt6KEaIYx804z8k4gRzRLEvxKVb+kn0NMcihqOqb8=
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||
github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
|
||||
github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
|
||||
github.com/jaegertracing/jaeger-idl v0.5.0 h1:zFXR5NL3Utu7MhPg8ZorxtCBjHrL3ReM1VoB65FOFGE=
|
||||
|
||||
454
apps/dashboard/pkg/migration/conversion/conversion_cache_test.go
Normal file
454
apps/dashboard/pkg/migration/conversion/conversion_cache_test.go
Normal file
@@ -0,0 +1,454 @@
|
||||
package conversion
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
|
||||
dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
|
||||
dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
|
||||
dashv2beta1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1"
|
||||
"github.com/grafana/grafana/apps/dashboard/pkg/migration"
|
||||
"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
|
||||
common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
// countingDataSourceProvider tracks how many times Index() is called
|
||||
type countingDataSourceProvider struct {
|
||||
datasources []schemaversion.DataSourceInfo
|
||||
callCount atomic.Int64
|
||||
}
|
||||
|
||||
func newCountingDataSourceProvider(datasources []schemaversion.DataSourceInfo) *countingDataSourceProvider {
|
||||
return &countingDataSourceProvider{
|
||||
datasources: datasources,
|
||||
}
|
||||
}
|
||||
|
||||
func (p *countingDataSourceProvider) Index(_ context.Context) *schemaversion.DatasourceIndex {
|
||||
p.callCount.Add(1)
|
||||
return schemaversion.NewDatasourceIndex(p.datasources)
|
||||
}
|
||||
|
||||
func (p *countingDataSourceProvider) getCallCount() int64 {
|
||||
return p.callCount.Load()
|
||||
}
|
||||
|
||||
// countingLibraryElementProvider tracks how many times GetLibraryElementInfo() is called
|
||||
type countingLibraryElementProvider struct {
|
||||
elements []schemaversion.LibraryElementInfo
|
||||
callCount atomic.Int64
|
||||
}
|
||||
|
||||
func newCountingLibraryElementProvider(elements []schemaversion.LibraryElementInfo) *countingLibraryElementProvider {
|
||||
return &countingLibraryElementProvider{
|
||||
elements: elements,
|
||||
}
|
||||
}
|
||||
|
||||
func (p *countingLibraryElementProvider) GetLibraryElementInfo(_ context.Context) []schemaversion.LibraryElementInfo {
|
||||
p.callCount.Add(1)
|
||||
return p.elements
|
||||
}
|
||||
|
||||
func (p *countingLibraryElementProvider) getCallCount() int64 {
|
||||
return p.callCount.Load()
|
||||
}
|
||||
|
||||
// createTestV0Dashboard creates a minimal v0 dashboard for testing
|
||||
// The dashboard has a datasource with UID only (no type) to force provider lookup
|
||||
// and includes library panels to test library element provider caching
|
||||
func createTestV0Dashboard(namespace, title string) *dashv0.Dashboard {
|
||||
return &dashv0.Dashboard{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "test-dashboard",
|
||||
Namespace: namespace,
|
||||
},
|
||||
Spec: common.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"title": title,
|
||||
"schemaVersion": schemaversion.LATEST_VERSION,
|
||||
// Variables with datasource reference that requires lookup
|
||||
"templating": map[string]interface{}{
|
||||
"list": []interface{}{
|
||||
map[string]interface{}{
|
||||
"name": "query_var",
|
||||
"type": "query",
|
||||
"query": "label_values(up, job)",
|
||||
// Datasource with UID only - type needs to be looked up
|
||||
"datasource": map[string]interface{}{
|
||||
"uid": "ds1",
|
||||
// type is intentionally omitted to trigger provider lookup
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
"panels": []interface{}{
|
||||
map[string]interface{}{
|
||||
"id": 1,
|
||||
"title": "Test Panel",
|
||||
"type": "timeseries",
|
||||
"targets": []interface{}{
|
||||
map[string]interface{}{
|
||||
// Datasource with UID only - type needs to be looked up
|
||||
"datasource": map[string]interface{}{
|
||||
"uid": "ds1",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
// Library panel reference - triggers library element provider lookup
|
||||
map[string]interface{}{
|
||||
"id": 2,
|
||||
"title": "Library Panel with Horizontal Repeat",
|
||||
"type": "library-panel-ref",
|
||||
"gridPos": map[string]interface{}{
|
||||
"h": 8,
|
||||
"w": 12,
|
||||
"x": 0,
|
||||
"y": 8,
|
||||
},
|
||||
"libraryPanel": map[string]interface{}{
|
||||
"uid": "lib-panel-repeat-h",
|
||||
"name": "Library Panel with Horizontal Repeat",
|
||||
},
|
||||
},
|
||||
// Another library panel reference
|
||||
map[string]interface{}{
|
||||
"id": 3,
|
||||
"title": "Library Panel without Repeat",
|
||||
"type": "library-panel-ref",
|
||||
"gridPos": map[string]interface{}{
|
||||
"h": 3,
|
||||
"w": 6,
|
||||
"x": 0,
|
||||
"y": 16,
|
||||
},
|
||||
"libraryPanel": map[string]interface{}{
|
||||
"uid": "lib-panel-no-repeat",
|
||||
"name": "Library Panel without Repeat",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// createTestV1Dashboard creates a minimal v1beta1 dashboard for testing
|
||||
// The dashboard has a datasource with UID only (no type) to force provider lookup
|
||||
// and includes library panels to test library element provider caching
|
||||
func createTestV1Dashboard(namespace, title string) *dashv1.Dashboard {
|
||||
return &dashv1.Dashboard{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "test-dashboard",
|
||||
Namespace: namespace,
|
||||
},
|
||||
Spec: common.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"title": title,
|
||||
"schemaVersion": schemaversion.LATEST_VERSION,
|
||||
// Variables with datasource reference that requires lookup
|
||||
"templating": map[string]interface{}{
|
||||
"list": []interface{}{
|
||||
map[string]interface{}{
|
||||
"name": "query_var",
|
||||
"type": "query",
|
||||
"query": "label_values(up, job)",
|
||||
// Datasource with UID only - type needs to be looked up
|
||||
"datasource": map[string]interface{}{
|
||||
"uid": "ds1",
|
||||
// type is intentionally omitted to trigger provider lookup
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
"panels": []interface{}{
|
||||
map[string]interface{}{
|
||||
"id": 1,
|
||||
"title": "Test Panel",
|
||||
"type": "timeseries",
|
||||
"targets": []interface{}{
|
||||
map[string]interface{}{
|
||||
// Datasource with UID only - type needs to be looked up
|
||||
"datasource": map[string]interface{}{
|
||||
"uid": "ds1",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
// Library panel reference - triggers library element provider lookup
|
||||
map[string]interface{}{
|
||||
"id": 2,
|
||||
"title": "Library Panel with Vertical Repeat",
|
||||
"type": "library-panel-ref",
|
||||
"gridPos": map[string]interface{}{
|
||||
"h": 4,
|
||||
"w": 6,
|
||||
"x": 0,
|
||||
"y": 8,
|
||||
},
|
||||
"libraryPanel": map[string]interface{}{
|
||||
"uid": "lib-panel-repeat-v",
|
||||
"name": "Library Panel with Vertical Repeat",
|
||||
},
|
||||
},
|
||||
// Another library panel reference
|
||||
map[string]interface{}{
|
||||
"id": 3,
|
||||
"title": "Library Panel without Repeat",
|
||||
"type": "library-panel-ref",
|
||||
"gridPos": map[string]interface{}{
|
||||
"h": 3,
|
||||
"w": 6,
|
||||
"x": 6,
|
||||
"y": 8,
|
||||
},
|
||||
"libraryPanel": map[string]interface{}{
|
||||
"uid": "lib-panel-no-repeat",
|
||||
"name": "Library Panel without Repeat",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// TestConversionCaching_V0_to_V2alpha1 verifies caching works when converting V0 to V2alpha1
|
||||
func TestConversionCaching_V0_to_V2alpha1(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
// Convert multiple dashboards in the same namespace
|
||||
numDashboards := 5
|
||||
namespace := "default"
|
||||
|
||||
for i := 0; i < numDashboards; i++ {
|
||||
source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2alpha1.Dashboard{}
|
||||
|
||||
err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion %d should succeed", i)
|
||||
require.NotNil(t, target.Spec)
|
||||
}
|
||||
|
||||
// With caching, the underlying datasource provider should only be called once per namespace
|
||||
// The test dashboard has datasources without type that require lookup
|
||||
assert.Equal(t, int64(1), underlyingDS.getCallCount(),
|
||||
"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
// Library element provider should also be called only once per namespace due to caching
|
||||
assert.Equal(t, int64(1), underlyingLE.getCallCount(),
|
||||
"library element provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
}
|
||||
|
||||
// TestConversionCaching_V0_to_V2beta1 verifies caching works when converting V0 to V2beta1
|
||||
func TestConversionCaching_V0_to_V2beta1(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
numDashboards := 5
|
||||
namespace := "default"
|
||||
|
||||
for i := 0; i < numDashboards; i++ {
|
||||
source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2beta1.Dashboard{}
|
||||
|
||||
err := Convert_V0_to_V2beta1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion %d should succeed", i)
|
||||
require.NotNil(t, target.Spec)
|
||||
}
|
||||
|
||||
assert.Equal(t, int64(1), underlyingDS.getCallCount(),
|
||||
"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
assert.Equal(t, int64(1), underlyingLE.getCallCount(),
|
||||
"library element provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
}
|
||||
|
||||
// TestConversionCaching_V1beta1_to_V2alpha1 verifies caching works when converting V1beta1 to V2alpha1
|
||||
func TestConversionCaching_V1beta1_to_V2alpha1(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-v", Name: "Library Panel with Vertical Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
numDashboards := 5
|
||||
namespace := "default"
|
||||
|
||||
for i := 0; i < numDashboards; i++ {
|
||||
source := createTestV1Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2alpha1.Dashboard{}
|
||||
|
||||
err := Convert_V1beta1_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion %d should succeed", i)
|
||||
require.NotNil(t, target.Spec)
|
||||
}
|
||||
|
||||
assert.Equal(t, int64(1), underlyingDS.getCallCount(),
|
||||
"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
assert.Equal(t, int64(1), underlyingLE.getCallCount(),
|
||||
"library element provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
}
|
||||
|
||||
// TestConversionCaching_V1beta1_to_V2beta1 verifies caching works when converting V1beta1 to V2beta1
|
||||
func TestConversionCaching_V1beta1_to_V2beta1(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-v", Name: "Library Panel with Vertical Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
numDashboards := 5
|
||||
namespace := "default"
|
||||
|
||||
for i := 0; i < numDashboards; i++ {
|
||||
source := createTestV1Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2beta1.Dashboard{}
|
||||
|
||||
err := Convert_V1beta1_to_V2beta1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion %d should succeed", i)
|
||||
require.NotNil(t, target.Spec)
|
||||
}
|
||||
|
||||
assert.Equal(t, int64(1), underlyingDS.getCallCount(),
|
||||
"datasource provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
assert.Equal(t, int64(1), underlyingLE.getCallCount(),
|
||||
"library element provider should be called only once for %d conversions in same namespace", numDashboards)
|
||||
}
|
||||
|
||||
// TestConversionCaching_MultipleNamespaces verifies that different namespaces get separate cache entries
|
||||
func TestConversionCaching_MultipleNamespaces(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, time.Minute)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, time.Minute)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
namespaces := []string{"default", "org-2", "org-3"}
|
||||
numDashboardsPerNs := 3
|
||||
|
||||
for _, ns := range namespaces {
|
||||
for i := 0; i < numDashboardsPerNs; i++ {
|
||||
source := createTestV0Dashboard(ns, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2alpha1.Dashboard{}
|
||||
|
||||
err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion for namespace %s should succeed", ns)
|
||||
}
|
||||
}
|
||||
|
||||
// With caching, each namespace should result in one call to the underlying provider
|
||||
expectedCalls := int64(len(namespaces))
|
||||
assert.Equal(t, expectedCalls, underlyingDS.getCallCount(),
|
||||
"datasource provider should be called once per namespace (%d namespaces)", len(namespaces))
|
||||
assert.Equal(t, expectedCalls, underlyingLE.getCallCount(),
|
||||
"library element provider should be called once per namespace (%d namespaces)", len(namespaces))
|
||||
}
|
||||
|
||||
// TestConversionCaching_CacheDisabled verifies that TTL=0 disables caching
|
||||
func TestConversionCaching_CacheDisabled(t *testing.T) {
|
||||
datasources := []schemaversion.DataSourceInfo{
|
||||
{UID: "ds1", Type: "prometheus", Name: "Prometheus", Default: true},
|
||||
}
|
||||
elements := []schemaversion.LibraryElementInfo{
|
||||
{UID: "lib-panel-repeat-h", Name: "Library Panel with Horizontal Repeat", Type: "timeseries"},
|
||||
{UID: "lib-panel-no-repeat", Name: "Library Panel without Repeat", Type: "graph"},
|
||||
}
|
||||
|
||||
underlyingDS := newCountingDataSourceProvider(datasources)
|
||||
underlyingLE := newCountingLibraryElementProvider(elements)
|
||||
|
||||
// TTL of 0 should disable caching - the wrapper returns the underlying provider directly
|
||||
cachedDS := schemaversion.WrapIndexProviderWithCache(underlyingDS, 0)
|
||||
cachedLE := schemaversion.WrapLibraryElementProviderWithCache(underlyingLE, 0)
|
||||
|
||||
migration.ResetForTesting()
|
||||
migration.Initialize(cachedDS, cachedLE, migration.DefaultCacheTTL)
|
||||
|
||||
numDashboards := 3
|
||||
namespace := "default"
|
||||
|
||||
for i := 0; i < numDashboards; i++ {
|
||||
source := createTestV0Dashboard(namespace, "Dashboard "+string(rune('A'+i)))
|
||||
target := &dashv2alpha1.Dashboard{}
|
||||
|
||||
err := Convert_V0_to_V2alpha1(source, target, nil, cachedDS, cachedLE)
|
||||
require.NoError(t, err, "conversion %d should succeed", i)
|
||||
}
|
||||
|
||||
// Without caching, each conversion calls the underlying provider multiple times
|
||||
// (once for each datasource lookup needed - variables and panels)
|
||||
// The key check is that the count is GREATER than 1 per conversion (no caching benefit)
|
||||
assert.Greater(t, underlyingDS.getCallCount(), int64(numDashboards),
|
||||
"with cache disabled, conversions should call datasource provider multiple times")
|
||||
// Library element provider is also called for each conversion without caching
|
||||
assert.GreaterOrEqual(t, underlyingLE.getCallCount(), int64(numDashboards),
|
||||
"with cache disabled, conversions should call library element provider multiple times")
|
||||
}
|
||||
@@ -4,8 +4,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"k8s.io/apimachinery/pkg/conversion"
|
||||
|
||||
dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
|
||||
dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
|
||||
dashv2alpha1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
|
||||
@@ -121,6 +119,14 @@ func countPanelsV0V1(spec map[string]interface{}) int {
|
||||
return count
|
||||
}
|
||||
|
||||
// countTargetsFromPanel counts the number of targets/queries in a panel.
|
||||
func countTargetsFromPanel(panelMap map[string]interface{}) int {
|
||||
if targets, ok := panelMap["targets"].([]interface{}); ok {
|
||||
return len(targets)
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// countQueriesV0V1 counts data queries in v0alpha1 or v1beta1 dashboard spec
|
||||
// Note: Row panels are layout containers and should not have queries.
|
||||
// We ignore any queries on row panels themselves, but count queries in their collapsed panels.
|
||||
@@ -145,9 +151,7 @@ func countQueriesV0V1(spec map[string]interface{}) int {
|
||||
|
||||
// Count queries in regular panels (NOT row panels)
|
||||
if panelType != "row" {
|
||||
if targets, ok := panelMap["targets"].([]interface{}); ok {
|
||||
count += len(targets)
|
||||
}
|
||||
count += countTargetsFromPanel(panelMap)
|
||||
}
|
||||
|
||||
// Count queries in collapsed panels inside row panels
|
||||
@@ -155,9 +159,7 @@ func countQueriesV0V1(spec map[string]interface{}) int {
|
||||
if collapsedPanels, ok := panelMap["panels"].([]interface{}); ok {
|
||||
for _, cp := range collapsedPanels {
|
||||
if cpMap, ok := cp.(map[string]interface{}); ok {
|
||||
if targets, ok := cpMap["targets"].([]interface{}); ok {
|
||||
count += len(targets)
|
||||
}
|
||||
count += countTargetsFromPanel(cpMap)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -442,77 +444,3 @@ func collectDashboardStats(dashboard interface{}) dashboardStats {
|
||||
}
|
||||
return dashboardStats{}
|
||||
}
|
||||
|
||||
// withConversionDataLossDetection wraps a conversion function to detect data loss
|
||||
func withConversionDataLossDetection(sourceFuncName, targetFuncName string, conversionFunc func(a, b interface{}, scope conversion.Scope) error) func(a, b interface{}, scope conversion.Scope) error {
|
||||
return func(a, b interface{}, scope conversion.Scope) error {
|
||||
// Collect source statistics
|
||||
var sourceStats dashboardStats
|
||||
switch source := a.(type) {
|
||||
case *dashv0.Dashboard:
|
||||
if source.Spec.Object != nil {
|
||||
sourceStats = collectStatsV0V1(source.Spec.Object)
|
||||
}
|
||||
case *dashv1.Dashboard:
|
||||
if source.Spec.Object != nil {
|
||||
sourceStats = collectStatsV0V1(source.Spec.Object)
|
||||
}
|
||||
case *dashv2alpha1.Dashboard:
|
||||
sourceStats = collectStatsV2alpha1(source.Spec)
|
||||
case *dashv2beta1.Dashboard:
|
||||
sourceStats = collectStatsV2beta1(source.Spec)
|
||||
}
|
||||
|
||||
// Execute the conversion
|
||||
err := conversionFunc(a, b, scope)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Collect target statistics
|
||||
var targetStats dashboardStats
|
||||
switch target := b.(type) {
|
||||
case *dashv0.Dashboard:
|
||||
if target.Spec.Object != nil {
|
||||
targetStats = collectStatsV0V1(target.Spec.Object)
|
||||
}
|
||||
case *dashv1.Dashboard:
|
||||
if target.Spec.Object != nil {
|
||||
targetStats = collectStatsV0V1(target.Spec.Object)
|
||||
}
|
||||
case *dashv2alpha1.Dashboard:
|
||||
targetStats = collectStatsV2alpha1(target.Spec)
|
||||
case *dashv2beta1.Dashboard:
|
||||
targetStats = collectStatsV2beta1(target.Spec)
|
||||
}
|
||||
|
||||
// Detect if data was lost
|
||||
if dataLossErr := detectConversionDataLoss(sourceStats, targetStats, sourceFuncName, targetFuncName); dataLossErr != nil {
|
||||
logger.Error("Dashboard conversion data loss detected",
|
||||
"sourceFunc", sourceFuncName,
|
||||
"targetFunc", targetFuncName,
|
||||
"sourcePanels", sourceStats.panelCount,
|
||||
"targetPanels", targetStats.panelCount,
|
||||
"sourceQueries", sourceStats.queryCount,
|
||||
"targetQueries", targetStats.queryCount,
|
||||
"sourceAnnotations", sourceStats.annotationCount,
|
||||
"targetAnnotations", targetStats.annotationCount,
|
||||
"sourceLinks", sourceStats.linkCount,
|
||||
"targetLinks", targetStats.linkCount,
|
||||
"error", dataLossErr,
|
||||
)
|
||||
return dataLossErr
|
||||
}
|
||||
|
||||
logger.Debug("Dashboard conversion completed without data loss",
|
||||
"sourceFunc", sourceFuncName,
|
||||
"targetFunc", targetFuncName,
|
||||
"panels", targetStats.panelCount,
|
||||
"queries", targetStats.queryCount,
|
||||
"annotations", targetStats.annotationCount,
|
||||
"links", targetStats.linkCount,
|
||||
)
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -35,7 +35,7 @@ func TestConversionMatrixExist(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
versions := []metav1.Object{
|
||||
&dashv0.Dashboard{Spec: common.Unstructured{Object: map[string]any{"title": "dashboardV0"}}},
|
||||
@@ -89,7 +89,7 @@ func TestDashboardConversionToAllVersions(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Set up conversion scheme
|
||||
scheme := runtime.NewScheme()
|
||||
@@ -309,7 +309,7 @@ func TestMigratedDashboardsConversion(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Set up conversion scheme
|
||||
scheme := runtime.NewScheme()
|
||||
@@ -428,7 +428,7 @@ func setupTestConversionScheme(t *testing.T) *runtime.Scheme {
|
||||
t.Helper()
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
leProvider := migrationtestutil.NewLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
scheme := runtime.NewScheme()
|
||||
err := RegisterConversions(scheme, dsProvider, leProvider)
|
||||
@@ -527,7 +527,7 @@ func TestConversionMetrics(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Create a test registry for metrics
|
||||
registry := prometheus.NewRegistry()
|
||||
@@ -694,7 +694,7 @@ func TestConversionMetricsWrapper(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Create a test registry for metrics
|
||||
registry := prometheus.NewRegistry()
|
||||
@@ -864,7 +864,7 @@ func TestSchemaVersionExtraction(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Create a test registry for metrics
|
||||
registry := prometheus.NewRegistry()
|
||||
@@ -910,7 +910,7 @@ func TestConversionLogging(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
// Create a test registry for metrics
|
||||
registry := prometheus.NewRegistry()
|
||||
@@ -1003,7 +1003,7 @@ func TestConversionLogLevels(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
t.Run("log levels and structured fields verification", func(t *testing.T) {
|
||||
// Create test wrapper to verify logging behavior
|
||||
@@ -1076,7 +1076,7 @@ func TestConversionLoggingFields(t *testing.T) {
|
||||
dsProvider := migrationtestutil.NewDataSourceProvider(migrationtestutil.StandardTestConfig)
|
||||
// Use TestLibraryElementProvider for tests that need library panel models with repeat options
|
||||
leProvider := migrationtestutil.NewTestLibraryElementProvider()
|
||||
migration.Initialize(dsProvider, leProvider)
|
||||
migration.Initialize(dsProvider, leProvider, migration.DefaultCacheTTL)
|
||||
|
||||
t.Run("verify all log fields are present", func(t *testing.T) {
|
||||
// Test that the conversion wrapper includes all expected structured fields
|
||||
|
||||
@@ -17,7 +17,9 @@ import (
|
||||
"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
|
||||
)
|
||||
|
||||
var logger = logging.DefaultLogger.With("logger", "dashboard.conversion")
|
||||
func getLogger() logging.Logger {
|
||||
return logging.DefaultLogger.With("logger", "dashboard.conversion")
|
||||
}
|
||||
|
||||
// getErroredSchemaVersionFunc determines the schema version function that errored
|
||||
func getErroredSchemaVersionFunc(err error) string {
|
||||
@@ -197,9 +199,9 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
|
||||
)
|
||||
|
||||
if errorType == "schema_minimum_version_error" {
|
||||
logger.Warn("Dashboard conversion failed", logFields...)
|
||||
getLogger().Warn("Dashboard conversion failed", logFields...)
|
||||
} else {
|
||||
logger.Error("Dashboard conversion failed", logFields...)
|
||||
getLogger().Error("Dashboard conversion failed", logFields...)
|
||||
}
|
||||
} else {
|
||||
// Record success metrics
|
||||
@@ -235,7 +237,7 @@ func withConversionMetrics(sourceVersionAPI, targetVersionAPI string, conversion
|
||||
)
|
||||
}
|
||||
|
||||
logger.Debug("Dashboard conversion succeeded", successLogFields...)
|
||||
getLogger().Debug("Dashboard conversion succeeded", successLogFields...)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -76,9 +76,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": true,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -155,9 +155,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -234,9 +234,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -313,9 +313,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -392,9 +392,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -471,9 +471,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": false,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -550,9 +550,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": false,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -642,9 +642,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -721,9 +721,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -800,9 +800,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -879,9 +879,9 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -975,9 +975,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1054,9 +1054,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1133,9 +1133,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": true
|
||||
},
|
||||
"gradient": "auto",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1212,9 +1212,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1291,9 +1291,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1387,9 +1387,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": true
|
||||
},
|
||||
"gradient": "auto",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1470,9 +1470,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": true
|
||||
},
|
||||
"gradient": "auto",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1553,9 +1553,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": true
|
||||
},
|
||||
"gradient": "auto",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1645,10 +1645,10 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "auto",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1731,10 +1731,10 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "scheme",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1831,10 +1831,10 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "scheme",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1919,10 +1919,10 @@
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"sparkline": false,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "scheme",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -2005,10 +2005,10 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "hue",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -2091,10 +2091,10 @@
|
||||
"barGlow": true,
|
||||
"centerGlow": true,
|
||||
"rounded": true,
|
||||
"spotlight": true
|
||||
"spotlight": true,
|
||||
"gradient": true
|
||||
},
|
||||
"glow": "both",
|
||||
"gradient": "hue",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -2147,4 +2147,4 @@
|
||||
"title": "Panel tests - Gauge (new)",
|
||||
"uid": "panel-tests-gauge-new",
|
||||
"weekStart": ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -956,9 +956,9 @@
|
||||
"barGlow": false,
|
||||
"centerGlow": false,
|
||||
"rounded": false,
|
||||
"spotlight": false
|
||||
"spotlight": false,
|
||||
"gradient": false
|
||||
},
|
||||
"gradient": "none",
|
||||
"orientation": "auto",
|
||||
"reduceOptions": {
|
||||
"calcs": [
|
||||
@@ -1162,4 +1162,4 @@
|
||||
"title": "Panel tests - Old gauge to new",
|
||||
"uid": "panel-tests-old-gauge-to-new",
|
||||
"weekStart": ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,5 +237,10 @@
|
||||
"title": "V10 Table Thresholds Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -244,5 +244,10 @@
|
||||
"title": "V10 Table Thresholds Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -206,5 +206,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -213,5 +213,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -203,5 +203,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -216,5 +216,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -351,5 +351,10 @@
|
||||
"title": "V13 Graph Thresholds Migration Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -362,5 +362,10 @@
|
||||
"title": "V13 Graph Thresholds Migration Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,5 +129,10 @@
|
||||
"title": "Dashboard with minimal graph panel settings",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -132,5 +132,10 @@
|
||||
"title": "Dashboard with minimal graph panel settings",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -210,5 +210,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -217,5 +217,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1004,5 +1004,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1023,5 +1023,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -223,5 +223,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -231,5 +231,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1455,5 +1455,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1481,5 +1481,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -719,5 +719,10 @@
|
||||
"title": "V16 Grid Layout Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -739,5 +739,10 @@
|
||||
"title": "V16 Grid Layout Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1655,5 +1655,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1707,5 +1707,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -636,5 +636,10 @@
|
||||
"title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -657,5 +657,10 @@
|
||||
"title": "V17 MinSpan to MaxPerRow Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -401,5 +401,10 @@
|
||||
"title": "V18 Gauge Options Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -412,5 +412,10 @@
|
||||
"title": "V18 Gauge Options Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -434,5 +434,10 @@
|
||||
"title": "V19 Panel Links Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -447,5 +447,10 @@
|
||||
"title": "V19 Panel Links Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -354,5 +354,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -365,5 +365,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -426,5 +426,10 @@
|
||||
"title": "V20 Variable Syntax Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -437,5 +437,10 @@
|
||||
"title": "V20 Variable Syntax Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -401,5 +401,10 @@
|
||||
"title": "V21 Data Links Series to Field Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -412,5 +412,10 @@
|
||||
"title": "V21 Data Links Series to Field Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -123,5 +123,10 @@
|
||||
"title": "V22 Table Panel Styles Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -126,5 +126,10 @@
|
||||
"title": "V22 Table Panel Styles Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -374,5 +374,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -391,5 +391,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1065,5 +1065,10 @@
|
||||
"title": "No Title",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1101,5 +1101,10 @@
|
||||
"title": "No Title",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -217,5 +217,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -226,5 +226,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -240,5 +240,10 @@
|
||||
"title": "No Title",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -247,5 +247,10 @@
|
||||
"title": "No Title",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -207,5 +207,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -211,5 +211,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,5 +131,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -134,5 +134,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -393,5 +393,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -406,5 +406,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -622,5 +622,10 @@
|
||||
"title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -642,5 +642,10 @@
|
||||
"title": "V28 Singlestat and Variable Properties Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -435,5 +435,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -458,5 +458,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -294,5 +294,10 @@
|
||||
"title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -303,5 +303,10 @@
|
||||
"title": "V3 No-Op Migration - but tests ensuring panel IDs are unique",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -689,5 +689,10 @@
|
||||
"title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -705,5 +705,10 @@
|
||||
"title": "V30 Value Mappings and Tooltip Options Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -669,5 +669,10 @@
|
||||
"title": "V31 LabelsToFields Merge Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -684,5 +684,10 @@
|
||||
"title": "V31 LabelsToFields Merge Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -310,5 +310,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -320,5 +320,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -720,5 +720,10 @@
|
||||
"title": "V33 Panel Datasource Name to Ref Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -746,5 +746,10 @@
|
||||
"title": "V33 Panel Datasource Name to Ref Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1900,5 +1900,10 @@
|
||||
"title": "CloudWatch Multiple Statistics Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1964,5 +1964,10 @@
|
||||
"title": "CloudWatch Multiple Statistics Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -595,5 +595,10 @@
|
||||
"title": "X-Axis Visibility Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -612,5 +612,10 @@
|
||||
"title": "X-Axis Visibility Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1029,5 +1029,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1065,5 +1065,10 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -629,5 +629,10 @@
|
||||
"title": "V37 Legend Normalization Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -642,5 +642,10 @@
|
||||
"title": "V37 Legend Normalization Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -659,5 +659,10 @@
|
||||
"title": "V38 Table Migration Comprehensive Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -671,5 +671,10 @@
|
||||
"title": "V38 Table Migration Comprehensive Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -659,5 +659,10 @@
|
||||
"title": "V38 Table Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -671,5 +671,10 @@
|
||||
"title": "V38 Table Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -586,5 +586,10 @@
|
||||
"title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -596,5 +596,10 @@
|
||||
"title": "V39 TimeSeriesTable Transformation Migration Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -237,5 +237,10 @@
|
||||
"title": "V4 No-Op Migration Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -244,5 +244,10 @@
|
||||
"title": "V4 No-Op Migration Test",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,5 +64,10 @@
|
||||
"title": "Empty String Refresh Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,5 +65,10 @@
|
||||
"title": "Empty String Refresh Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,5 +64,10 @@
|
||||
"title": "Boolean False Refresh Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,5 +65,10 @@
|
||||
"title": "Boolean False Refresh Test Dashboard",
|
||||
"variables": []
|
||||
},
|
||||
"status": {}
|
||||
"status": {
|
||||
"conversion": {
|
||||
"failed": false,
|
||||
"storedVersion": "v1beta1"
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user