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

Pass logging config down to logging targets for json parsing 

rancher/rancher#24367
This commit is contained in:
Westly Wright 2019-12-16 11:22:26 -07:00
parent fcaaa0f53c
commit 004a9286ee
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
6 changed files with 184 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@
@type="checkbox" @type="checkbox"
class="form-control" class="form-control"
id="enable-json-parsing" id="enable-json-parsing"
@checked={{model.enableJSONParsing}} @checked={{loggingModel.enableJSONParsing}}
/> />
{{t "loggingPage.additional.jsonParsing.label"}} {{t "loggingPage.additional.jsonParsing.label"}}
</label> </label>

90
lib/logging/addon/components/logging/target-elasticsearch/template.hbs
View File

@ -1,66 +1,66 @@
<h2 class="mt-30">{{t 'loggingPage.elasticsearch.header'}}</h2> <h2 class="mt-30">{{t "loggingPage.elasticsearch.header"}}</h2>
<hr/> <hr/>
<div class="box"> <div class="box">
<section class="mb-30"> <section class="mb-30">
<div> <div>
<label class="acc-label" for="">{{t 'loggingPage.endpoint'}}{{field-required}}</label> <label class="acc-label" for="">{{t "loggingPage.endpoint"}}{{field-required}}</label>
{{input {{input
type="text" type="text"
value=config.endpoint value=config.endpoint
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.endpointPlaceholder') placeholder=(t "loggingPage.endpointPlaceholder")
id="elasticsearch-endpoint" id="elasticsearch-endpoint"
focus-out=(action "alertMessage") focus-out=(action "alertMessage")
}} }}
</div> </div>
{{#if endpointError}} {{#if endpointError}}
<p class="text-error text-small">{{t endpointErrorText}}</p> <p class="text-error text-small">{{t endpointErrorText}}</p>
{{else}} {{else}}
<p class="text-info text-small">{{t 'loggingPage.elasticsearch.endpointHelpText'}}</p> <p class="text-info text-small">{{t "loggingPage.elasticsearch.endpointHelpText"}}</p>
{{/if}} {{/if}}
</section> </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> <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="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label" for=""> {{t 'loggingPage.elasticsearch.xpack.username'}} </label> <label class="acc-label" for=""> {{t "loggingPage.elasticsearch.xpack.username"}} </label>
{{input {{input
type="text" type="text"
utocomplete="off" utocomplete="off"
value=config.authUsername value=config.authUsername
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.elasticsearch.xpack.usernamePlaceholder') placeholder=(t "loggingPage.elasticsearch.xpack.usernamePlaceholder")
}} }}
</div> </div>
<div class="col span-6"> <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 {{input
utocomplete="off" utocomplete="off"
type="password" type="password"
value=config.authPassword value=config.authPassword
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.elasticsearch.xpack.passwordPlaceholder') placeholder=(t "loggingPage.elasticsearch.xpack.passwordPlaceholder")
}} }}
</div> </div>
</div> </div>
</section> </section>
<h4 class="mt-20">{{t 'loggingPage.elasticsearch.indexPatterns.header'}}</h4> <h4 class="mt-20">{{t "loggingPage.elasticsearch.indexPatterns.header"}}</h4>
<p class="text-info text-small">{{t 'loggingPage.elasticsearch.indexPatterns.helpText'}}</p> <p class="text-info text-small">{{t "loggingPage.elasticsearch.indexPatterns.helpText"}}</p>
<section> <section>
<div class="row"> <div class="row">
<div class="col span-6"> <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 {{input
type="text" type="text"
value=config.indexPrefix value=config.indexPrefix
className="form-control" className="form-control"
placeholder=(t 'loggingPage.elasticsearch.indexPatterns.prefixPlaceholder') placeholder=(t "loggingPage.elasticsearch.indexPatterns.prefixPlaceholder")
}} }}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<div style="margin-top: 34px;"> <div style="margin-top: 34px;">
<label>{{t 'loggingPage.elasticsearch.indexPatterns.dateFormat'}}</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-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-MM"}} YYYY-MM</label>
<label class="mr-10">{{radio-button selection=config.dateFormat value="YYYY"}} YYYY</label> <label class="mr-10">{{radio-button selection=config.dateFormat value="YYYY"}} YYYY</label>
@ -68,10 +68,10 @@
</div> </div>
</div> </div>
<div> <div>
{{t 'loggingPage.elasticsearch.generatedIndex' {{t "loggingPage.elasticsearch.generatedIndex"
esIndex=esIndex esIndex=esIndex
indexFormat=indexFormat indexFormat=indexFormat
htmlSafe=true htmlSafe=true
}} }}
</div> </div>
</section> </section>
@ -79,13 +79,17 @@
{{logging/form-log-ssl {{logging/form-log-ssl
config=config config=config
targetType=targetType targetType=targetType
disabled=(not enableSSLConfig) disabled=(not enableSSLConfig)
}} }}
{{logging/form-log-format logPreview=logPreview model=model}} {{logging/form-log-format
logPreview=logPreview
model=model
loggingModel=parentModel
}}
{{!-- {{!--
{{#advanced-section advanced=showAdvanced}} {{#advanced-section advanced=showAdvanced}}
{{logging/form-log-docker model=model parentModel=parentModel}} {{logging/form-log-docker model=model parentModel=parentModel}}
{{/advanced-section}} --}} {{/advanced-section}} --}}

1
lib/logging/addon/components/logging/target-flentd/template.hbs
View File

@ -148,4 +148,5 @@
{{logging/form-log-format {{logging/form-log-format
logPreview=logPreview logPreview=logPreview
model=model model=model
loggingModel=parentModel
}} }}

119
lib/logging/addon/components/logging/target-kafka/template.hbs
View File

@ -34,63 +34,63 @@
</div> </div>
<hr/> <hr/>
<section class="mb-30"> <section class="mb-30">
{{#if (eq brokerType "zookeeper")}} {{#if (eq brokerType "zookeeper")}}
<div> <div>
<label class="acc-label" for=""> <label class="acc-label" for="">
{{t "loggingPage.endpoint"}} {{t "loggingPage.endpoint"}}
{{field-required}} {{field-required}}
</label> </label>
{{input {{input
type="text" type="text"
value=config.zookeeperEndpoint value=config.zookeeperEndpoint
classNames="form-control" classNames="form-control"
placeholder=(t "loggingPage.kafka.endpoint.zookeeper.placeholder") placeholder=(t "loggingPage.kafka.endpoint.zookeeper.placeholder")
id="kafka-endpoint" id="kafka-endpoint"
}} }}
</div>
<p class="text-info text-small mb-0">
{{t "loggingPage.kafka.zookeeperHelpText"}}
</p>
{{else}}
{{#each brokerEndpoints as |item idx|}}
<div class="row">
<div class="col span-11">
<label class="acc-label" for="">
{{t "loggingPage.endpoint"}}
{{#if (eq idx 0)}}
{{field-required}}
{{/if}}
</label>
{{input
type="text"
value=item.endpoint
classNames="form-control"
placeholder=(t "loggingPage.kafka.endpoint.broker.placeholder")
}}
</div>
<div class="col span-1" style="padding-top: 29px">
<button class="btn bg-primary icon-btn {{if canRemove "" "disabled"}}" {{action "remove" item}}>
<span class="darken">
<i class="icon icon-minus"></i>
</span>
</button>
</div>
</div> </div>
{{/each}} <p class="text-info text-small mb-0">
<p class="text-info text-small mb-0"> {{t "loggingPage.kafka.zookeeperHelpText"}}
{{t "loggingPage.kafka.brokerHelpText"}} </p>
</p> {{else}}
<div class="mt-20"> {{#each brokerEndpoints as |item idx|}}
<button class="btn bg-link icon-btn p-0" {{action "add"}}> <div class="row">
<span class="darken"> <div class="col span-11">
<i class="icon icon-plus text-small"/> <label class="acc-label" for="">
</span> {{t "loggingPage.endpoint"}}
<span> {{#if (eq idx 0)}}
{{t "loggingPage.kafka.addEndpoint"}} {{field-required}}
</span> {{/if}}
</button> </label>
</div> {{input
{{/if}} type="text"
value=item.endpoint
classNames="form-control"
placeholder=(t "loggingPage.kafka.endpoint.broker.placeholder")
}}
</div>
<div class="col span-1" style="padding-top: 29px">
<button class="btn bg-primary icon-btn {{if canRemove "" "disabled"}}" {{action "remove" item}}>
<span class="darken">
<i class="icon icon-minus"></i>
</span>
</button>
</div>
</div>
{{/each}}
<p class="text-info text-small mb-0">
{{t "loggingPage.kafka.brokerHelpText"}}
</p>
<div class="mt-20">
<button class="btn bg-link icon-btn p-0" {{action "add"}}>
<span class="darken">
<i class="icon icon-plus text-small"/>
</span>
<span>
{{t "loggingPage.kafka.addEndpoint"}}
</span>
</button>
</div>
{{/if}}
</section> </section>
<hr/> <hr/>
<div class="row"> <div class="row">
@ -126,8 +126,9 @@
{{logging/form-log-format {{logging/form-log-format
logPreview=logPreview logPreview=logPreview
model=model model=model
loggingModel=parentModel
}} }}
{{!-- {{!--
{{#advanced-section advanced=showAdvanced}} {{#advanced-section advanced=showAdvanced}}
{{logging/form-log-docker model=model parentModel=parentModel}} {{logging/form-log-docker model=model parentModel=parentModel}}
{{/advanced-section}} --}} {{/advanced-section}} --}}

53
lib/logging/addon/components/logging/target-splunk/template.hbs
View File

@ -1,7 +1,7 @@
<h2 class="mt-30"> <h2 class="mt-30">
{{t "loggingPage.splunk.header"}} {{t "loggingPage.splunk.header"}}
<span class="text-info text-small"> <span class="text-info text-small">
{{t "loggingPage.splunk.helpText" htmlSafe=true}} {{t "loggingPage.splunk.helpText" htmlSafe=true}}
</span> </span>
</h2> </h2>
<hr/> <hr/>
@ -9,11 +9,11 @@
<div class="mb-30"> <div class="mb-30">
<label class="acc-label" for="">{{t "loggingPage.endpoint"}}{{field-required}}</label> <label class="acc-label" for="">{{t "loggingPage.endpoint"}}{{field-required}}</label>
{{input {{input
type="text" type="text"
value=config.endpoint value=config.endpoint
classNames="form-control" classNames="form-control"
placeholder=(t "loggingPage.splunk.endpoint.placeholder") placeholder=(t "loggingPage.splunk.endpoint.placeholder")
id="splunk-endpoint" id="splunk-endpoint"
}} }}
</div> </div>
@ -21,10 +21,10 @@
<div class="col span-12 mt-0 pt-0"> <div class="col span-12 mt-0 pt-0">
<label class="acc-label" for="">{{t "loggingPage.splunk.token"}}{{field-required}}</label> <label class="acc-label" for="">{{t "loggingPage.splunk.token"}}{{field-required}}</label>
{{input {{input
type="text" type="text"
value=config.token value=config.token
classNames="form-control" classNames="form-control"
placeholder=(t "loggingPage.splunk.tokenPlaceholder") placeholder=(t "loggingPage.splunk.tokenPlaceholder")
}} }}
<p class="text-info text-small"> <p class="text-info text-small">
{{t "loggingPage.splunk.tokenHelpText" htmlSafe=true}} {{t "loggingPage.splunk.tokenHelpText" htmlSafe=true}}
@ -35,10 +35,10 @@
<div class="col span-6 mt-0 pt-0"> <div class="col span-6 mt-0 pt-0">
<label class="acc-label" for="">{{t "loggingPage.splunk.source"}}</label> <label class="acc-label" for="">{{t "loggingPage.splunk.source"}}</label>
{{input {{input
type="text" type="text"
value=config.source value=config.source
classNames="form-control" classNames="form-control"
placeholder=(t "loggingPage.splunk.sourcePlaceholder") placeholder=(t "loggingPage.splunk.sourcePlaceholder")
}} }}
<p class="text-info text-small"> <p class="text-info text-small">
{{t "loggingPage.splunk.sourceHelpText" htmlSafe=true}} {{t "loggingPage.splunk.sourceHelpText" htmlSafe=true}}
@ -47,10 +47,10 @@
<div class="col span-6 mt-0 pt-0"> <div class="col span-6 mt-0 pt-0">
<label class="acc-label" for="">{{t "loggingPage.splunk.index"}}</label> <label class="acc-label" for="">{{t "loggingPage.splunk.index"}}</label>
{{input {{input
type="text" type="text"
value=config.index value=config.index
classNames="form-control" classNames="form-control"
placeholder=(t "loggingPage.splunk.indexPlaceholder") placeholder=(t "loggingPage.splunk.indexPlaceholder")
}} }}
<p class="text-info text-small"> <p class="text-info text-small">
{{t "loggingPage.splunk.indexHelpText" htmlSafe=true}} {{t "loggingPage.splunk.indexHelpText" htmlSafe=true}}
@ -60,16 +60,17 @@
</section> </section>
{{logging/form-log-ssl {{logging/form-log-ssl
config=config config=config
targetType=targetType targetType=targetType
disabled=(not enableSSLConfig) disabled=(not enableSSLConfig)
}} }}
{{logging/form-log-format {{logging/form-log-format
logPreview=logPreview logPreview=logPreview
model=model model=model
loggingModel=parentModel
}} }}
{{!-- {{!--
{{#advanced-section advanced=showAdvanced}} {{#advanced-section advanced=showAdvanced}}
{{logging/form-log-docker model=model parentModel=parentModel}} {{logging/form-log-docker model=model parentModel=parentModel}}
{{/advanced-section}} --}} {{/advanced-section}} --}}

92
lib/logging/addon/components/logging/target-syslog/template.hbs
View File

@ -1,57 +1,57 @@
<h2 class="mt-30">{{t 'loggingPage.syslog.header'}}</h2> <h2 class="mt-30">{{t "loggingPage.syslog.header"}}</h2>
<hr/> <hr/>
<section class="box"> <section class="box">
<div class="row"> <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"> <div class="input-group">
{{input {{input
type="text" type="text"
value=config.endpoint value=config.endpoint
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.syslog.endpointPlaceholder') placeholder=(t "loggingPage.syslog.endpointPlaceholder")
id="syslog-endpoint" id="syslog-endpoint"
}} }}
<div class="input-group-btn bg-primary"> <div class="input-group-btn bg-primary">
{{#basic-dropdown {{#basic-dropdown
horizontalPosition="right" horizontalPosition="right"
as |dd|}} as |dd|}}
{{#dd.trigger class="btn bg-default text-uppercase"}} {{#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.trigger}}
{{#dd.content}} {{#dd.content}}
<li><a {{action "changeProtocol" 'tcp'}}>TCP</a></li> <li><a {{action "changeProtocol" "tcp"}}>TCP</a></li>
<li><a {{action "changeProtocol" 'udp'}}>UDP</a></li> <li><a {{action "changeProtocol" "udp"}}>UDP</a></li>
{{/dd.content}} {{/dd.content}}
{{/basic-dropdown}} {{/basic-dropdown}}
</div>
</div> </div>
<p class="text-info text-small mb-0">{{t 'loggingPage.syslog.endpointHelpText'}}</p> </div>
<p class="text-info text-small mb-0">{{t "loggingPage.syslog.endpointHelpText"}}</p>
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6 mt-0 pt-0"> <div class="col span-6 mt-0 pt-0">
<label class="acc-label" for="">{{t 'loggingPage.syslog.program'}}</label> <label class="acc-label" for="">{{t "loggingPage.syslog.program"}}</label>
{{input {{input
type="text" type="text"
value=config.program value=config.program
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.syslog.programPlaceholder') 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>
<div class="col span-6 mt-0 pt-0"> <div class="col span-6 mt-0 pt-0">
<label class="acc-label" for="">{{t 'loggingPage.splunk.token'}}</label> <label class="acc-label" for="">{{t "loggingPage.splunk.token"}}</label>
{{input {{input
type="text" type="text"
value=config.token value=config.token
classNames="form-control" classNames="form-control"
placeholder=(t 'loggingPage.splunk.tokenPlaceholder') placeholder=(t "loggingPage.splunk.tokenPlaceholder")
}} }}
<p class="text-info text-small"> <p class="text-info text-small">
{{t 'loggingPage.syslog.tokenHelpText' htmlSafe=true}} {{t "loggingPage.syslog.tokenHelpText" htmlSafe=true}}
</p> </p>
</div> </div>
</div> </div>
@ -64,18 +64,22 @@
{{t item.label}} {{t item.label}}
</label> </label>
{{/each}} {{/each}}
{{t 'loggingPage.syslog.severityHelpText' htmlSafe=true}} {{t "loggingPage.syslog.severityHelpText" htmlSafe=true}}
</div> </div>
</section> </section>
{{logging/form-log-ssl {{logging/form-log-ssl
config=config config=config
targetType=targetType targetType=targetType
disabled=(or (not enableSSLConfig) (not config.enableTls)) disabled=(or (not enableSSLConfig) (not config.enableTls))
}} }}
{{logging/form-log-format logPreview=logPreview model=model}} {{logging/form-log-format
logPreview=logPreview
model=model
loggingModel=parentModel
}}
{{!-- {{!--
{{#advanced-section advanced=showAdvanced}} {{#advanced-section advanced=showAdvanced}}
{{logging/form-log-docker model=model parentModel=parentModel}} {{logging/form-log-docker model=model parentModel=parentModel}}
{{/advanced-section}} --}} {{/advanced-section}} --}}