From 7aca818aae26474cdaacfd8c21e3a1534dfa8678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Wed, 8 Mar 2023 13:42:47 +0100
Subject: [PATCH] feature flags: assign flags to observability-logs squad
 (#64380)

---
 pkg/services/featuremgmt/codeowners.go       | 21 ++++++++++----------
 pkg/services/featuremgmt/registry.go         |  7 ++++++-
 pkg/services/featuremgmt/toggles_gen_test.go |  5 -----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 7b62880638d..a31e27a7d7c 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -5,14 +5,15 @@ package featuremgmt
 type codeowner string
 
 const (
-	grafanaAppPlatformSquad     codeowner = "@grafana/grafana-app-platform-squad"
-	grafanaDashboardsSquad      codeowner = "@grafana/dashboards-squad"
-	grafanaExploreSquad         codeowner = "@grafana/explore-squad"
-	grafanaBiSquad              codeowner = "@grafana/grafana-bi-squad"
-	grafanaDatavizSquad         codeowner = "@grafana/dataviz-squad"
-	grafanaUserEssentialsSquad  codeowner = "@grafana/user-essentials"
-	grafanaBackendPlatformSquad codeowner = "@grafana/backend-platform"
-	grafanaPluginsPlatformSquad codeowner = "@grafana/plugins-platform-backend"
-	grafanaAsCodeSquad          codeowner = "@grafana/grafana-as-code"
-	grafanaAuthnzSquad          codeowner = "@grafana/grafana-authnz-team"
+	grafanaAppPlatformSquad       codeowner = "@grafana/grafana-app-platform-squad"
+	grafanaDashboardsSquad        codeowner = "@grafana/dashboards-squad"
+	grafanaExploreSquad           codeowner = "@grafana/explore-squad"
+	grafanaBiSquad                codeowner = "@grafana/grafana-bi-squad"
+	grafanaDatavizSquad           codeowner = "@grafana/dataviz-squad"
+	grafanaUserEssentialsSquad    codeowner = "@grafana/user-essentials"
+	grafanaBackendPlatformSquad   codeowner = "@grafana/backend-platform"
+	grafanaPluginsPlatformSquad   codeowner = "@grafana/plugins-platform-backend"
+	grafanaAsCodeSquad            codeowner = "@grafana/grafana-as-code"
+	grafanaAuthnzSquad            codeowner = "@grafana/grafana-authnz-team"
+	grafanaObservabilityLogsSquad codeowner = "@grafana/observability-logs"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index f603daae548..81a7c443b4d 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -84,12 +84,13 @@ var (
 			Name:        "lokiLive",
 			Description: "Support WebSocket streaming for loki (early prototype)",
 			State:       FeatureStateAlpha,
-			Owner:       grafanaAppPlatformSquad,
+			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:        "lokiDataframeApi",
 			Description: "Use experimental loki api for WebSocket streaming (early prototype)",
 			State:       FeatureStateAlpha,
+			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:        "featureHighlights",
@@ -323,6 +324,7 @@ var (
 			Name:        "elasticsearchBackendMigration",
 			Description: "Use Elasticsearch as backend data source",
 			State:       FeatureStateAlpha,
+			Owner:       grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:        "datasourceOnboarding",
@@ -370,18 +372,21 @@ var (
 			State:        FeatureStateStable,
 			Expression:   "true", //turned on by default
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:         "logsContextDatasourceUi",
 			Description:  "Allow datasource to provide custom UI for context view",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:         "lokiQuerySplitting",
 			Description:  "Split large interval queries into subqueries with smaller time intervals",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityLogsSquad,
 		},
 		{
 			Name:        "individualCookiePreferences",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index 9e4b55c8072..acfb3a15f89 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -46,7 +46,6 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"trimDefaults":                      true,
 		"database_metrics":                  true,
 		"prometheusAzureOverrideAudience":   true,
-		"lokiDataframeApi":                  true,
 		"featureHighlights":                 true,
 		"tracing":                           true,
 		"newTraceView":                      true,
@@ -62,15 +61,11 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"athenaAsyncQueryDataSupport":       true,
 		"newPanelChromeUI":                  true,
 		"showDashboardValidationWarnings":   true,
-		"elasticsearchBackendMigration":     true,
 		"datasourceOnboarding":              true,
 		"secureSocksDatasourceProxy":        true,
 		"disablePrometheusExemplarSampling": true,
 		"alertingBacktesting":               true,
 		"alertingNoNormalState":             true,
-		"logsSampleInExplore":               true,
-		"logsContextDatasourceUi":           true,
-		"lokiQuerySplitting":                true,
 		"individualCookiePreferences":       true,
 		"traceqlSearch":                     true,
 	}