From 3f7167e24e653cc0bff38c1f13dad4aa7ad31c5d Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Wed, 13 Feb 2019 07:12:09 +0800
Subject: [PATCH] Change `excludeSystemComponent` to `includeSystemComponent`

https://github.com/rancher/rancher/issues/18026
---
 app/mixins/logging-model.js                                 | 2 +-
 .../addon/components/logging/form-log-format/template.hbs   | 4 ++--
 lib/logging/addon/components/logging/new-edit/component.js  | 6 +++---
 lib/logging/translations/en-us.yaml                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/mixins/logging-model.js b/app/mixins/logging-model.js
index a3a89e3a5..59482abc5 100644
--- a/app/mixins/logging-model.js
+++ b/app/mixins/logging-model.js
@@ -56,7 +56,7 @@ export default Mixin.create({
         [`${ t }.outputFlushInterval`]:    get(this, `outputFlushInterval`),
         [`${ t }.outputTags`]:             get(this, `outputTags`),
         [`${ t }.dockerRootDir`]:          get(this, 'dockerRootDir'),
-        [`${ t }.excludeSystemComponent`]: get(this, 'excludeSystemComponent'),
+        [`${ t }.includeSystemComponent`]: get(this, 'includeSystemComponent'),
       })
     }
 
diff --git a/lib/logging/addon/components/logging/form-log-format/template.hbs b/lib/logging/addon/components/logging/form-log-format/template.hbs
index c1e93f085..f5afa1f6d 100644
--- a/lib/logging/addon/components/logging/form-log-format/template.hbs
+++ b/lib/logging/addon/components/logging/form-log-format/template.hbs
@@ -32,8 +32,8 @@
     {{/if}}
 
     <div class="row">
-      {{input type="checkbox" classNames="form-control" checked=model.excludeSystemComponent}}
-      {{t 'loggingPage.additional.excludeSystemComponent.label'}}
+      {{input type="checkbox" classNames="form-control" checked=model.includeSystemComponent}}
+      {{t 'loggingPage.additional.includeSystemComponent.label'}}
     </div>
   </section>
 </div>
diff --git a/lib/logging/addon/components/logging/new-edit/component.js b/lib/logging/addon/components/logging/new-edit/component.js
index 92da97d4d..fe8bd945e 100644
--- a/lib/logging/addon/components/logging/new-edit/component.js
+++ b/lib/logging/addon/components/logging/new-edit/component.js
@@ -261,14 +261,14 @@ export default Component.extend(NewOrEdit, {
       })
 
       const {
-        outputFlushInterval, outputTags, dockerRoot, excludeSystemComponent
+        outputFlushInterval, outputTags, dockerRoot, includeSystemComponent
       } = get(this, 'model.customTarget');
 
       setProperties(model, {
         outputFlushInterval,
         outputTags,
         dockerRoot,
-        excludeSystemComponent,
+        includeSystemComponent,
       })
     } else {
       if (targetType === 'fluentForwarder') {
@@ -313,7 +313,7 @@ export default Component.extend(NewOrEdit, {
         outputTags:                get(model, `${ targetType }.outputTags`),
         dockerRoot:                get(model, `${ targetType }.dockerRoot`),
         [`${ targetType }Config`]: formatConfig,
-        excludeSystemComponent:    get(model, `${ targetType }.excludeSystemComponent`),
+        includeSystemComponent:    get(model, `${ targetType }.includeSystemComponent`),
       })
 
       if (targetType === 'elasticsearch') {
diff --git a/lib/logging/translations/en-us.yaml b/lib/logging/translations/en-us.yaml
index 914c54c82..94164812f 100644
--- a/lib/logging/translations/en-us.yaml
+++ b/lib/logging/translations/en-us.yaml
@@ -48,7 +48,7 @@ loggingPage:
       placeholder: e.g. 1
       sec: sec
       helpText: How often buffered logs would be flushed.
-    excludeSystemComponent:
+    includeSystemComponent:
       label: Include System Log
   advanced:
     file: Edit as File