Merge pull request #2342 from n313893254/poi

Support tls version config for elasticsearch

lib/logging/addon/components/logging/form-log-ssl/component.js

@@ -3,6 +3,19 @@ import { observer, get, set } from '@ember/object';
 import { alias } from '@ember/object/computed'
 
 export default Component.extend({
+  sslVersionContent: [{
+    label: 'SSLv23',
+    value: 'SSLv23',
+  }, {
+    label: 'TLSv1',
+    value: 'TLSv1',
+  }, {
+    label: 'TLSv1_1',
+    value: 'TLSv1_1',
+  }, {
+    label: 'TLSv1_2',
+    value: 'TLSv1_2',
+  }],
   sslVerify: alias('config.sslVerify'),
 
   sslVerifyChange: observer('sslVerify', function() {
@@ -12,4 +25,5 @@ export default Component.extend({
       }
     }
   }),
+
 });

lib/logging/addon/components/logging/form-log-ssl/template.hbs

@@ -46,6 +46,14 @@
               className="form-control"
               placeholder=(t 'loggingPage.ssl.clientKeyPass.password.placeholder')
             }}
+          {{#if (eq targetType 'elasticsearch')}}
+            <label class="acc-label pt-5">{{t 'loggingPage.ssl.sslVersion.label'}}</label>
+            {{new-select
+            classNames="form-control"
+            content=sslVersionContent
+            value=config.sslVersion
+            }}
+          {{/if}}
         </div>
       {{/if}}
       <div class="col span-6">

lib/logging/translations/en-us.yaml

@@ -159,6 +159,8 @@ loggingPage:
       label: SSL Verify
       enabled: Enabled - Input trusted server certificate
       disabled: Disabled
+    sslVersion:
+      label: SSL Version
   dockerRootDir:
     header: Docker Configuration
     label: Docker Root Directory

lib/logging/translations/zh-hans.yaml

@@ -143,14 +143,14 @@ loggingPage:
     enableTls:
       label: Use TLS
     certificate:
-      label: PEM格式的CA证书 
+      label: PEM格式的CA证书
     hostname:
       label: 主机名
       placeholder: 服务器主机名
   ssl:
     sslHeader: SSL配置
     certificate:
-      label: PEM格式的CA证书 
+      label: PEM格式的CA证书
     clientKey:
       label: 客户端私钥
     clientCert:
@@ -163,6 +163,8 @@ loggingPage:
       label: SSL校验
       enabled: '启用'
       disabled: 禁用
+    sslVersion:
+      label: SSL版本
   dockerRootDir:
     header: Docker配置
     label: Docker Root Directory