* Prometheus: Query builder UX tweaks and feedback link
* Remove .
* Fixed link
* added option to hide feedback links
* feedback link setting name change
* move config check
* fixed ts issue
(cherry picked from commit 057ff5bcf5)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
This commit is contained in:
co-authored by
Torkel Ödegaard
parent
2a34264cdd
commit
05fb17c3f3
@@ -113,6 +113,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
|
||||
"rudderstackDataPlaneUrl": setting.RudderstackDataPlaneUrl,
|
||||
"rudderstackSdkUrl": setting.RudderstackSdkUrl,
|
||||
"rudderstackConfigUrl": setting.RudderstackConfigUrl,
|
||||
"feedbackLinksEnabled": hs.Cfg.FeedbackLinksEnabled,
|
||||
"applicationInsightsConnectionString": hs.Cfg.ApplicationInsightsConnectionString,
|
||||
"applicationInsightsEndpointUrl": hs.Cfg.ApplicationInsightsEndpointUrl,
|
||||
"disableLoginForm": setting.DisableLoginForm,
|
||||
|
||||
@@ -393,6 +393,7 @@ type Cfg struct {
|
||||
ReportingEnabled bool
|
||||
ApplicationInsightsConnectionString string
|
||||
ApplicationInsightsEndpointUrl string
|
||||
FeedbackLinksEnabled bool
|
||||
|
||||
// LDAP
|
||||
LDAPEnabled bool
|
||||
@@ -938,13 +939,17 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
|
||||
RudderstackDataPlaneUrl = analytics.Key("rudderstack_data_plane_url").String()
|
||||
RudderstackSdkUrl = analytics.Key("rudderstack_sdk_url").String()
|
||||
RudderstackConfigUrl = analytics.Key("rudderstack_config_url").String()
|
||||
|
||||
cfg.ReportingEnabled = analytics.Key("reporting_enabled").MustBool(true)
|
||||
cfg.ReportingDistributor = analytics.Key("reporting_distributor").MustString("grafana-labs")
|
||||
|
||||
if len(cfg.ReportingDistributor) >= 100 {
|
||||
cfg.ReportingDistributor = cfg.ReportingDistributor[:100]
|
||||
}
|
||||
|
||||
cfg.ApplicationInsightsConnectionString = analytics.Key("application_insights_connection_string").String()
|
||||
cfg.ApplicationInsightsEndpointUrl = analytics.Key("application_insights_endpoint_url").String()
|
||||
cfg.FeedbackLinksEnabled = analytics.Key("feedback_links_enabled").MustBool(true)
|
||||
|
||||
if err := readAlertingSettings(iniFile); err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user