From b8234e2c390067d5fd68a6771acf706f78799866 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 18 Dec 2025 10:29:54 +0300 Subject: [PATCH] main --- apps/live/go.mod | 3 +++ apps/live/kinds/folder.cue | 13 ------------- apps/live/kinds/manifest.cue | 2 +- go.mod | 1 + pkg/server/wire_gen.go | 7 +++++-- 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 apps/live/kinds/folder.cue diff --git a/apps/live/go.mod b/apps/live/go.mod index b5c1061dffa..c495cc9f22f 100644 --- a/apps/live/go.mod +++ b/apps/live/go.mod @@ -4,7 +4,10 @@ go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.5 + github.com/grafana/grafana-app-sdk/logging v0.48.3 + github.com/grafana/grafana/pkg/apimachinery v0.0.0-20251017153501-8512b219c5fe k8s.io/apimachinery v0.34.2 + k8s.io/apiserver v0.34.2 k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 ) diff --git a/apps/live/kinds/folder.cue b/apps/live/kinds/folder.cue deleted file mode 100644 index 52d9b247ea3..00000000000 --- a/apps/live/kinds/folder.cue +++ /dev/null @@ -1,13 +0,0 @@ -package live - -liveV1beta1: { - kind: "Channel" - pluralName: "Channels" - - schema: { - spec: { - title: string - description?: string - } - } -} \ No newline at end of file diff --git a/apps/live/kinds/manifest.cue b/apps/live/kinds/manifest.cue index cb2aa635907..43de2226756 100644 --- a/apps/live/kinds/manifest.cue +++ b/apps/live/kinds/manifest.cue @@ -10,7 +10,7 @@ manifest: { go: {enabled: true} } kinds: [ - liveV1beta1, + channelV1beta1, ] } } diff --git a/go.mod b/go.mod index 40e3288158d..61cda9b00c1 100644 --- a/go.mod +++ b/go.mod @@ -279,6 +279,7 @@ replace ( github.com/grafana/grafana/apps/folder => ./apps/folder github.com/grafana/grafana/apps/iam => ./apps/iam github.com/grafana/grafana/apps/investigations => ./apps/investigations + github.com/grafana/grafana/apps/live => ./apps/live github.com/grafana/grafana/apps/logsdrilldown => ./apps/logsdrilldown github.com/grafana/grafana/apps/playlist => ./apps/playlist github.com/grafana/grafana/apps/plugins => ./apps/plugins diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go index 1406e6fdbf8..f157a4d620d 100644 --- a/pkg/server/wire_gen.go +++ b/pkg/server/wire_gen.go @@ -56,6 +56,7 @@ import ( "github.com/grafana/grafana/pkg/registry/apis/iam" "github.com/grafana/grafana/pkg/registry/apis/iam/externalgroupmapping" "github.com/grafana/grafana/pkg/registry/apis/iam/noopstorage" + live2 "github.com/grafana/grafana/pkg/registry/apis/live" "github.com/grafana/grafana/pkg/registry/apis/ofrep" "github.com/grafana/grafana/pkg/registry/apis/preferences" provisioning2 "github.com/grafana/grafana/pkg/registry/apis/provisioning" @@ -919,11 +920,12 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api if err != nil { return nil, err } + liveAPIBuilder := live2.RegisterAPIService(cfg, featureToggles, grafanaLive, apiserverService) provisioningDependencyRegisterer, err := provisioning2.RegisterDependencies(cfg, acimplService, featureToggles) if err != nil { return nil, err } - apiregistryService := apiregistry.ProvideRegistryServiceSink(dashboardsAPIBuilder, dataSourceAPIBuilder, folderAPIBuilder, identityAccessManagementAPIBuilder, queryAPIBuilder, userStorageAPIBuilder, apiBuilder, collectionsAPIBuilder, provisioningAPIBuilder, ofrepAPIBuilder, dependencyRegisterer, provisioningDependencyRegisterer) + apiregistryService := apiregistry.ProvideRegistryServiceSink(dashboardsAPIBuilder, dataSourceAPIBuilder, folderAPIBuilder, identityAccessManagementAPIBuilder, queryAPIBuilder, userStorageAPIBuilder, apiBuilder, collectionsAPIBuilder, provisioningAPIBuilder, ofrepAPIBuilder, liveAPIBuilder, dependencyRegisterer, provisioningDependencyRegisterer) teamPermissionsService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, acimplService, teamService, userService, actionSetService) if err != nil { return nil, err @@ -1577,11 +1579,12 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac if err != nil { return nil, err } + liveAPIBuilder := live2.RegisterAPIService(cfg, featureToggles, grafanaLive, apiserverService) provisioningDependencyRegisterer, err := provisioning2.RegisterDependencies(cfg, acimplService, featureToggles) if err != nil { return nil, err } - apiregistryService := apiregistry.ProvideRegistryServiceSink(dashboardsAPIBuilder, dataSourceAPIBuilder, folderAPIBuilder, identityAccessManagementAPIBuilder, queryAPIBuilder, userStorageAPIBuilder, apiBuilder, collectionsAPIBuilder, provisioningAPIBuilder, ofrepAPIBuilder, dependencyRegisterer, provisioningDependencyRegisterer) + apiregistryService := apiregistry.ProvideRegistryServiceSink(dashboardsAPIBuilder, dataSourceAPIBuilder, folderAPIBuilder, identityAccessManagementAPIBuilder, queryAPIBuilder, userStorageAPIBuilder, apiBuilder, collectionsAPIBuilder, provisioningAPIBuilder, ofrepAPIBuilder, liveAPIBuilder, dependencyRegisterer, provisioningDependencyRegisterer) teamPermissionsService, err := ossaccesscontrol.ProvideTeamPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, acimplService, teamService, userService, actionSetService) if err != nil { return nil, err