Merge pull request #2653 from n313893254/15555

Remove project level includeSystemComponent

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

@@ -1,10 +1,17 @@
 import Component from '@ember/component';
+import { inject as service } from '@ember/service';
+import { observer } from '@ember/object';
+import { reads } from '@ember/object/computed';
 
 export default Component.extend({
+  scope:                   service(),
 
-  outputTagsChanged: function() {
+  pageScope:               reads('scope.currentPageScope'),
+
+  outputTagsChanged: observer('model.outputTags', function() {
     this.setCodeBlockHeight();
-  }.observes('model.outputTags'),
+  }),
+
   setCodeBlockHeight() {
     const h = this.$('.additional-logging-configuration-content').height() + 12;
 

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

@@ -1,40 +1,42 @@
 <main class="row mt-30">
-<h2 class="mt-0">{{t 'loggingPage.additional.header'}}</h2>
+<h2 class="mt-0">{{t "loggingPage.additional.header"}}</h2>
 <hr/>
 <div class="col span-5">
 <section class="additional-logging-configuration-content">
-    <label>{{t 'loggingPage.additional.fields.header'}}</label>
+    <label>{{t "loggingPage.additional.fields.header"}}</label>
     <div class="mb-30">
-      <p class="text-info text-small">{{t 'loggingPage.additional.fields.helpText'}}</p>
+      <p class="text-info text-small">{{t "loggingPage.additional.fields.helpText"}}</p>
       {{form-key-value
           addActionLabel="loggingPage.tags.addActionLabel"
           initialMap=model.outputTags
           changed=(action (mut model.outputTags))
       }}
     </div>
-    {{#if (not-eq targetType 'customTarget')}}
+    {{#if (not-eq targetType "customTarget")}}
       <div class="row mb-30">
         <div class="col">
-          <label class="acc-label">{{t 'loggingPage.additional.flushInterval.label'}}</label>
+          <label class="acc-label">{{t "loggingPage.additional.flushInterval.label"}}</label>
           <div class="input-group">
             {{input-integer
                 min=1
                 value=model.outputFlushInterval
                 class="form-control"
-                placeholder=(t 'loggingPage.additional.flushInterval.placeholder')
+                placeholder=(t "loggingPage.additional.flushInterval.placeholder")
                 aria-describedby="basic-addon2"
             }}
-            <span class="input-group-addon bg-default" id="basic-addon2">{{t 'loggingPage.additional.flushInterval.sec'}}</span>
+            <span class="input-group-addon bg-default" id="basic-addon2">{{t "loggingPage.additional.flushInterval.sec"}}</span>
           </div>
-          <p class="text-info text-small mb-0">{{t 'loggingPage.additional.flushInterval.helpText'}}</p>
+          <p class="text-info text-small mb-0">{{t "loggingPage.additional.flushInterval.helpText"}}</p>
         </div>
       </div>
     {{/if}}
 
+    {{#if (eq pageScope "cluster")}}
       <div class="row">
         {{input type="checkbox" classNames="form-control" checked=model.includeSystemComponent}}
-      {{t 'loggingPage.additional.includeSystemComponent.label'}}
+        {{t "loggingPage.additional.includeSystemComponent.label"}}
       </div>
+    {{/if}}
   </section>
 </div>
 

lib/logging/translations/zh-hans.yaml

@@ -52,6 +52,8 @@ loggingPage:
       placeholder: '例如: 1'
       sec: 秒
       helpText: 日志刷新频率
+    includeSystemComponent:
+      label: 包含系统日志
 
   elasticsearch:
     header: Elasticsearch配置