[MM-16244] Add Elasticsearch SkipTLSVerification parameter to the config (#11189)
* [MM-16244] Add Elasticsearch SkipTLSVerification parameter to the config * Add SkipTLSVerification config parameter to the diagnostics * Update diagnostics key for consistency Co-Authored-By: George Goldberg <george@gberg.me>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
efb9e2fe54
Коммит
162a2a9903
@@ -570,6 +570,7 @@ func (a *App) trackConfig() {
|
|||||||
"live_indexing_batch_size": *cfg.ElasticsearchSettings.LiveIndexingBatchSize,
|
"live_indexing_batch_size": *cfg.ElasticsearchSettings.LiveIndexingBatchSize,
|
||||||
"bulk_indexing_time_window_seconds": *cfg.ElasticsearchSettings.BulkIndexingTimeWindowSeconds,
|
"bulk_indexing_time_window_seconds": *cfg.ElasticsearchSettings.BulkIndexingTimeWindowSeconds,
|
||||||
"request_timeout_seconds": *cfg.ElasticsearchSettings.RequestTimeoutSeconds,
|
"request_timeout_seconds": *cfg.ElasticsearchSettings.RequestTimeoutSeconds,
|
||||||
|
"skip_tls_verification": *cfg.ElasticsearchSettings.SkipTLSVerification,
|
||||||
"trace": *cfg.ElasticsearchSettings.Trace,
|
"trace": *cfg.ElasticsearchSettings.Trace,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -2033,6 +2033,7 @@ type ElasticsearchSettings struct {
|
|||||||
LiveIndexingBatchSize *int `restricted:"true"`
|
LiveIndexingBatchSize *int `restricted:"true"`
|
||||||
BulkIndexingTimeWindowSeconds *int `restricted:"true"`
|
BulkIndexingTimeWindowSeconds *int `restricted:"true"`
|
||||||
RequestTimeoutSeconds *int `restricted:"true"`
|
RequestTimeoutSeconds *int `restricted:"true"`
|
||||||
|
SkipTLSVerification *bool `restricted:"true"`
|
||||||
Trace *string `restricted:"true"`
|
Trace *string `restricted:"true"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2113,6 +2114,10 @@ func (s *ElasticsearchSettings) SetDefaults() {
|
|||||||
s.RequestTimeoutSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS)
|
s.RequestTimeoutSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s.SkipTLSVerification == nil {
|
||||||
|
s.SkipTLSVerification = NewBool(false)
|
||||||
|
}
|
||||||
|
|
||||||
if s.Trace == nil {
|
if s.Trace == nil {
|
||||||
s.Trace = NewString("")
|
s.Trace = NewString("")
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user