Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reordering fields to enable smoother path through form #9991

Merged
merged 5 commits into from
Jan 30, 2017
Merged

Reordering fields to enable smoother path through form #9991

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7851587
Reordering fields to closely follow previous field choices
ycombinator Jan 21, 2017
9ca2502
Moving deprecated choice field to end of form.
ycombinator Jan 21, 2017
e213f92
Forgot to move related section
ycombinator Jan 21, 2017
a7a8e8c
Always show "Time-field name" field when index is time-based
ycombinator Jan 21, 2017
b82d4f0
Only require the field when it's not disabled
ycombinator Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 63 additions & 61 deletions src/core_plugins/kibana/public/management/sections/indices/_create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,6 @@ <h1>Configure an index pattern</h1>
</div>
<div>
<form name="form" role="form" class="well" ng-submit="createIndexPattern()">
<div class="form-group time-and-pattern">
<label>
<input
ng-model="index.isTimeBased"
type="checkbox">
Index contains time-based events
</label>
<br>
<label ng-if="index.isTimeBased">
<input ng-model="index.nameIsPattern" type="checkbox">
Use event times to create index names <small>[DEPRECATED]</small>
</label>
</div>

<div class="form-group" ng-if="index.isTimeBased && index.nameIsPattern">
<div class="alert alert-warning">
<h4>Time-interval based index patterns are deprecated!</h4>
<p>
We <strong>strongly recommend</strong> using wildcard pattern names instead of
time-interval based index patterns.
</p>
<p>
Kibana is now smart enough to automatically determine which
indices to search against within the current time range for
wildcard index patterns. This means that wildcard
index patterns now get the same performance optimizations when
searching within a time range as time-interval patterns.
</p>
</div>
<label>
Index pattern interval&nbsp;
<kbn-info info="The interval at which index names rotate."></kbn-info>
</label>
<select
required
ng-options="opt.display for opt in index.nameIntervalOptions"
ng-model="index.nameInterval"
class="form-control">
</select>
</div>

<div class="form-group">
<label>
Index name or pattern
Expand All @@ -74,6 +33,35 @@ <h4>Time-interval based index patterns are deprecated!</h4>
</small>
</div>

<div class="form-group time-and-pattern">
<label>
<input
ng-model="index.isTimeBased"
type="checkbox">
Index contains time-based events
</label>
</div>

<div class="form-group" ng-if="index.isTimeBased">
<label>
Time-field name
&nbsp;
<kbn-info info="This field will be used to filter events with the global time filter"></kbn-info>
&nbsp;
<small>
<a ng-click="refreshFieldList();"> refresh fields</a>
</small>
</label>
<select
ng-disabled="index.fetchFieldsError"
ng-required="!index.fetchFieldsError"
ng-options="field.name for field in index.dateFields"
ng-model="index.timeField"
auto-select-if-only-one="index.dateFields"
class="form-control">
</select>
</div>

<div class="form-group" ng-if="canExpandIndices()">
<label>
<input ng-model="index.notExpandable" type="checkbox">
Expand Down Expand Up @@ -104,6 +92,40 @@ <h4>Time-interval based index patterns are deprecated!</h4>
</p>
</div>

<div class="form-group time-and-pattern">
<label ng-if="index.isTimeBased">
<input ng-model="index.nameIsPattern" type="checkbox">
Use event times to create index names <small>[DEPRECATED]</small>
</label>
</div>

<div class="form-group" ng-if="index.isTimeBased && index.nameIsPattern">
<div class="alert alert-warning">
<h4>Time-interval based index patterns are deprecated!</h4>
<p>
We <strong>strongly recommend</strong> using wildcard pattern names instead of
time-interval based index patterns.
</p>
<p>
Kibana is now smart enough to automatically determine which
indices to search against within the current time range for
wildcard index patterns. This means that wildcard
index patterns now get the same performance optimizations when
searching within a time range as time-interval patterns.
</p>
</div>
<label>
Index pattern interval&nbsp;
<kbn-info info="The interval at which index names rotate."></kbn-info>
</label>
<select
required
ng-options="opt.display for opt in index.nameIntervalOptions"
ng-model="index.nameInterval"
class="form-control">
</select>
</div>

<section>
<div class="alert alert-danger" ng-repeat="err in index.patternErrors">
{{err}}
Expand Down Expand Up @@ -147,26 +169,6 @@ <h4>Time-interval based index patterns are deprecated!</h4>
</div>
</section>

<div class="form-group" ng-if="index.isTimeBased && !index.fetchFieldsError">
<label>
Time-field name
&nbsp;
<kbn-info info="This field will be used to filter events with the global time filter"></kbn-info>
&nbsp;
<small>
<a ng-click="refreshFieldList();"> refresh fields</a>
</small>
</label>
<select
required
ng-if="!index.fetchFieldsError"
ng-options="field.name for field in index.dateFields"
ng-model="index.timeField"
auto-select-if-only-one="index.dateFields"
class="form-control">
</select>
</div>

<button
data-test-subj="submitCreateIndexPatternFromExistingForm"
ng-disabled="form.$invalid || index.fetchFieldsError"
Expand Down