diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-11-03 12:57:13 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-11-03 16:57:13 +0000 |
| commit | ad82f07fb3dec1a4faa8f42d22cc533b0ddd2051 (patch) | |
| tree | 5dc3e1bae01dea32bb69021d38d88d78c6ea415f /app/diagnostics.go | |
| parent | d2cff9b77cca87c339e65591179a2d7456a6915a (diff) | |
| download | chat-ad82f07fb3dec1a4faa8f42d22cc533b0ddd2051.tar.gz chat-ad82f07fb3dec1a4faa8f42d22cc533b0ddd2051.tar.bz2 chat-ad82f07fb3dec1a4faa8f42d22cc533b0ddd2051.zip | |
Update diagnostics.go (#7768)
ElasticsearchSettings: LiveIndexingBatchSize, BulkIndexingTimeWindowSeconds
LdapSettings: EnableSync
SamlSettings: EnableSyncWithLdap
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 9d5f488a7..b74af8914 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -364,6 +364,7 @@ func (a *App) trackConfig() { SendDiagnostic(TRACK_CONFIG_LDAP, map[string]interface{}{ "enable": *cfg.LdapSettings.Enable, + "enable_sync": *cfg.LdapSettings.EnableSync, "connection_security": *cfg.LdapSettings.ConnectionSecurity, "skip_certificate_verification": *cfg.LdapSettings.SkipCertificateVerification, "sync_interval_minutes": *cfg.LdapSettings.SyncIntervalMinutes, @@ -392,6 +393,7 @@ func (a *App) trackConfig() { SendDiagnostic(TRACK_CONFIG_SAML, map[string]interface{}{ "enable": *cfg.SamlSettings.Enable, + "enable_sync_with_ldap": *cfg.SamlSettings.EnableSyncWithLdap, "verify": *cfg.SamlSettings.Verify, "encrypt": *cfg.SamlSettings.Encrypt, "isdefault_first_name_attribute": isDefault(*cfg.SamlSettings.FirstNameAttribute, model.SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE), @@ -440,15 +442,18 @@ func (a *App) trackConfig() { }) SendDiagnostic(TRACK_CONFIG_ELASTICSEARCH, map[string]interface{}{ - "isdefault_connection_url": isDefault(*cfg.ElasticsearchSettings.ConnectionUrl, model.ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL), - "isdefault_username": isDefault(*cfg.ElasticsearchSettings.Username, model.ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME), - "isdefault_password": isDefault(*cfg.ElasticsearchSettings.Password, model.ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD), - "enable_indexing": *cfg.ElasticsearchSettings.EnableIndexing, - "enable_searching": *cfg.ElasticsearchSettings.EnableSearching, - "sniff": *cfg.ElasticsearchSettings.Sniff, - "post_index_replicas": *cfg.ElasticsearchSettings.PostIndexReplicas, - "post_index_shards": *cfg.ElasticsearchSettings.PostIndexShards, - "isdefault_index_prefix": isDefault(*cfg.ElasticsearchSettings.IndexPrefix, model.ELASTICSEARCH_SETTINGS_DEFAULT_INDEX_PREFIX), + "isdefault_connection_url": isDefault(*cfg.ElasticsearchSettings.ConnectionUrl, model.ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL), + "isdefault_username": isDefault(*cfg.ElasticsearchSettings.Username, model.ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME), + "isdefault_password": isDefault(*cfg.ElasticsearchSettings.Password, model.ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD), + "enable_indexing": *cfg.ElasticsearchSettings.EnableIndexing, + "enable_searching": *cfg.ElasticsearchSettings.EnableSearching, + "sniff": *cfg.ElasticsearchSettings.Sniff, + "post_index_replicas": *cfg.ElasticsearchSettings.PostIndexReplicas, + "post_index_shards": *cfg.ElasticsearchSettings.PostIndexShards, + "isdefault_index_prefix": isDefault(*cfg.ElasticsearchSettings.IndexPrefix, model.ELASTICSEARCH_SETTINGS_DEFAULT_INDEX_PREFIX), + "live_indexing_batch_size": *cfg.ElasticsearchSettings.LiveIndexingBatchSize, + "bulk_indexing_time_window_seconds": *cfg.ElasticsearchSettings.BulkIndexingTimeWindowSeconds, + "request_timeout_seconds": *cfg.ElasticsearchSettings.RequestTimeoutSeconds, }) SendDiagnostic(TRACK_CONFIG_PLUGIN, map[string]interface{}{ |