rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change `excludeSystemComponent` to `includeSystemComponent` 

https://github.com/rancher/rancher/issues/18026
This commit is contained in:
loganhz 2019-02-13 07:12:09 +08:00
parent 822c082177
commit 3f7167e24e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mixins/logging-model.js
View File

@ -56,7 +56,7 @@ export default Mixin.create({
[`${ t }.outputFlushInterval`]: get(this, `outputFlushInterval`), [`${ t }.outputFlushInterval`]: get(this, `outputFlushInterval`),
[`${ t }.outputTags`]: get(this, `outputTags`), [`${ t }.outputTags`]: get(this, `outputTags`),
[`${ t }.dockerRootDir`]: get(this, 'dockerRootDir'), [`${ t }.dockerRootDir`]: get(this, 'dockerRootDir'),
[`${ t }.excludeSystemComponent`]: get(this, 'excludeSystemComponent'), [`${ t }.includeSystemComponent`]: get(this, 'includeSystemComponent'),
}) })
} }

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

@ -32,8 +32,8 @@
{{/if}} {{/if}}
<div class="row"> <div class="row">
{{input type="checkbox" classNames="form-control" checked=model.excludeSystemComponent}} {{input type="checkbox" classNames="form-control" checked=model.includeSystemComponent}}
{{t 'loggingPage.additional.excludeSystemComponent.label'}} {{t 'loggingPage.additional.includeSystemComponent.label'}}
</div> </div>
</section> </section>
</div> </div>

6
lib/logging/addon/components/logging/new-edit/component.js
View File

@ -261,14 +261,14 @@ export default Component.extend(NewOrEdit, {
}) })
const { const {
outputFlushInterval, outputTags, dockerRoot, excludeSystemComponent outputFlushInterval, outputTags, dockerRoot, includeSystemComponent
} = get(this, 'model.customTarget'); } = get(this, 'model.customTarget');
setProperties(model, { setProperties(model, {
outputFlushInterval, outputFlushInterval,
outputTags, outputTags,
dockerRoot, dockerRoot,
excludeSystemComponent, includeSystemComponent,
}) })
} else { } else {
if (targetType === 'fluentForwarder') { if (targetType === 'fluentForwarder') {
@ -313,7 +313,7 @@ export default Component.extend(NewOrEdit, {
outputTags: get(model, `${ targetType }.outputTags`), outputTags: get(model, `${ targetType }.outputTags`),
dockerRoot: get(model, `${ targetType }.dockerRoot`), dockerRoot: get(model, `${ targetType }.dockerRoot`),
[`${ targetType }Config`]: formatConfig, [`${ targetType }Config`]: formatConfig,
excludeSystemComponent: get(model, `${ targetType }.excludeSystemComponent`), includeSystemComponent: get(model, `${ targetType }.includeSystemComponent`),
}) })
if (targetType === 'elasticsearch') { if (targetType === 'elasticsearch') {

2
lib/logging/translations/en-us.yaml
View File

@ -48,7 +48,7 @@ loggingPage:
placeholder: e.g. 1 placeholder: e.g. 1
sec: sec sec: sec
helpText: How often buffered logs would be flushed. helpText: How often buffered logs would be flushed.
excludeSystemComponent: includeSystemComponent:
label: Include System Log label: Include System Log
advanced: advanced:
file: Edit as File file: Edit as File