Merge branch 'feature/ingest' into add-data-disable-processors

src/plugins/kibana/public/settings/app.html

@@ -2,11 +2,15 @@
   <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="settingsNav">
     <div class="container-fluid">
       <bread-crumbs></bread-crumbs>
-      <ul class="nav navbar-nav">
+      <ul ng-hide="!section" class="nav navbar-nav">
         <li ng-repeat="section in sections" ng-class="section.class">
           <a class="navbar-link" kbn-href="{{section.url}}" data-test-subj="{{section.name}}">{{section.display}}</a>
         </li>
       </ul>
+
+      <div ng-hide="section" class="nav navbar-nav">
+        <span class="navbar-link">{{ sectionName }}</span>
+      </div>
     </div>
   </nav>
 

src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.html

@@ -38,6 +38,12 @@ <h3>Follow these instructions to install Filebeat</h3>
       to the end, so if your pattern was "filebeat-*" you would make the index name "filebeat" in filebeat.yml.<br /><br />
     </li>
 
+    <li ng-if="installStep.results.indexPattern.id !== 'filebeat-*'">
+      Edit <code>filebeat.template.json</code> (in the Filebeat directory). The line that reads
+      <code>"template": "filebeat-*"</code> should become
+      <code>"template": "{{ installStep.results.indexPattern.id }}"</code>.
+    </li>
+
     <li>Run Filebeat on each server
       (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/_step_5_starting_filebeat.html">
         instructions

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_output.html

@@ -1,5 +1,14 @@
 <div class="header-line">
-  <label>Pipeline Output</label>
+  <label>
+    Pipeline Output
+    <a
+      aria-label="The pipeline output shows the result of the defined pipeline using the sample records supplied in the previous step."
+      tooltip="The pipeline output shows the result of the defined pipeline using the sample records supplied in the previous step."
+      tooltip-append-to-body="true"
+      target="_blank">
+      <i aria-hidden="true" class="fa fa-question-circle"></i>
+    </a>
+  </label>
   <source-data
     sample="sample"
     samples="samples"

src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_setup.html

@@ -5,7 +5,16 @@ <h2>
   <div
     ng-hide="expandContext < 1"
     class="left-panel">
-    <label>Processor Pipeline</label>
+    <label>
+      Processor Pipeline
+      <a
+        aria-label="A pipeline is a definition of a series of processors that are to be executed in the same order as they are declared."
+        tooltip="A pipeline is a definition of a series of processors that are to be executed in the same order as they are declared."
+        tooltip-append-to-body="true"
+        target="_blank">
+        <i aria-hidden="true" class="fa fa-question-circle"></i>
+      </a>
+    </label>
     <div class="pipeline">
       <ul
         class="pipeline-container"

src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html

@@ -1,11 +1,4 @@
-<div>
-  <div class="page-header">
-    <h1>Tail a File</h1>
-    Let's send some log data to Elasticsearch.
-  </div>
-</div>
-
-<div>
+<div class="wizard-container">
   <div class="wizard-step-headings" ng-class="{complete: wizard.complete}">
       <span ng-class="{active: wizard.currentStep === 0}"
             class="wizard-step-heading"

src/plugins/kibana/public/settings/sections/indices/filebeat/index.html

@@ -1,5 +1,3 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
-    <filebeat-wizard />
-  </kbn-settings-indices>
+<kbn-settings-app section="Tail a File">
+  <filebeat-wizard/>
 </kbn-settings-app>

src/plugins/kibana/public/settings/styles/main.less

@@ -205,26 +205,34 @@ kbn-settings-indices {
   .time-and-pattern > div {}
 }
 
+.wizard-container {
+  padding: 0 10px;
+}
+
 .wizard-step-headings{
-  margin-top: 1em;
+  padding-top: 1em;
 
   .wizard-step-heading {
-    font-size: 1.5em;
-    padding-right: 1.5em;
+    font-size: 1.3em;
+    padding: .3em 1em;
+    margin: 0 .1em;
+    background-color: @settings-add-data-wizard-step-heading-complete-background;
+    color: @settings-add-data-wizard-step-heading-complete-color;
 
     &.active {
       cursor: default;
-      font-weight: bold;
+      background-color: @settings-add-data-wizard-step-heading-active-background;
+      color: @settings-add-data-wizard-step-heading-active-color;
     }
     &.aheadActive {
       cursor: default;
-      font-weight: 300;
+      background-color: @settings-add-data-wizard-step-heading-incomplete-background;
+      color: @settings-add-data-wizard-step-heading-incomplete-color;
     }
   }
 
   &.complete {
     .wizard-step-heading:not(.active) {
-      color: #dddddd;
       cursor: default;
     }
   }

src/plugins/kibana/server/lib/__tests__/init_default_field_props.js

@@ -50,7 +50,7 @@ describe('initDefaultFieldProps', function () {
   it('should make string fields analyzed', function () {
     const results = initDefaultFieldProps(fields);
     _.forEach(results, function (field) {
-      if (field.type === 'string' && !_.contains(field.name, 'raw')) {
+      if (field.type === 'string' && !_.contains(field.name, 'keyword')) {
         expect(field).to.have.property('indexed', true);
         expect(field).to.have.property('analyzed', true);
         expect(field).to.have.property('doc_values', false);
@@ -63,7 +63,7 @@ describe('initDefaultFieldProps', function () {
   it('should create an extra raw non-analyzed field for strings', function () {
     const results = initDefaultFieldProps(fields);
     const rawField = _.find(results, function (field) {
-      return _.contains(field.name, 'raw');
+      return _.contains(field.name, 'keyword');
     });
     expect(rawField).to.have.property('indexed', true);
     expect(rawField).to.have.property('analyzed', false);

src/plugins/kibana/server/lib/converters/ingest_processor_api_kibana_to_es_converters.js

@@ -48,9 +48,9 @@ export function date(processorApiDocument) {
   return {
     date: {
       tag: processorApiDocument.processor_id,
-      match_field: processorApiDocument.source_field,
+      field: processorApiDocument.source_field,
       target_field: processorApiDocument.target_field,
-      match_formats: formats,
+      formats: formats,
       timezone: processorApiDocument.timezone,
       locale: processorApiDocument.locale
     }
@@ -131,7 +131,7 @@ export function rename(processorApiDocument) {
     rename: {
       tag: processorApiDocument.processor_id,
       field: processorApiDocument.source_field,
-      to: processorApiDocument.target_field
+      target_field: processorApiDocument.target_field
     }
   };
 }

src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js

@@ -15,7 +15,7 @@ module.exports = function createMappingsFromPatternFields(fields) {
       mapping = {
         type: 'text',
         fields: {
-          raw: {type: 'keyword', ignore_above: 256}
+          keyword: {type: 'keyword', ignore_above: 256}
         }
       };
     }

src/plugins/kibana/server/lib/init_default_field_props.js

@@ -21,7 +21,7 @@ module.exports = function initDefaultFieldProps(fields) {
       });
 
       results.push({
-        name: newField.name + '.raw',
+        name: newField.name + '.keyword',
         type: 'string',
         indexed: true,
         analyzed: false,

src/plugins/kibana/server/routes/api/ingest/register_post.js

@@ -89,25 +89,13 @@ export function registerPost(server) {
       };
 
       const templateParams = {
-        order: 0,
+        order: 1,
         create: true,
         name: ingestConfigName,
         body: {
           template: indexPatternId,
           mappings: {
             _default_: {
-              dynamic_templates: [{
-                string_fields: {
-                  match: '*',
-                  match_mapping_type: 'string',
-                  mapping: {
-                    type: 'text',
-                    fields: {
-                      raw: {type: 'keyword', ignore_above: 256}
-                    }
-                  }
-                }
-              }],
               properties: mappings
             }
           }

src/ui/public/styles/theme.less

@@ -30,7 +30,8 @@
     }
     .navbar-nav {
 
-      > li > a {
+      > li > a,
+      > span {
         color: @kibanaGray2;
         font-size: 1.5em;
         padding: 5px 0 6px 0;

src/ui/public/styles/variables/colors.less

@@ -47,7 +47,7 @@
 @kibanaBlue2:                           #328CAA;
 @kibanaBlue3:                           #6EADC1;
 @kibanaBlue4:                           #9DD0E0;
-@KibanaBlue5:                           #CEE8F0;
+@kibanaBlue5:                           #CEE8F0;
 
 @kibanaGreen1:                          #80C383;
 @kibanaGreen2:                          #AEE8B0;

src/ui/public/styles/variables/for-theme.less

@@ -120,9 +120,18 @@
 
 @settings-indices-active-color: @btn-success-bg;
 
+// Settings - Add Data Wizard
+@settings-add-data-wizard-step-heading-active-background: @kibanaYellow2;
+@settings-add-data-wizard-step-heading-complete-background: @kibanaBlue5;
+@settings-add-data-wizard-step-heading-incomplete-background: @kibanaGray5;
+
+@settings-add-data-wizard-step-heading-active-color: @kibanaGray1;
+@settings-add-data-wizard-step-heading-complete-color: @kibanaBlue2;
+@settings-add-data-wizard-step-heading-incomplete-color: @kibanaGray2;
+
 // Settings - Add Data Wizard - Pipeline Setup =================================
 @settings-filebeat-wizard-panel-bg: @kibanaGray6;
-@settings-filebeat-wizard-processor-select-bg: @KibanaBlue5;
+@settings-filebeat-wizard-processor-select-bg: @kibanaBlue5;
 
 @settings-filebeat-wizard-processor-container-overlay-bg: fade(#000, 10%);
 

test/unit/api/ingest/_processors.js

@@ -7,7 +7,7 @@ define(function (require) {
     bdd.describe('processors', () => {
 
       bdd.it('should return 200 for a successful run', function () {
-        return request.get('/kibana/ingest/listprocessors')
+        return request.get('/kibana/ingest/processors')
         .expect(200)
         .then((response) => {
           expect(_.isArray(response.body)).to.be(true);