PLT-6961: Add Elasticsearch settings to diagnostics. (#7021)

Этот коммит содержится в:
George Goldberg
2017-07-31 16:53:44 +01:00
коммит произвёл Harrison Healey
родитель 72f61ab96a
Коммит c506c5cac6
2 изменённых файлов: 38 добавлений и 24 удалений

Просмотреть файл

@@ -37,6 +37,7 @@ const (
TRACK_CONFIG_NATIVEAPP = "config_nativeapp" TRACK_CONFIG_NATIVEAPP = "config_nativeapp"
TRACK_CONFIG_ANALYTICS = "config_analytics" TRACK_CONFIG_ANALYTICS = "config_analytics"
TRACK_CONFIG_ANNOUNCEMENT = "config_announcement" TRACK_CONFIG_ANNOUNCEMENT = "config_announcement"
TRACK_CONFIG_ELASTICSEARCH = "config_elasticsearch"
TRACK_ACTIVITY = "activity" TRACK_ACTIVITY = "activity"
TRACK_LICENSE = "license" TRACK_LICENSE = "license"
@@ -382,6 +383,15 @@ func trackConfig() {
"isdefault_banner_text_color": isDefault(*utils.Cfg.AnnouncementSettings.BannerTextColor, model.ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR), "isdefault_banner_text_color": isDefault(*utils.Cfg.AnnouncementSettings.BannerTextColor, model.ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR),
"allow_banner_dismissal": *utils.Cfg.AnnouncementSettings.AllowBannerDismissal, "allow_banner_dismissal": *utils.Cfg.AnnouncementSettings.AllowBannerDismissal,
}) })
SendDiagnostic(TRACK_CONFIG_ELASTICSEARCH, map[string]interface{}{
"isdefault_connection_url": isDefault(*utils.Cfg.ElasticsearchSettings.ConnectionUrl, model.ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL),
"isdefault_username": isDefault(*utils.Cfg.ElasticsearchSettings.Username, model.ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME),
"isdefault_password": isDefault(*utils.Cfg.ElasticsearchSettings.Password, model.ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD),
"enable_indexing": *utils.Cfg.ElasticsearchSettings.EnableIndexing,
"enable_searching": *utils.Cfg.ElasticsearchSettings.EnableSearching,
"sniff": *utils.Cfg.ElasticsearchSettings.Sniff,
})
} }
func trackLicense() { func trackLicense() {

Просмотреть файл

@@ -118,6 +118,10 @@ const (
ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_COLOR = "#f2a93b" ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_COLOR = "#f2a93b"
ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR = "#333333" ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR = "#333333"
ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL = ""
ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME = ""
ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD = ""
) )
type ServiceSettings struct { type ServiceSettings struct {
@@ -1379,17 +1383,17 @@ func (o *Config) SetDefaults() {
if o.ElasticsearchSettings.ConnectionUrl == nil { if o.ElasticsearchSettings.ConnectionUrl == nil {
o.ElasticsearchSettings.ConnectionUrl = new(string) o.ElasticsearchSettings.ConnectionUrl = new(string)
*o.ElasticsearchSettings.ConnectionUrl = "" *o.ElasticsearchSettings.ConnectionUrl = ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL
} }
if o.ElasticsearchSettings.Username == nil { if o.ElasticsearchSettings.Username == nil {
o.ElasticsearchSettings.Username = new(string) o.ElasticsearchSettings.Username = new(string)
*o.ElasticsearchSettings.Username = "" *o.ElasticsearchSettings.Username = ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME
} }
if o.ElasticsearchSettings.Password == nil { if o.ElasticsearchSettings.Password == nil {
o.ElasticsearchSettings.Password = new(string) o.ElasticsearchSettings.Password = new(string)
*o.ElasticsearchSettings.Password = "" *o.ElasticsearchSettings.Password = ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD
} }
if o.ElasticsearchSettings.EnableIndexing == nil { if o.ElasticsearchSettings.EnableIndexing == nil {