[MM-47187] Certificate auth for Elasticsearch (#21958)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
398476138d
Коммит
3dd934711c
20
i18n/en.json
20
i18n/en.json
@@ -7351,6 +7351,26 @@
|
||||
"id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
|
||||
"translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.ca_cert_malformed",
|
||||
"translation": "Decoding of the CA for Elasticsearch failed"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.ca_cert_missing",
|
||||
"translation": "Could not open the CA file for Elasticsearch"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.client_cert_malformed",
|
||||
"translation": "Decoding of the client certificate for Elasticsearch failed"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.client_cert_missing",
|
||||
"translation": "Could not open the client certificate file for Elasticsearch"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.client_key_missing",
|
||||
"translation": "Could not open the client key file for Elasticsearch"
|
||||
},
|
||||
{
|
||||
"id": "ent.elasticsearch.create_client.connect_failed",
|
||||
"translation": "Setting up Elasticsearch Client Failed"
|
||||
|
||||
@@ -2563,6 +2563,9 @@ type ElasticsearchSettings struct {
|
||||
BatchSize *int `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
RequestTimeoutSeconds *int `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
SkipTLSVerification *bool `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
CA *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
ClientCert *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
ClientKey *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
Trace *string `access:"environment_elasticsearch,write_restrictable,cloud_restrictable"`
|
||||
}
|
||||
|
||||
@@ -2579,6 +2582,18 @@ func (s *ElasticsearchSettings) SetDefaults() {
|
||||
s.Password = NewString(ElasticsearchSettingsDefaultPassword)
|
||||
}
|
||||
|
||||
if s.CA == nil {
|
||||
s.CA = NewString("")
|
||||
}
|
||||
|
||||
if s.ClientCert == nil {
|
||||
s.ClientCert = NewString("")
|
||||
}
|
||||
|
||||
if s.ClientKey == nil {
|
||||
s.ClientKey = NewString("")
|
||||
}
|
||||
|
||||
if s.EnableIndexing == nil {
|
||||
s.EnableIndexing = NewBool(false)
|
||||
}
|
||||
|
||||
@@ -777,6 +777,9 @@ func (ts *TelemetryService) trackConfig() {
|
||||
"bulk_indexing_batch_size": *cfg.ElasticsearchSettings.BatchSize,
|
||||
"request_timeout_seconds": *cfg.ElasticsearchSettings.RequestTimeoutSeconds,
|
||||
"skip_tls_verification": *cfg.ElasticsearchSettings.SkipTLSVerification,
|
||||
"isdefault_ca": isDefault(*cfg.ElasticsearchSettings.CA, ""),
|
||||
"isdefault_client_cert": isDefault(*cfg.ElasticsearchSettings.ClientCert, ""),
|
||||
"isdefault_client_key": isDefault(*cfg.ElasticsearchSettings.ClientKey, ""),
|
||||
"trace": *cfg.ElasticsearchSettings.Trace,
|
||||
})
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user