News: Expose config option to disable News feed (#69365)

* customize news feed

* remove url customisation
This commit is contained in:
Ashley Harrison
2023-06-01 13:35:05 +01:00
committed by GitHub
parent 6d9db92a07
commit 778963849e
11 changed files with 30 additions and 7 deletions
+1
View File
@@ -147,6 +147,7 @@ type FrontendSettingsDTO struct {
ExploreEnabled bool `json:"exploreEnabled"`
HelpEnabled bool `json:"helpEnabled"`
ProfileEnabled bool `json:"profileEnabled"`
NewsFeedEnabled bool `json:"newsFeedEnabled"`
QueryHistoryEnabled bool `json:"queryHistoryEnabled"`
GoogleAnalyticsId string `json:"googleAnalyticsId"`
+2 -1
View File
@@ -32,5 +32,6 @@ type IndexViewData struct {
CSPEnabled bool
IsDevelopmentEnv bool
// Nonce is a cryptographic identifier for use with Content Security Policy.
Nonce string
Nonce string
NewsFeedEnabled bool
}
+1
View File
@@ -123,6 +123,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
ExploreEnabled: setting.ExploreEnabled,
HelpEnabled: setting.HelpEnabled,
ProfileEnabled: setting.ProfileEnabled,
NewsFeedEnabled: setting.NewsFeedEnabled,
QueryHistoryEnabled: hs.Cfg.QueryHistoryEnabled,
GoogleAnalyticsId: hs.Cfg.GoogleAnalyticsID,
GoogleAnalytics4Id: hs.Cfg.GoogleAnalytics4ID,
+1
View File
@@ -110,6 +110,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
ThemeType: theme.Type,
AppUrl: appURL,
AppSubUrl: appSubURL,
NewsFeedEnabled: setting.NewsFeedEnabled,
GoogleAnalyticsId: settings.GoogleAnalyticsId,
GoogleAnalytics4Id: settings.GoogleAnalytics4Id,
GoogleAnalytics4SendManualPageViews: hs.Cfg.GoogleAnalytics4SendManualPageViews,
+6
View File
@@ -135,6 +135,9 @@ var (
// Profile UI
ProfileEnabled bool
// News Feed
NewsFeedEnabled bool
// Grafana.NET URL
GrafanaComUrl string
@@ -1104,6 +1107,9 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
profile := iniFile.Section("profile")
ProfileEnabled = profile.Key("enabled").MustBool(true)
news := iniFile.Section("news")
NewsFeedEnabled = news.Key("news_feed_enabled").MustBool(true)
queryHistory := iniFile.Section("query_history")
cfg.QueryHistoryEnabled = queryHistory.Key("enabled").MustBool(true)