Merge pull request #3305 from n313893254/revert-3271-22194

[2.3.0]Revert "Add configurations for multi-line loggging"

app/mixins/logging-model.js

@@ -57,10 +57,6 @@ export default Mixin.create({
         [`${ t }.outputTags`]:             get(this, `outputTags`),
         [`${ t }.dockerRootDir`]:          get(this, 'dockerRootDir'),
         [`${ t }.includeSystemComponent`]: get(this, 'includeSystemComponent'),
-        [`${ t }.enableMultiLineFilter`]:  get(this, 'enableMultiLineFilter'),
-        [`${ t }.multiLineStartRegexp`]:   get(this, 'multiLineStartRegexp'),
-        [`${ t }.continueLineRegexp`]:     get(this, 'continueLineRegexp'),
-        [`${ t }.multiLineEndRegexp`]:     get(this, 'multiLineEndRegexp'),
       })
     }
 

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

@@ -0,0 +1,15 @@
+<main class="row mt-30">
+  <h2 class="mt-0">{{t 'loggingPage.dockerRootDir.header'}}</h2>
+  <hr/>
+  <div class="row">
+    <div class="col span-12">
+      <label class="acc-label">{{t 'loggingPage.dockerRootDir.label'}}</label>
+      {{input
+          type="text"
+          value=model.dockerRootDir
+          className="form-control"
+          placeholder=(t 'loggingPage.dockerRootDir.placeholder' dir=parentModel.dockerRootDir)
+        }}
+    </div>
+  </div>
+</main>

lib/logging/addon/components/logging/form-multi-line/template.hbs

@@ -1,63 +0,0 @@
-{{log model "model"}}
-<div class="row">
-  <div class="col span-6">
-    <div>
-      <label class="acc-label">
-        {{t "loggingPage.multiLine.enableMultiLineFilter.label"}}
-      </label>
-    </div>
-    <div class="radio">
-      <label>
-        {{radio-button
-          selection=model.enableMultiLineFilter
-          value=false
-        }}
-        {{t "generic.disabled"}}
-      </label>
-    </div>
-    <div class="radio">
-      <label>
-        {{radio-button
-          selection=model.enableMultiLineFilter
-          value=true
-        }}
-        {{t "generic.enabled"}}
-      </label>
-    </div>
-  </div>
-</div>
-
-{{#if model.enableMultiLineFilter}}
-  <div class="row">
-    <div class="col span-4">
-      <label class="acc-label">
-        {{t "loggingPage.multiLine.multiLineStartRegexp.label"}}
-      </label>
-      {{input
-        id=(concat "input-multi-start-" targetType)
-        value=model.multiLineStartRegexp
-        classNames="form-control"
-      }}
-    </div>
-    <div class="col span-4">
-      <label class="acc-label">
-        {{t "loggingPage.multiLine.continueLineRegexp.label"}}
-      </label>
-      {{input
-        id=(concat "input-multi-continue-" targetType)
-        value=model.continueLineRegexp
-        classNames="form-control"
-      }}
-    </div>
-    <div class="col span-4">
-      <label class="acc-label">
-        {{t "loggingPage.multiLine.multiLineEndRegexp.label"}}
-      </label>
-      {{input
-        id=(concat "input-multi-end-" targetType)
-        value=model.multiLineEndRegexp
-        classNames="form-control"
-      }}
-    </div>
-  </div>
-{{/if}}

lib/logging/addon/components/logging/new-edit/component.js

@@ -305,10 +305,6 @@ export default Component.extend(NewOrEdit, {
         dockerRoot:                get(model, `${ targetType }.dockerRoot`),
         [`${ targetType }Config`]: get(this, 'globalStore').createRecord(formatConfig),
         includeSystemComponent:    get(model, `${ targetType }.includeSystemComponent`),
-        enableMultiLineFilter:     get(model, `${ targetType }.enableMultiLineFilter`),
-        multiLineStartRegexp:      get(model, `${ targetType }.multiLineStartRegexp`),
-        continueLineRegexp:        get(model, `${ targetType }.continueLineRegexp`),
-        multiLineEndRegexp:        get(model, `${ targetType }.multiLineEndRegexp`)
       })
 
       if (targetType === 'elasticsearch') {

lib/logging/addon/components/logging/target-elasticsearch/template.hbs

@@ -1,150 +1,91 @@
-<h2 class="mt-30">
-  {{t "loggingPage.elasticsearch.header"}}
-</h2>
+<h2 class="mt-30">{{t 'loggingPage.elasticsearch.header'}}</h2>
 <hr/>
 <div class="box">
   <section class="mb-30">
     <div>
-      <label class="acc-label">
-        {{t "loggingPage.endpoint"}}
-        {{field-required}}
-      </label>
+      <label class="acc-label" for="">{{t 'loggingPage.endpoint'}}{{field-required}}</label>
       {{input
-        type="text"
-        value=config.endpoint
-        classNames="form-control"
-        placeholder=(t "loggingPage.endpointPlaceholder")
-        id="elasticsearch-endpoint"
-        focus-out=(action "alertMessage")
+          type="text"
+          value=config.endpoint
+          classNames="form-control"
+          placeholder=(t 'loggingPage.endpointPlaceholder')
+          id="elasticsearch-endpoint"
+          focus-out=(action "alertMessage")
       }}
     </div>
     {{#if endpointError}}
-      <p class="text-error text-small">
-        {{t endpointErrorText}}
-      </p>
+      <p class="text-error text-small">{{t endpointErrorText}}</p>
     {{else}}
-      <p class="text-info text-small">
-        {{t "loggingPage.elasticsearch.endpointHelpText"}}
-      </p>
+      <p class="text-info text-small">{{t 'loggingPage.elasticsearch.endpointHelpText'}}</p>
     {{/if}}
   </section>
-  <h4>
-    {{t "loggingPage.elasticsearch.xpack.header"}}
-    <span class="text-muted">
-      {{t "loggingPage.elasticsearch.xpack.headerOptional"}}
-    </span>
-  </h4>
+  <h4>{{t 'loggingPage.elasticsearch.xpack.header'}} <span class="text-muted">{{t 'loggingPage.elasticsearch.xpack.headerOptional'}}</span></h4>
   <section>
-    <p class="text-info text-small">
-      {{t "loggingPage.elasticsearch.xpack.helpText"}}
-    </p>
+    <p class="text-info text-small"> {{t 'loggingPage.elasticsearch.xpack.helpText'}} </p>
     <div class="row">
       <div class="col span-6">
-        <label class="acc-label">
-          {{t "loggingPage.elasticsearch.xpack.username"}}
-        </label>
+        <label class="acc-label" for=""> {{t 'loggingPage.elasticsearch.xpack.username'}} </label>
         {{input
-          type="text"
-          utocomplete="off"
-          value=config.authUsername
-          classNames="form-control"
-          placeholder=(t "loggingPage.elasticsearch.xpack.usernamePlaceholder")
+            type="text"
+            utocomplete="off"
+            value=config.authUsername
+            classNames="form-control"
+            placeholder=(t 'loggingPage.elasticsearch.xpack.usernamePlaceholder')
         }}
       </div>
       <div class="col span-6">
-        <label class="acc-label">
-          {{t "loggingPage.elasticsearch.xpack.password"}}
-        </label>
+        <label class="acc-label"> {{t 'loggingPage.elasticsearch.xpack.password'}} </label>
         {{input
-          autocomplete="off"
-          type="password"
-          value=config.authPassword
-          classNames="form-control"
-          placeholder=(t "loggingPage.elasticsearch.xpack.passwordPlaceholder")
+            utocomplete="off"
+            type="password"
+            value=config.authPassword
+            classNames="form-control"
+            placeholder=(t 'loggingPage.elasticsearch.xpack.passwordPlaceholder')
         }}
       </div>
     </div>
   </section>
-  <h4 class="mt-20">
-    {{t "loggingPage.elasticsearch.indexPatterns.header"}}
-  </h4>
-  <p class="text-info text-small">
-    {{t "loggingPage.elasticsearch.indexPatterns.helpText"}}
-  </p>
+  <h4 class="mt-20">{{t 'loggingPage.elasticsearch.indexPatterns.header'}}</h4>
+  <p class="text-info text-small">{{t 'loggingPage.elasticsearch.indexPatterns.helpText'}}</p>
   <section>
     <div class="row">
       <div class="col span-6">
-        <label class="acc-label">
-          {{t "loggingPage.elasticsearch.indexPatterns.prefix"}}
-          {{field-required}}
-        </label>
+        <label class="acc-label">{{t 'loggingPage.elasticsearch.indexPatterns.prefix'}}{{field-required}}</label>
         {{input
-          type="text"
-          value=config.indexPrefix
-          className="form-control"
-          placeholder=(t "loggingPage.elasticsearch.indexPatterns.prefixPlaceholder")
-        }}
+            type="text"
+            value=config.indexPrefix
+            className="form-control"
+            placeholder=(t 'loggingPage.elasticsearch.indexPatterns.prefixPlaceholder')
+          }}
       </div>
       <div class="col span-6">
         <div style="margin-top: 34px;">
-          <label>
-            {{t "loggingPage.elasticsearch.indexPatterns.dateFormat"}}
-          </label>
-          <label class="mr-10">
-            {{radio-button
-              selection=config.dateFormat
-              value="YYYY-MM-DD"
-            }}
-            YYYY-MM-DD
-          </label>
-          <label class="mr-10">
-            {{radio-button
-              selection=config.dateFormat
-              value="YYYY-MM"
-            }}
-            YYYY-MM
-          </label>
-          <label class="mr-10">
-            {{radio-button
-              selection=config.dateFormat
-              value="YYYY"
-            }}
-            YYYY
-          </label>
+          <label>{{t 'loggingPage.elasticsearch.indexPatterns.dateFormat'}}</label>
+          <label class="mr-10">{{radio-button selection=config.dateFormat value="YYYY-MM-DD"}} YYYY-MM-DD</label>
+          <label class="mr-10">{{radio-button selection=config.dateFormat value="YYYY-MM"}} YYYY-MM</label>
+          <label class="mr-10">{{radio-button selection=config.dateFormat value="YYYY"}} YYYY</label>
         </div>
       </div>
     </div>
     <div>
-      {{t "loggingPage.elasticsearch.generatedIndex"
-        esIndex=esIndex
-        indexFormat=indexFormat
-        htmlSafe=true
+    {{t 'loggingPage.elasticsearch.generatedIndex'
+      esIndex=esIndex
+      indexFormat=indexFormat
+      htmlSafe=true
       }}
     </div>
   </section>
 </div>
 
+
 {{logging/form-log-ssl
-  config=config
-  targetType=targetType
-  disabled=(not enableSSLConfig)
+    config=config
+    targetType=targetType
+    disabled=(not enableSSLConfig)
 }}
 
-{{logging/form-log-format
-  logPreview=logPreview
-  model=model
-}}
-
-{{#accordion-list showExpandAll=false as | al expandFn |}}
-  {{#accordion-list-item title=(t "loggingPage.multiLine.title")
-     detail=(t "loggingPage.multiLine.detail")
-     expandAll=expandAll
-     expand=(action expandFn)
-     expandOnInit=false
-  }}
-    {{logging/form-multi-line
-      model=model
-      targetType=targetType
-    }}
-  {{/accordion-list-item}}
-{{/accordion-list}}
+{{logging/form-log-format logPreview=logPreview model=model}}
+{{!--
+  {{#advanced-section advanced=showAdvanced}}
+  {{logging/form-log-docker model=model parentModel=parentModel}}
+  {{/advanced-section}} --}}

lib/logging/addon/components/logging/target-flentd/template.hbs

@@ -149,17 +149,3 @@
   logPreview=logPreview
   model=model
 }}
-
-{{#accordion-list showExpandAll=false as | al expandFn |}}
-  {{#accordion-list-item title=(t "loggingPage.multiLine.title")
-     detail=(t "loggingPage.multiLine.detail")
-     expandAll=expandAll
-     expand=(action expandFn)
-     expandOnInit=false
-  }}
-    {{logging/form-multi-line
-      model=model
-      targetType=targetType
-    }}
-  {{/accordion-list-item}}
-{{/accordion-list}}

lib/logging/addon/components/logging/target-kafka/template.hbs

@@ -127,17 +127,7 @@
   logPreview=logPreview
   model=model
 }}
-
-{{#accordion-list showExpandAll=false as | al expandFn |}}
-  {{#accordion-list-item title=(t "loggingPage.multiLine.title")
-     detail=(t "loggingPage.multiLine.detail")
-     expandAll=expandAll
-     expand=(action expandFn)
-     expandOnInit=false
-  }}
-    {{logging/form-multi-line
-      model=model
-      targetType=targetType
-    }}
-  {{/accordion-list-item}}
-{{/accordion-list}}
+{{!--
+  {{#advanced-section advanced=showAdvanced}}
+  {{logging/form-log-docker model=model parentModel=parentModel}}
+  {{/advanced-section}} --}}

lib/logging/addon/components/logging/target-splunk/template.hbs

@@ -1,36 +1,30 @@
 <h2 class="mt-30">
   {{t "loggingPage.splunk.header"}}
   <span class="text-info text-small">
-    {{t "loggingPage.splunk.helpText" htmlSafe=true}}
+  {{t "loggingPage.splunk.helpText" htmlSafe=true}}
   </span>
 </h2>
 <hr/>
 <section class="box">
   <div class="mb-30">
-    <label class="acc-label">
-      {{t "loggingPage.endpoint"}}
-      {{field-required}}
-    </label>
+    <label class="acc-label" for="">{{t "loggingPage.endpoint"}}{{field-required}}</label>
     {{input
-      type="text"
-      value=config.endpoint
-      classNames="form-control"
-      placeholder=(t "loggingPage.splunk.endpoint.placeholder")
-      id="splunk-endpoint"
+        type="text"
+        value=config.endpoint
+        classNames="form-control"
+        placeholder=(t "loggingPage.splunk.endpoint.placeholder")
+        id="splunk-endpoint"
     }}
   </div>
 
   <div class="row">
     <div class="col span-12 mt-0 pt-0">
-      <label class="acc-label">
-        {{t "loggingPage.splunk.token"}}
-        {{field-required}}
-      </label>
+      <label class="acc-label" for="">{{t "loggingPage.splunk.token"}}{{field-required}}</label>
       {{input
-        type="text"
-        value=config.token
-        classNames="form-control"
-        placeholder=(t "loggingPage.splunk.tokenPlaceholder")
+          type="text"
+          value=config.token
+          classNames="form-control"
+          placeholder=(t "loggingPage.splunk.tokenPlaceholder")
       }}
       <p class="text-info text-small">
         {{t "loggingPage.splunk.tokenHelpText" htmlSafe=true}}
@@ -39,28 +33,24 @@
   </div>
   <div class="row">
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label">
-        {{t "loggingPage.splunk.source"}}
-      </label>
+      <label class="acc-label" for="">{{t "loggingPage.splunk.source"}}</label>
       {{input
-        type="text"
-        value=config.source
-        classNames="form-control"
-        placeholder=(t "loggingPage.splunk.sourcePlaceholder")
+          type="text"
+          value=config.source
+          classNames="form-control"
+          placeholder=(t "loggingPage.splunk.sourcePlaceholder")
       }}
       <p class="text-info text-small">
         {{t "loggingPage.splunk.sourceHelpText" htmlSafe=true}}
       </p>
     </div>
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label">
-        {{t "loggingPage.splunk.index"}}
-      </label>
+      <label class="acc-label" for="">{{t "loggingPage.splunk.index"}}</label>
       {{input
-        type="text"
-        value=config.index
-        classNames="form-control"
-        placeholder=(t "loggingPage.splunk.indexPlaceholder")
+          type="text"
+          value=config.index
+          classNames="form-control"
+          placeholder=(t "loggingPage.splunk.indexPlaceholder")
       }}
       <p class="text-info text-small">
         {{t "loggingPage.splunk.indexHelpText" htmlSafe=true}}
@@ -70,26 +60,16 @@
 </section>
 
 {{logging/form-log-ssl
-  config=config
-  targetType=targetType
-  disabled=(not enableSSLConfig)
+    config=config
+    targetType=targetType
+    disabled=(not enableSSLConfig)
 }}
 
 {{logging/form-log-format
-  logPreview=logPreview
-  model=model
+    logPreview=logPreview
+    model=model
 }}
-
-{{#accordion-list showExpandAll=false as | al expandFn |}}
-  {{#accordion-list-item title=(t "loggingPage.multiLine.title")
-     detail=(t "loggingPage.multiLine.detail")
-     expandAll=expandAll
-     expand=(action expandFn)
-     expandOnInit=false
-  }}
-    {{logging/form-multi-line
-      model=model
-      targetType=targetType
-    }}
-  {{/accordion-list-item}}
-{{/accordion-list}}
+{{!--
+  {{#advanced-section advanced=showAdvanced}}
+  {{logging/form-log-docker model=model parentModel=parentModel}}
+  {{/advanced-section}} --}}

lib/logging/addon/components/logging/target-syslog/template.hbs

@@ -1,123 +1,81 @@
-<h2 class="mt-30">
-  {{t "loggingPage.syslog.header"}}
-</h2>
+<h2 class="mt-30">{{t 'loggingPage.syslog.header'}}</h2>
 <hr/>
 <section class="box">
   <div class="row">
-      <label class="acc-label">
-        {{t "loggingPage.endpoint"}}
-        {{field-required}}
-      </label>
+      <label class="acc-label">{{t 'loggingPage.endpoint'}}{{field-required}}</label>
       <div class="input-group">
         {{input
-          type="text"
-          value=config.endpoint
-          classNames="form-control"
-          placeholder=(t "loggingPage.syslog.endpointPlaceholder")
-          id="syslog-endpoint"
+            type="text"
+            value=config.endpoint
+            classNames="form-control"
+            placeholder=(t 'loggingPage.syslog.endpointPlaceholder')
+            id="syslog-endpoint"
         }}
         <div class="input-group-btn bg-primary">
           {{#basic-dropdown
                horizontalPosition="right"
                as |dd|}}
             {{#dd.trigger class="btn bg-default text-uppercase"}}
-              <span class="pr-5">
-                {{config.protocol}}
-              </span>
-              <i class="icon icon-chevron-down"></i>
+              <span class="pr-5">{{config.protocol}}</span><i class="icon icon-chevron-down"></i>
             {{/dd.trigger}}
 
             {{#dd.content}}
-              <li>
-                <a {{action "changeProtocol" "tcp"}}>
-                  TCP
-                </a>
-              </li>
-              <li>
-                <a {{action "changeProtocol" "udp"}}>
-                  UDP
-                </a>
-              </li>
+              <li><a {{action "changeProtocol" 'tcp'}}>TCP</a></li>
+              <li><a {{action "changeProtocol" 'udp'}}>UDP</a></li>
             {{/dd.content}}
 
           {{/basic-dropdown}}
         </div>
       </div>
-    <p class="text-info text-small mb-0">
-      {{t "loggingPage.syslog.endpointHelpText"}}
-    </p>
+    <p class="text-info text-small mb-0">{{t 'loggingPage.syslog.endpointHelpText'}}</p>
   </div>
 
   <div class="row">
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label">
-        {{t "loggingPage.syslog.program"}}
-      </label>
+      <label class="acc-label" for="">{{t 'loggingPage.syslog.program'}}</label>
       {{input
-        type="text"
-        value=config.program
-        classNames="form-control"
-        placeholder=(t "loggingPage.syslog.programPlaceholder")
+          type="text"
+          value=config.program
+          classNames="form-control"
+          placeholder=(t 'loggingPage.syslog.programPlaceholder')
       }}
-      <p class="text-info text-small">
-        {{t "loggingPage.syslog.programHelpText"}}
-      </p>
+      <p class="text-info text-small">{{t 'loggingPage.syslog.programHelpText'}}</p>
     </div>
 
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label">
-        {{t "loggingPage.splunk.token"}}
-      </label>
+      <label class="acc-label" for="">{{t 'loggingPage.splunk.token'}}</label>
       {{input
-        type="text"
-        value=config.token
-        classNames="form-control"
-        placeholder=(t "loggingPage.splunk.tokenPlaceholder")
+          type="text"
+          value=config.token
+          classNames="form-control"
+          placeholder=(t 'loggingPage.splunk.tokenPlaceholder')
       }}
       <p class="text-info text-small">
-        {{t "loggingPage.syslog.tokenHelpText" htmlSafe=true}}
+        {{t 'loggingPage.syslog.tokenHelpText' htmlSafe=true}}
       </p>
     </div>
   </div>
 
   <div>
-    <span class="mr-10">
-      {{t "loggingPage.syslog.logSeverity"}}
-    </span>
+    <span class="mr-10">Log Severity:</span>
     {{#each severities as |item|}}
       <label class="mr-10 text-capitalize">
-        {{radio-button
-          selection=config.severity
-          value=item.value
-        }}
+        {{radio-button selection=config.severity value=item.value }}
         {{t item.label}}
       </label>
     {{/each}}
-    {{t "loggingPage.syslog.severityHelpText" htmlSafe=true}}
+    {{t 'loggingPage.syslog.severityHelpText' htmlSafe=true}}
   </div>
 </section>
 
 {{logging/form-log-ssl
-  config=config
-  targetType=targetType
-  disabled=(or (not enableSSLConfig) (not config.enableTls))
+    config=config
+    targetType=targetType
+    disabled=(or (not enableSSLConfig) (not config.enableTls))
 }}
 
-{{logging/form-log-format
-  logPreview=logPreview
-  model=model
-}}
-
-{{#accordion-list showExpandAll=false as | al expandFn |}}
-  {{#accordion-list-item title=(t "loggingPage.multiLine.title")
-     detail=(t "loggingPage.multiLine.detail")
-     expandAll=expandAll
-     expand=(action expandFn)
-     expandOnInit=false
-  }}
-    {{logging/form-multi-line
-      model=model
-      targetType=targetType
-    }}
-  {{/accordion-list-item}}
-{{/accordion-list}}
+{{logging/form-log-format logPreview=logPreview model=model}}
+{{!--
+  {{#advanced-section advanced=showAdvanced}}
+  {{logging/form-log-docker model=model parentModel=parentModel}}
+  {{/advanced-section}} --}}

lib/logging/translations/en-us.yaml

@@ -137,7 +137,6 @@ loggingPage:
     tokenHelpText: Will add a token to the structured data in every syslog message. For cloud syslog such as <a href="https://help.sumologic.com/Send-Data/Sources/02Sources-for-Hosted-Collectors/Cloud-Syslog-Source" target="_blank">Sumologic</a>, <a href="https://www.loggly.com/docs/customer-token-authentication-token" target="_blank">Loggly</a>, etc, you could generate a token on their respective configuration pages.
     endpoint:
       required: '"Endpoint" is required'
-    logSeverity: 'Log Severity:'
   fluentd:
     header: Fluentd Configuration
     compress:
@@ -227,14 +226,3 @@ loggingPage:
     running: RUNNING
     runOk: Dry run success.
     dryRun: Dry Run
-  multiLine:
-    title: Multi Line Configuration
-    detail: Configure options for concat plugin.
-    enableMultiLineFilter:
-      label: Enable Multi Line Filter
-    multiLineStartRegexp:
-      label: Multi Line Start Regexp
-    continueLineRegexp:
-      label: Continue Line Regexp
-    multiLineEndRegexp:
-      label: Multi Line End Regexp