-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
[Styles] Update the paste, review, and install filebeat screen styles #7033
Merged
Bargs
merged 8 commits into
elastic:feature/ingest
from
Bargs:ingest/installFilebeatStyles
Apr 29, 2016
Merged
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a16adbe
[Styles] Update the paste screen styles
Bargs ea63a8a
Move paste step files into their own directory
Bargs 060fc99
[Styles] Update everything on the review page but the table
Bargs e95f683
[Styles] Final touches on review screen - pagination, table end, nav …
Bargs 302d5fe
[Styles] Update filebeat install screen styles
Bargs c04fbe6
Improved less variables
Bargs 1643607
move common styles up one level so they apply to all wizards
Bargs aafa611
Move paste samples step styles to their own file
Bargs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
75 changes: 0 additions & 75 deletions
75
...plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.html
This file was deleted.
Oops, something went wrong.
84 changes: 84 additions & 0 deletions
84
...settings/sections/indices/add_data_steps/install_filebeat_step/install_filebeat_step.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
<h2><em>Follow these instructions to install Filebeat.</em> | ||
Now that you've got a fresh pipeline and index pattern, let's throw some data at it! | ||
</h2> | ||
|
||
<div class="install-filebeat"> | ||
<ol> | ||
<li> | ||
<span> | ||
<strong>Install Filebeat</strong> on all servers on which you want to tail logs | ||
<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-installation.html"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> instructions | ||
</a> | ||
</span> | ||
</li> | ||
|
||
<li> | ||
<span> | ||
<strong>Point Filebeat</strong> at the log files you want to tail | ||
<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-configuration.html"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> instructions | ||
</a> | ||
</span> | ||
</li> | ||
|
||
<li ng-if="installStep.results.pipeline.processors.length"> | ||
<span> | ||
<strong>Configure Filebeat</strong> to send data through your new Elasticsearch pipeline | ||
<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/elasticsearch-output.html"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> instructions | ||
</a><br/> | ||
At minimum you'll need to configure Filebeat's Elasticsearch output with a hostname, an index name, and a | ||
<a target="_blank" | ||
href="https://www.elastic.co/guide/en/beats/filebeat/master/elasticsearch-output.html#_parameters"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> paramaters | ||
</a> block. Your config should end up looking something like this:<br/> | ||
<pre> | ||
output: | ||
elasticsearch: | ||
hosts: ["your-elasticsearch-host"] | ||
index: "your-base-index-name" | ||
parameters: | ||
pipeline: "{{installStep.pipelineId}}"</pre> | ||
<em>NOTE</em>: The Filebeat config takes a base index name and automatically rotates the target index by appending "-{date}" | ||
to the end, so if your pattern was "filebeat-*" you would make the index name "filebeat" in filebeat.yml.<br /> | ||
</span> | ||
</li> | ||
|
||
|
||
<li ng-if="!installStep.results.pipeline.processors.length"> | ||
<span> | ||
<strong>Configure Filebeat</strong> to send data to Elasticsearch | ||
<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/elasticsearch-output.html"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> instructions | ||
</a><br/> | ||
At minimum you'll need to configure Filebeat's Elasticsearch output with a hostname and an index name. | ||
Your config should end up looking something like this:<br /> | ||
<pre> | ||
output: | ||
elasticsearch: | ||
hosts: ["your-elasticsearch-host"] | ||
index: "your-base-index-name"</pre> | ||
<em>NOTE</em>: The Filebeat config takes a base index name and automatically rotates the target index by appending "-{date}" | ||
to the end, so if your pattern was "filebeat-*" you would make the index name "filebeat" in filebeat.yml.<br /> | ||
</span> | ||
</li> | ||
|
||
<li> | ||
<span> | ||
<strong>Run Filebeat</strong> on each server | ||
<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/_step_5_starting_filebeat.html"> | ||
<i aria-hidden="true" class="fa fa-info-circle"></i> instructions | ||
</a> | ||
</span> | ||
</li> | ||
<li> | ||
<span> | ||
<strong>Verify your filebeat installation below.</strong> We'll poll your new index pattern for documents and let you know when | ||
they show up. If you'd like to skip this step, simply click Done now. | ||
</span> | ||
</li> | ||
</ol> | ||
</div> | ||
|
||
<pattern-checker pattern="installStep.results.indexPattern.id"/> |
5 changes: 3 additions & 2 deletions
5
...s/add_data_steps/install_filebeat_step.js → ...ll_filebeat_step/install_filebeat_step.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
.../indices/add_data_steps/install_filebeat_step/styles/_add_data_install_filebeat_step.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
install-filebeat-step { | ||
|
||
.install-filebeat { | ||
> ol { | ||
padding-left: 1em; | ||
|
||
> li { | ||
padding: 4px 0; | ||
font-weight: bold; | ||
|
||
> span { | ||
font-weight: normal; | ||
|
||
> pre { | ||
margin: 7px 0; | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
} |
12 changes: 0 additions & 12 deletions
12
src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
...ublic/settings/sections/indices/add_data_steps/paste_samples_step/paste_samples_step.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<h2><em>Provide some sample logs.</em> | ||
Paste in one or more lines from the file you intend to tail. We'll use these samples in the following steps to help | ||
you build an ingest pipeline and configure a Kibana index pattern. Log lines can be raw strings or | ||
formatted as JSON. If your logs are raw strings but you intend to use | ||
<a target="_window" href="https://www.elastic.co/guide/en/beats/filebeat/current/exported-fields.html">Filebeat's metadata</a>, | ||
you'll want to paste the JSON as it will come out of Filebeat. | ||
</h2> | ||
|
||
<div class="paste-samples form-group"> | ||
<textarea class="form-control" ng-model="pasteStep.rawSamples" placeholder="Paste your sample log lines here, separated by a newline"></textarea> | ||
</div> |
2 changes: 1 addition & 1 deletion
2
...ices/add_data_steps/paste_samples_step.js → .../paste_samples_step/paste_samples_step.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 0 additions & 32 deletions
32
src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
This file was deleted.
Oops, something went wrong.
29 changes: 29 additions & 0 deletions
29
...lic/settings/sections/indices/add_data_steps/pattern_review_step/pattern_review_step.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<h2><em>Review the index pattern.</em> | ||
Here we'll define how and where to store your parsed events. We've made some intelligent guesses for you, but most | ||
fields can be changed if we got it wrong! | ||
</h2> | ||
|
||
<div class="pattern-review form-inline"> | ||
<label>Index name or pattern</label> | ||
<span id="pattern-help" class="help-block">Patterns allow you to define dynamic index names using * as a wildcard. Example: filebeat-*</span> | ||
<input ng-model="reviewStep.indexPattern.id" class="pattern-input form-control" aria-describedby="pattern-help"/> | ||
<label> | ||
<input ng-model="reviewStep.isTimeBased" type="checkbox"/> | ||
time based | ||
</label> | ||
<label ng-if="reviewStep.isTimeBased" class="time-field-input"> | ||
Time Field | ||
<select ng-model="reviewStep.indexPattern.timeFieldName" name="time_field_name" class="form-control"> | ||
<option ng-repeat="field in reviewStep.dateFields" value="{{field}}"> | ||
{{field}} | ||
</option> | ||
</select> | ||
</label> | ||
</div> | ||
|
||
<paginated-table | ||
class="pattern-review-field-table" | ||
columns="reviewStep.columns" | ||
rows="reviewStep.rows" | ||
per-page="10"> | ||
</paginated-table> |
3 changes: 2 additions & 1 deletion
3
...ces/add_data_steps/pattern_review_step.js → ...attern_review_step/pattern_review_step.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
...ions/indices/add_data_steps/pattern_review_step/styles/_add_data_pattern_review_step.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
@import (reference) "../../../styles/_add_data_wizard"; | ||
|
||
pattern-review-step { | ||
margin-bottom: 14px; | ||
|
||
.pattern-review { | ||
margin-bottom: 15px; | ||
|
||
label { | ||
margin-bottom: 0; | ||
} | ||
|
||
.time-field-input { | ||
padding-left: 14px; | ||
margin-bottom: 0; | ||
} | ||
|
||
.pattern-input { | ||
width: 300px; | ||
margin-right: 7px; | ||
} | ||
|
||
> .help-block { | ||
margin-top: 0; | ||
} | ||
} | ||
|
||
paginated-table.pattern-review-field-table { | ||
table { | ||
border-bottom: 3px solid @settings-filebeat-wizard-panel-bg; | ||
|
||
tr { | ||
.form-group; | ||
} | ||
|
||
th { | ||
border-bottom: 0; | ||
padding-top: 10px; | ||
padding-bottom: 10px; | ||
background-color: @settings-filebeat-wizard-panel-bg; | ||
font-weight: normal; | ||
} | ||
|
||
td { | ||
border-top: 3px solid @settings-filebeat-wizard-panel-bg; | ||
vertical-align: middle; | ||
padding-right: 14px; | ||
} | ||
|
||
select { | ||
.form-control; | ||
.wizard-container.form-control; | ||
|
||
min-width: 105px; | ||
} | ||
} | ||
|
||
paginate-controls { | ||
position: relative; | ||
|
||
ul > li > a { | ||
background-color: @settings-filebeat-wizard-panel-bg; | ||
} | ||
|
||
form.pagination-size { | ||
position: absolute; | ||
right: 0; | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did this make it past your extermination of external links for a reason? Is this url correct/future proof?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, I'll fix that over here #6989
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed 33be736