Chore: remove dashboardsFromStorage (#65058)

This commit is contained in:
Ryan McKinley
2023-03-20 18:36:49 +02:00
committed by GitHub
parent fbb0dcb0ca
commit 91a4b8b529
16 changed files with 12 additions and 383 deletions
-7
View File
@@ -121,13 +121,6 @@ var (
RequiresDevMode: true,
Owner: grafanaAppPlatformSquad,
},
{
Name: "dashboardsFromStorage",
Description: "Load dashboards from the generic storage interface",
State: FeatureStateAlpha,
RequiresDevMode: true, // Also a gate on automatic git storage (for now)
Owner: grafanaAppPlatformSquad,
},
{
Name: "exploreMixedDatasource",
Description: "Enable mixed datasource in Explore",
-1
View File
@@ -17,7 +17,6 @@ featureHighlights,stable,@grafana/grafana-as-code,false,false,false,false
migrationLocking,beta,@grafana/backend-platform,false,false,false,false
storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
dashboardsFromStorage,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true
tracing,alpha,@grafana/user-essentials,false,false,false,true
newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
1 Name State Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
17 migrationLocking beta @grafana/backend-platform false false false false
18 storage alpha @grafana/grafana-app-platform-squad false false false false
19 k8s alpha @grafana/grafana-app-platform-squad true false false false
dashboardsFromStorage alpha @grafana/grafana-app-platform-squad true false false false
20 exploreMixedDatasource alpha @grafana/explore-squad false false false true
21 tracing alpha @grafana/user-essentials false false false true
22 newTraceView alpha @grafana/observability-traces-and-profiling false false false true
-4
View File
@@ -79,10 +79,6 @@ const (
// Explore native k8s integrations
FlagK8S = "k8s"
// FlagDashboardsFromStorage
// Load dashboards from the generic storage interface
FlagDashboardsFromStorage = "dashboardsFromStorage"
// FlagExploreMixedDatasource
// Enable mixed datasource in Explore
FlagExploreMixedDatasource = "exploreMixedDatasource"
-28
View File
@@ -44,34 +44,6 @@ func LoadStorageConfig(cfg *setting.Cfg, features featuremgmt.FeatureToggles) (*
changed = true
}
if g.Roots == nil && features.IsEnabled(featuremgmt.FlagDashboardsFromStorage) {
g.Roots = append(g.Roots, RootStorageConfig{
Type: "git",
Prefix: "it-A",
Name: "Repository that requires pull requests",
Git: &StorageGitConfig{
Remote: "https://github.com/grafana/hackathon-2022-03-git-dash-A",
Branch: "main",
Root: "dashboards", // the dashboard files
RequirePullRequest: true,
AccessToken: "$GRAFANA_STORAGE_GITHUB_ACCESS_TOKEN",
},
})
g.Roots = append(g.Roots, RootStorageConfig{
Type: "git",
Prefix: "it-B",
Name: "Another repo (can push to main)",
Git: &StorageGitConfig{
Remote: "https://github.com/grafana/hackathon-2022-03-git-dash-B",
Branch: "main",
Root: "dashboards", // the dashboard files
RequirePullRequest: false,
AccessToken: "$GRAFANA_STORAGE_GITHUB_ACCESS_TOKEN",
},
})
changed = true
}
g.filepath = fpath
// Also configured from ini files