From 2672b724b5ec4352bc2f1d1ae8ecde5530643985 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 29 Dec 2015 14:10:00 -0500 Subject: [PATCH 01/60] beginning to play with jsdata (cherry picked from commit 8cbf211) --- package.json | 2 ++ .../public/settings/sections/data/_review.html | 1 + .../kibana/public/settings/sections/data/_review.js | 13 +++++++++++++ .../kibana/public/settings/sections/data/index.js | 1 + .../kibana/public/settings/sections/index.js | 1 + src/ui/public/store/store.js | 6 ++++++ 6 files changed, 24 insertions(+) create mode 100644 src/plugins/kibana/public/settings/sections/data/_review.html create mode 100644 src/plugins/kibana/public/settings/sections/data/_review.js create mode 100644 src/plugins/kibana/public/settings/sections/data/index.js create mode 100644 src/ui/public/store/store.js diff --git a/package.json b/package.json index 0718b94b1831..243b8f9157a9 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,8 @@ "jade-loader": "0.7.1", "joi": "6.6.1", "jquery": "2.1.4", + "js-data": "2.8.2", + "js-data-angular": "3.1.0", "js-yaml": "3.4.1", "json-loader": "0.5.3", "json-stringify-safe": "5.0.1", diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html new file mode 100644 index 000000000000..c5af519b1516 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/_review.html @@ -0,0 +1 @@ +
hello kibana
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js new file mode 100644 index 000000000000..08f667378b04 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/_review.js @@ -0,0 +1,13 @@ +import routes from 'ui/routes'; +import modules from 'ui/modules'; +import template from 'plugins/kibana/settings/sections/data/_review.html'; +import storeProvider from 'ui/store'; + +routes.when('/settings/data', { + template: template +}); + +modules.get('apps/settings') + .controller('settingsDataReview', function ($scope, Private) { + var store = Private(storeProvider); + }); diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js new file mode 100644 index 000000000000..63e57128fb22 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/index.js @@ -0,0 +1 @@ +import review from 'plugins/kibana/settings/sections/data/_review'; diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js index c2be1402c526..0ef737f9437a 100644 --- a/src/plugins/kibana/public/settings/sections/index.js +++ b/src/plugins/kibana/public/settings/sections/index.js @@ -6,6 +6,7 @@ define(function (require) { require('plugins/kibana/settings/sections/advanced/index'), require('plugins/kibana/settings/sections/objects/index'), require('plugins/kibana/settings/sections/status/index'), + require('plugins/kibana/settings/sections/data/index'), require('plugins/kibana/settings/sections/about/index') ]; }); diff --git a/src/ui/public/store/store.js b/src/ui/public/store/store.js new file mode 100644 index 000000000000..91ed994522e4 --- /dev/null +++ b/src/ui/public/store/store.js @@ -0,0 +1,6 @@ +import modules from 'ui/modules'; +const module = modules.get('kibana', [require('js-data-angular')]); + +export default function storeProvider(DS) { + return DS; +} From 6b2a52599bed3a1adfc220c9544622134401d68a Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 29 Dec 2015 14:11:03 -0500 Subject: [PATCH 02/60] Add exception for unneeded lib since we're using js-data-angular (cherry picked from commit 1fc754b) --- src/optimize/BaseOptimizer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js index 9ca708ab04fd..b6fbb05a55b6 100644 --- a/src/optimize/BaseOptimizer.js +++ b/src/optimize/BaseOptimizer.js @@ -79,6 +79,8 @@ class BaseOptimizer { devtoolModuleFilenameTemplate: '[absolute-resource-path]' }, + externals: ['axios'], + recordsPath: resolve(this.env.workingDir, 'webpack.records'), plugins: [ From f1f0eabe45d7db22456c1f5224db24f8f3c66148 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 29 Dec 2015 14:12:19 -0500 Subject: [PATCH 03/60] starting to work on pattern creation UI (cherry picked from commit 4975f57) --- .../settings/sections/data/_review.html | 8 +++++- .../public/settings/sections/data/_review.js | 25 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html index c5af519b1516..fb7be1910008 100644 --- a/src/plugins/kibana/public/settings/sections/data/_review.html +++ b/src/plugins/kibana/public/settings/sections/data/_review.html @@ -1 +1,7 @@ -
hello kibana
+
+ + +
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js index 08f667378b04..03157f4312ec 100644 --- a/src/plugins/kibana/public/settings/sections/data/_review.js +++ b/src/plugins/kibana/public/settings/sections/data/_review.js @@ -2,12 +2,35 @@ import routes from 'ui/routes'; import modules from 'ui/modules'; import template from 'plugins/kibana/settings/sections/data/_review.html'; import storeProvider from 'ui/store'; +import _ from 'lodash'; -routes.when('/settings/data', { +var testData = { + message: 'src=1.1.1.1 evil=1', + src: '1.1.1.1', + evil: '1', + coordinates: { + lat: 37.3894, + lon: 122.0819 + }, + '@timestamp': '2015-11-24T00:00:00.000Z' +}; + +routes.when('/settings/data/review', { template: template }); modules.get('apps/settings') .controller('settingsDataReview', function ($scope, Private) { var store = Private(storeProvider); + $scope.perPage = 25; + $scope.columns = [ + {title: 'field'}, + {title: 'mapping'}, + {title: 'example', sortable: false}, + {title: '', sortable: false} + ]; + + $scope.rows = _.map(testData, (value, key) => { + return [key, 'type', value, 'edit']; + }); }); From 518b9a3670c52bede9861b54ef3505aeda382331 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 29 Dec 2015 15:18:48 -0500 Subject: [PATCH 04/60] remove per page limit (cherry picked from commit 599e012) --- src/plugins/kibana/public/settings/sections/data/_review.html | 3 +-- src/plugins/kibana/public/settings/sections/data/_review.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html index fb7be1910008..ead31499513c 100644 --- a/src/plugins/kibana/public/settings/sections/data/_review.html +++ b/src/plugins/kibana/public/settings/sections/data/_review.html @@ -1,7 +1,6 @@
+ rows="rows">
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js index 03157f4312ec..3d1d148c5a61 100644 --- a/src/plugins/kibana/public/settings/sections/data/_review.js +++ b/src/plugins/kibana/public/settings/sections/data/_review.js @@ -22,7 +22,6 @@ routes.when('/settings/data/review', { modules.get('apps/settings') .controller('settingsDataReview', function ($scope, Private) { var store = Private(storeProvider); - $scope.perPage = 25; $scope.columns = [ {title: 'field'}, {title: 'mapping'}, From dcb5e5abd8480fa951dfd9008c204f94c47bd984 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 30 Dec 2015 12:40:48 -0500 Subject: [PATCH 05/60] starting a simple wizard controller with placeholder steps (cherry picked from commit 36dc443) --- .../settings/sections/data/_review.html | 6 ---- .../public/settings/sections/data/_review.js | 35 ------------------- .../directives/install_filebeat_step.html | 1 + .../data/directives/install_filebeat_step.js | 10 ++++++ .../data/directives/paste_samples_step.html | 1 + .../data/directives/paste_samples_step.js | 10 ++++++ .../data/directives/pattern_review_step.html | 1 + .../data/directives/pattern_review_step.js | 10 ++++++ .../data/directives/pipeline_step.html | 1 + .../sections/data/directives/pipeline_step.js | 10 ++++++ .../sections/data/filebeat/index.html | 15 ++++++++ .../settings/sections/data/filebeat/index.js | 32 +++++++++++++++++ .../public/settings/sections/data/index.html | 5 +++ .../public/settings/sections/data/index.js | 13 ++++++- .../kibana/public/settings/sections/index.js | 2 +- 15 files changed, 109 insertions(+), 43 deletions(-) delete mode 100644 src/plugins/kibana/public/settings/sections/data/_review.html delete mode 100644 src/plugins/kibana/public/settings/sections/data/_review.js create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js create mode 100644 src/plugins/kibana/public/settings/sections/data/filebeat/index.html create mode 100644 src/plugins/kibana/public/settings/sections/data/filebeat/index.js create mode 100644 src/plugins/kibana/public/settings/sections/data/index.html diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html deleted file mode 100644 index ead31499513c..000000000000 --- a/src/plugins/kibana/public/settings/sections/data/_review.html +++ /dev/null @@ -1,6 +0,0 @@ -
- - -
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js deleted file mode 100644 index 3d1d148c5a61..000000000000 --- a/src/plugins/kibana/public/settings/sections/data/_review.js +++ /dev/null @@ -1,35 +0,0 @@ -import routes from 'ui/routes'; -import modules from 'ui/modules'; -import template from 'plugins/kibana/settings/sections/data/_review.html'; -import storeProvider from 'ui/store'; -import _ from 'lodash'; - -var testData = { - message: 'src=1.1.1.1 evil=1', - src: '1.1.1.1', - evil: '1', - coordinates: { - lat: 37.3894, - lon: 122.0819 - }, - '@timestamp': '2015-11-24T00:00:00.000Z' -}; - -routes.when('/settings/data/review', { - template: template -}); - -modules.get('apps/settings') - .controller('settingsDataReview', function ($scope, Private) { - var store = Private(storeProvider); - $scope.columns = [ - {title: 'field'}, - {title: 'mapping'}, - {title: 'example', sortable: false}, - {title: '', sortable: false} - ]; - - $scope.rows = _.map(testData, (value, key) => { - return [key, 'type', value, 'edit']; - }); - }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html new file mode 100644 index 000000000000..48b974b48a47 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html @@ -0,0 +1 @@ +Install filebeat step diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js new file mode 100644 index 000000000000..4eed9ae61a55 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js @@ -0,0 +1,10 @@ +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/data/directives/install_filebeat_step.html'); + +modules.get('apps/settings') + .directive('installFilebeatStep', function () { + return { + template: template + }; + }); + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html new file mode 100644 index 000000000000..31f41b0b76f7 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html @@ -0,0 +1 @@ +Paste samples step diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js new file mode 100644 index 000000000000..7b033ecbf770 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js @@ -0,0 +1,10 @@ +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/data/directives/paste_samples_step.html'); + +modules.get('apps/settings') + .directive('pasteSamplesStep', function () { + return { + template: template + }; + }); + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html new file mode 100644 index 000000000000..c113af3185f8 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -0,0 +1 @@ +Pattern review step diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js new file mode 100644 index 000000000000..ddfba97e52a3 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -0,0 +1,10 @@ +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html'); + +modules.get('apps/settings') + .directive('patternReviewStep', function () { + return { + template: template + }; + }); + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html new file mode 100644 index 000000000000..0447d428d6b1 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html @@ -0,0 +1 @@ +Build pipeline step diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js new file mode 100644 index 000000000000..ff18fe60b32f --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js @@ -0,0 +1,10 @@ +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/data/directives/pipeline_step.html'); + +modules.get('apps/settings') + .directive('pipelineStep', function () { + return { + template: template + }; + }); + diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html new file mode 100644 index 000000000000..d3516c6b32c1 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -0,0 +1,15 @@ + +
+ Filebeat wizard breadcrumb + +
+ + + + +
+ + + +
+ diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js new file mode 100644 index 000000000000..974ddeb72894 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js @@ -0,0 +1,32 @@ +var routes = require('ui/routes'); +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/data/filebeat/index.html'); + +require('plugins/kibana/settings/sections/data/directives/pattern_review_step'); +require('plugins/kibana/settings/sections/data/directives/paste_samples_step'); +require('plugins/kibana/settings/sections/data/directives/pipeline_step'); +require('plugins/kibana/settings/sections/data/directives/install_filebeat_step'); + +routes.when('/settings/data/filebeat', { + template: template +}); + +// wrapper directive, which sets up the breadcrumb for all filebeat steps +modules.get('apps/settings') + .controller('kbnSettingsDataFilebeat', function ($scope) { + var totalSteps = 4; + var currentStep = 0; + + $scope.currentStep = currentStep; + $scope.nextStep = function () { + if ($scope.currentStep + 1 < totalSteps) { + ++$scope.currentStep; + } + }; + $scope.prevStep = function () { + if ($scope.currentStep > 0) { + --$scope.currentStep; + } + }; + + }); diff --git a/src/plugins/kibana/public/settings/sections/data/index.html b/src/plugins/kibana/public/settings/sections/data/index.html new file mode 100644 index 000000000000..ec9f280d1d6e --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/index.html @@ -0,0 +1,5 @@ + +
+ Tail a file +
+ diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js index 63e57128fb22..12d9ec4fe3e0 100644 --- a/src/plugins/kibana/public/settings/sections/data/index.js +++ b/src/plugins/kibana/public/settings/sections/data/index.js @@ -1 +1,12 @@ -import review from 'plugins/kibana/settings/sections/data/_review'; +require('plugins/kibana/settings/sections/data/filebeat/index'); + +require('ui/routes') + .when('/settings/data', { + template: require('plugins/kibana/settings/sections/data/index.html') + }); + +module.exports = { + name: 'data', + display: 'Data', + url: '#/settings/data' +}; diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js index 0ef737f9437a..394e6e488c9e 100644 --- a/src/plugins/kibana/public/settings/sections/index.js +++ b/src/plugins/kibana/public/settings/sections/index.js @@ -3,10 +3,10 @@ define(function (require) { // are used to create the nav bar return [ require('plugins/kibana/settings/sections/indices/index'), + require('plugins/kibana/settings/sections/data/index'), require('plugins/kibana/settings/sections/advanced/index'), require('plugins/kibana/settings/sections/objects/index'), require('plugins/kibana/settings/sections/status/index'), - require('plugins/kibana/settings/sections/data/index'), require('plugins/kibana/settings/sections/about/index') ]; }); From 52a4ee3c9cc3d609b2f5e967934e5d40e873926b Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 30 Dec 2015 12:57:56 -0500 Subject: [PATCH 06/60] add breadcrumb to wizard (cherry picked from commit ad25d24) --- .../sections/data/filebeat/index.html | 19 ++++++++++++++++++- .../settings/sections/data/filebeat/index.js | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html index d3516c6b32c1..bfeacb0f96f1 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -1,6 +1,23 @@
- Filebeat wizard breadcrumb +
+ + + + +
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js index 974ddeb72894..07b3198b99b2 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js @@ -28,5 +28,8 @@ modules.get('apps/settings') --$scope.currentStep; } }; + $scope.setCurrentStep = function (step) { + $scope.currentStep = step; + }; }); From 8b5c95d190aed06504e41830b7940ecf6600405e Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 30 Dec 2015 14:17:59 -0500 Subject: [PATCH 07/60] demonstrating flow of data through the wizard steps (cherry picked from commit 4bcc5a1) --- .../data/directives/install_filebeat_step.html | 11 ++++++++++- .../sections/data/directives/install_filebeat_step.js | 8 +++++++- .../sections/data/directives/paste_samples_step.html | 4 +++- .../sections/data/directives/paste_samples_step.js | 5 ++++- .../sections/data/directives/pattern_review_step.html | 8 +++++++- .../sections/data/directives/pattern_review_step.js | 6 +++++- .../sections/data/directives/pipeline_step.html | 8 +++++++- .../sections/data/directives/pipeline_step.js | 6 +++++- .../public/settings/sections/data/filebeat/index.html | 8 ++++---- .../public/settings/sections/data/filebeat/index.js | 7 +++++-- 10 files changed, 57 insertions(+), 14 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html index 48b974b48a47..e2de5be0d535 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html @@ -1 +1,10 @@ -Install filebeat step +

Install filebeat step

+ +
+Results: +
    +
  • Logs: {{results[0]}}
    • +
  • Docs: {{results[1]}}
    • +
  • Pattern: {{results[2]}}
    • +
+
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js index 4eed9ae61a55..c615e76c3752 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js @@ -4,7 +4,13 @@ var template = require('plugins/kibana/settings/sections/data/directives/install modules.get('apps/settings') .directive('installFilebeatStep', function () { return { - template: template + template: template, + scope: { + results: '=' + }, + controller: function ($scope) { + var results = $scope.results; + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html index 31f41b0b76f7..af6875cd3524 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html @@ -1 +1,3 @@ -Paste samples step +

Paste samples step

+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js index 7b033ecbf770..42b14e1417d2 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js @@ -4,7 +4,10 @@ var template = require('plugins/kibana/settings/sections/data/directives/paste_s modules.get('apps/settings') .directive('pasteSamplesStep', function () { return { - template: template + template: template, + scope: { + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index c113af3185f8..75d8dc49dab0 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1 +1,7 @@ -Pattern review step +

Pattern review step

+ +
+ Docs: {{docs}} +
+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index ddfba97e52a3..6ceb1ecb03a1 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pattern modules.get('apps/settings') .directive('patternReviewStep', function () { return { - template: template + template: template, + scope: { + docs: '=', + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html index 0447d428d6b1..d2140d708bf6 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html @@ -1 +1,7 @@ -Build pipeline step +

Build pipeline step

+ +
+ Logs: {{logs}} +
+ + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js index ff18fe60b32f..9336d94da507 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js @@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pipelin modules.get('apps/settings') .directive('pipelineStep', function () { return { - template: template + template: template, + scope: { + logs: '=', + save: '&onSave' + } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html index bfeacb0f96f1..bd9f6703347b 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -20,10 +20,10 @@
- - - - + + + +
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js index 07b3198b99b2..dc6a8863cafb 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js @@ -15,9 +15,9 @@ routes.when('/settings/data/filebeat', { modules.get('apps/settings') .controller('kbnSettingsDataFilebeat', function ($scope) { var totalSteps = 4; - var currentStep = 0; + $scope.currentStep = 0; + $scope.stepResults = []; - $scope.currentStep = currentStep; $scope.nextStep = function () { if ($scope.currentStep + 1 < totalSteps) { ++$scope.currentStep; @@ -32,4 +32,7 @@ modules.get('apps/settings') $scope.currentStep = step; }; + $scope.saveStepResults = function (step, results) { + $scope.stepResults[step] = results; + }; }); From 7dbef2fb9a25a3122ceab828a1096766d4cc9636 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 13:04:54 -0500 Subject: [PATCH 08/60] Starting work on pattern review page --- .../data/directives/pattern_review_step.html | 7 ++++++ .../data/directives/pattern_review_step.js | 24 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index 75d8dc49dab0..3d6e318795d7 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1,5 +1,12 @@

Pattern review step

+
+ + +
+
Docs: {{docs}}
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index 6ceb1ecb03a1..031345e3f33d 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -1,5 +1,17 @@ var modules = require('ui/modules'); var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html'); +var _ = require('lodash'); + +var testData = { + message: 'src=1.1.1.1 evil=1', + src: '1.1.1.1', + evil: '1', + coordinates: { + lat: 37.3894, + lon: 122.0819 + }, + '@timestamp': '2015-11-24T00:00:00.000Z' +}; modules.get('apps/settings') .directive('patternReviewStep', function () { @@ -8,6 +20,18 @@ modules.get('apps/settings') scope: { docs: '=', save: '&onSave' + }, + controller: function ($scope, Private) { + $scope.docs = testData; + $scope.columns = [ + {title: 'Field'}, + {title: 'Type'}, + {title: 'Example', sortable: false} + ]; + + $scope.rows = _.map($scope.docs, (value, key) => { + return [key, 'type', value]; + }); } }; }); From d4aff7709531a133b7dad83eefc6e716eaa81e76 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 14:29:12 -0500 Subject: [PATCH 09/60] Type selection dropdown --- .../data/directives/pattern_review_step.html | 3 ++- .../data/directives/pattern_review_step.js | 16 ++++++++++++++-- .../sections/data/partials/_edit_field_type.html | 9 +++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index 3d6e318795d7..cf394b42de50 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -11,4 +11,5 @@ Docs: {{docs}}
- + + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index 031345e3f33d..d06e30e20c55 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -1,6 +1,7 @@ var modules = require('ui/modules'); var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html'); var _ = require('lodash'); +var editFieldTypeHTML = require('plugins/kibana/settings/sections/data/partials/_edit_field_type.html'); var testData = { message: 'src=1.1.1.1 evil=1', @@ -23,14 +24,25 @@ modules.get('apps/settings') }, controller: function ($scope, Private) { $scope.docs = testData; + $scope.fields = _.map($scope.docs, (value, key) => { + return {name: key, type: typeof value}; + }); + $scope.columns = [ {title: 'Field'}, {title: 'Type'}, {title: 'Example', sortable: false} ]; - $scope.rows = _.map($scope.docs, (value, key) => { - return [key, 'type', value]; + $scope.rows = _.map($scope.fields, (field) => { + return [ + field.name, + { + markup: editFieldTypeHTML, + scope: _.assign($scope.$new(), {field: field}) + }, + $scope.docs[field.name] + ]; }); } }; diff --git a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html new file mode 100644 index 000000000000..eecf3a3f3548 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html @@ -0,0 +1,9 @@ + From 27e402bad468fd896ffbb0018bc35d059a8be1fc Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 14:59:55 -0500 Subject: [PATCH 10/60] add index pattern input --- .../sections/data/directives/pattern_review_step.html | 11 +++++------ .../sections/data/directives/pattern_review_step.js | 9 +++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index cf394b42de50..e0d52236a435 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1,5 +1,9 @@

Pattern review step

+
+ +
+
-
- Docs: {{docs}} -
- - - + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index d06e30e20c55..c1695f532cbd 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -24,17 +24,22 @@ modules.get('apps/settings') }, controller: function ($scope, Private) { $scope.docs = testData; - $scope.fields = _.map($scope.docs, (value, key) => { + $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'}; + $scope.indexPattern.fields = _.map($scope.docs, (value, key) => { return {name: key, type: typeof value}; }); + $scope.$watch('indexPattern.id', function (value) { + $scope.indexPattern.title = value; + }); + $scope.columns = [ {title: 'Field'}, {title: 'Type'}, {title: 'Example', sortable: false} ]; - $scope.rows = _.map($scope.fields, (field) => { + $scope.rows = _.map($scope.indexPattern.fields, (field) => { return [ field.name, { From db8014c6b7654cb05528030a790434ef20f8187a Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 17:32:14 -0500 Subject: [PATCH 11/60] Simplifying communication between wizard and the step directives --- .../data/directives/install_filebeat_step.html | 6 +++--- .../data/directives/paste_samples_step.html | 2 +- .../data/directives/paste_samples_step.js | 2 +- .../data/directives/pattern_review_step.html | 4 ++-- .../data/directives/pattern_review_step.js | 5 +++-- .../sections/data/directives/pipeline_step.html | 4 ++-- .../sections/data/directives/pipeline_step.js | 5 +++-- .../settings/sections/data/filebeat/index.html | 16 +++++++++++++--- .../settings/sections/data/filebeat/index.js | 6 +----- 9 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html index e2de5be0d535..f65d65f4b31d 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html @@ -3,8 +3,8 @@
Results:
    -
  • Logs: {{results[0]}}
    • -
  • Docs: {{results[1]}}
    • -
  • Pattern: {{results[2]}}
    • +
  • Logs: {{results.samples}}
    • +
  • Docs: {{results.sampleDocs}}
    • +
  • Pattern: {{results.indexPattern}}
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html index af6875cd3524..919a609f5af8 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html @@ -1,3 +1,3 @@

Paste samples step

- + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js index 42b14e1417d2..03ae62052ea3 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js @@ -6,7 +6,7 @@ modules.get('apps/settings') return { template: template, scope: { - save: '&onSave' + samples: '=' } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index 75d8dc49dab0..25b713bd7fd3 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1,7 +1,7 @@

Pattern review step

- Docs: {{docs}} + Docs: {{sampleDocs}}
- + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index 6ceb1ecb03a1..63c1d1f71aa3 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -6,8 +6,9 @@ modules.get('apps/settings') return { template: template, scope: { - docs: '=', - save: '&onSave' + sampleDocs: '=', + indexPattern: '=', + pipeline: '=' } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html index d2140d708bf6..88c952bb0652 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html @@ -1,7 +1,7 @@

Build pipeline step

- Logs: {{logs}} + Logs: {{samples}}
- + diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js index 9336d94da507..99e7bee782ff 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js @@ -6,8 +6,9 @@ modules.get('apps/settings') return { template: template, scope: { - logs: '=', - save: '&onSave' + samples: '=', + sampleDocs: '=', + pipeline: '=' } }; }); diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html index bd9f6703347b..ac9249cf3e94 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -20,9 +20,19 @@
- - - + + + + +
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js index dc6a8863cafb..81289972d371 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js @@ -16,7 +16,7 @@ modules.get('apps/settings') .controller('kbnSettingsDataFilebeat', function ($scope) { var totalSteps = 4; $scope.currentStep = 0; - $scope.stepResults = []; + $scope.stepResults = {}; $scope.nextStep = function () { if ($scope.currentStep + 1 < totalSteps) { @@ -31,8 +31,4 @@ modules.get('apps/settings') $scope.setCurrentStep = function (step) { $scope.currentStep = step; }; - - $scope.saveStepResults = function (step, results) { - $scope.stepResults[step] = results; - }; }); From ede8ef67d0dab9734cd2783e655f4d8182747629 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 18:22:38 -0500 Subject: [PATCH 12/60] Disabling navigation buttons until each step is complete and adding some light styling --- .../data/directives/pipeline_step.html | 2 +- .../sections/data/filebeat/index.html | 83 +++++++++++-------- .../kibana/public/settings/styles/main.less | 13 +++ 3 files changed, 63 insertions(+), 35 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html index 88c952bb0652..0c717c86256b 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html @@ -4,4 +4,4 @@ Logs: {{samples}} - + diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html index ac9249cf3e94..f12112107e46 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html @@ -1,42 +1,57 @@
-
- - - - +
+ + 1. Paste + + + 2. Parse + + + 3. Review + + + 4. Install Filebeat +
- - - - - - -
+
+ +
+ +
+
- - +
+ + + +
+ + +
+
+ +
+ + + +
+ + +
+
+ +
+ +
+
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less index ef10f7317faa..c9bf7066da97 100644 --- a/src/plugins/kibana/public/settings/styles/main.less +++ b/src/plugins/kibana/public/settings/styles/main.less @@ -186,3 +186,16 @@ kbn-settings-indices { .kbn-settings-indices-create { .time-and-pattern > div {} } + +.wizard-step-headings{ + margin-top: 1em; + + .wizard-step-heading { + font-size: 1.5em; + padding-right: 1.5em; + + &.active { + font-weight: bold; + } + } +} From 027e807eddb6a1812184419eec1ccead6080a182 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 18:52:59 -0500 Subject: [PATCH 13/60] avoid overwriting pattern properties if they were previously set --- .../sections/data/directives/pattern_review_step.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index e44ee5a31d19..dc96296352da 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -25,10 +25,14 @@ modules.get('apps/settings') }, controller: function ($scope, Private) { $scope.sampleDocs = testData; - $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'}; - $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => { - return {name: key, type: typeof value}; - }); + if (_.isEmpty($scope.indexPattern)) { + $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'}; + } + if (_.isEmpty($scope.indexPattern.fields)) { + $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => { + return {name: key, type: typeof value}; + }); + } $scope.$watch('indexPattern.id', function (value) { $scope.indexPattern.title = value; From da6183cd6ede970923ddeca6f96cec8f3206f8d8 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 12 Jan 2016 19:07:09 -0500 Subject: [PATCH 14/60] add timeFieldName form input and time based checkbox --- .../data/directives/pattern_review_step.html | 10 +++++++++- .../data/directives/pattern_review_step.js | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index 61951167d55c..aa4f427dbfb3 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -1,7 +1,15 @@

Pattern review step

- + + +
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index dc96296352da..935314a3788b 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -25,14 +25,20 @@ modules.get('apps/settings') }, controller: function ($scope, Private) { $scope.sampleDocs = testData; - if (_.isEmpty($scope.indexPattern)) { - $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'}; + if (_.isUndefined($scope.indexPattern)) { + $scope.indexPattern = {}; } - if (_.isEmpty($scope.indexPattern.fields)) { - $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => { + + _.defaults($scope.indexPattern, { + id: 'filebeat-*', + title: 'filebeat-*', + timeFieldName: '@timestamp', + fields: _.map($scope.sampleDocs, (value, key) => { return {name: key, type: typeof value}; - }); - } + }) + }); + + $scope.isTimeBased = !!$scope.indexPattern.timeFieldName; $scope.$watch('indexPattern.id', function (value) { $scope.indexPattern.title = value; From a47fc05ef79b334fbfe5d0aa30af5ab3bf4ee745 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 13 Jan 2016 12:03:30 -0500 Subject: [PATCH 15/60] Detect geo_points and dates by looking at the pipeline --- .../data/directives/pattern_review_step.js | 69 +++++++++++++++++-- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index 935314a3788b..299142f93811 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -4,16 +4,55 @@ var _ = require('lodash'); var editFieldTypeHTML = require('plugins/kibana/settings/sections/data/partials/_edit_field_type.html'); var testData = { - message: 'src=1.1.1.1 evil=1', - src: '1.1.1.1', - evil: '1', - coordinates: { + message: '11/24/2015 ip=1.1.1.1 bytes=1234', + clientip: '1.1.1.1', + bytes: 1234, + geoip: { lat: 37.3894, lon: 122.0819 }, - '@timestamp': '2015-11-24T00:00:00.000Z' + location: { + lat: 37.3894, + lon: 122.0819 + }, + '@timestamp': '2015-11-24T00:00:00.000Z', + otherdate: '2015-11-24T00:00:00.000Z', + codes: [1, 2, 3, 4] }; +var testPipeline = [ + { + grok: { + match_field: 'message', + match_pattern: 'foo' + } + }, + { + geoip: { + source_field: 'ip' + } + }, + { + geoip: { + source_field: 'ip', + target_field: 'location' + } + }, + { + date: { + match_field: 'initialDate', + match_formats: ['dd/MM/yyyy hh:mm:ss'] + } + }, + { + date: { + match_field: 'initialDate', + match_formats: ['dd/MM/yyyy hh:mm:ss'], + target_field: 'otherdate' + } + } +]; + modules.get('apps/settings') .directive('patternReviewStep', function () { return { @@ -25,16 +64,31 @@ modules.get('apps/settings') }, controller: function ($scope, Private) { $scope.sampleDocs = testData; + $scope.pipeline = testPipeline; + if (_.isUndefined($scope.indexPattern)) { $scope.indexPattern = {}; } + const knownFieldTypes = {}; + $scope.pipeline.forEach(function (processor) { + if (processor.geoip) { + let field = processor.geoip.target_field || 'geoip'; + knownFieldTypes[field] = 'geo_point'; + } + if (processor.date) { + let field = processor.date.target_field || '@timestamp'; + knownFieldTypes[field] = 'date'; + } + }); + _.defaults($scope.indexPattern, { id: 'filebeat-*', title: 'filebeat-*', timeFieldName: '@timestamp', fields: _.map($scope.sampleDocs, (value, key) => { - return {name: key, type: typeof value}; + let type = knownFieldTypes[key] || typeof value; + return {name: key, type: type}; }) }); @@ -51,13 +105,14 @@ modules.get('apps/settings') ]; $scope.rows = _.map($scope.indexPattern.fields, (field) => { + const sampleValue = $scope.sampleDocs[field.name]; return [ field.name, { markup: editFieldTypeHTML, scope: _.assign($scope.$new(), {field: field}) }, - $scope.sampleDocs[field.name] + typeof sampleValue === 'object' ? JSON.stringify(sampleValue) : sampleValue ]; }); } From 3bad81de585275aa418887b376dffe321ec4b8ed Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 13 Jan 2016 12:07:09 -0500 Subject: [PATCH 16/60] detect the type of array elements --- .../settings/sections/data/directives/pattern_review_step.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index 299142f93811..df75d5f2d814 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -88,6 +88,9 @@ modules.get('apps/settings') timeFieldName: '@timestamp', fields: _.map($scope.sampleDocs, (value, key) => { let type = knownFieldTypes[key] || typeof value; + if (type === 'object' && _.isArray(value) && !_.isEmpty(value)) { + type = typeof value[0]; + } return {name: key, type: type}; }) }); From 9e4362b2456764be2ede6582e104746caed4f98a Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 13 Jan 2016 14:10:58 -0500 Subject: [PATCH 17/60] Pick default date field and update date field list when user changes type --- .../data/directives/pattern_review_step.html | 6 +++- .../data/directives/pattern_review_step.js | 28 ++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html index aa4f427dbfb3..e97520f0b0ba 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html @@ -8,7 +8,11 @@
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js index df75d5f2d814..a7a4f838a382 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js @@ -53,6 +53,19 @@ var testPipeline = [ } ]; +function pickDefaultTimeFieldName(dateFields) { + if (_.isEmpty(dateFields)) { + return undefined; + } + + let fieldName = dateFields[0]; + if (_.includes(dateFields, '@timestamp')) { + fieldName = '@timestamp'; + } + + return fieldName; +} + modules.get('apps/settings') .directive('patternReviewStep', function () { return { @@ -71,6 +84,7 @@ modules.get('apps/settings') } const knownFieldTypes = {}; + $scope.dateFields = []; $scope.pipeline.forEach(function (processor) { if (processor.geoip) { let field = processor.geoip.target_field || 'geoip'; @@ -79,13 +93,14 @@ modules.get('apps/settings') if (processor.date) { let field = processor.date.target_field || '@timestamp'; knownFieldTypes[field] = 'date'; + $scope.dateFields.push(field); } }); _.defaults($scope.indexPattern, { id: 'filebeat-*', title: 'filebeat-*', - timeFieldName: '@timestamp', + timeFieldName: pickDefaultTimeFieldName($scope.dateFields), fields: _.map($scope.sampleDocs, (value, key) => { let type = knownFieldTypes[key] || typeof value; if (type === 'object' && _.isArray(value) && !_.isEmpty(value)) { @@ -100,6 +115,17 @@ modules.get('apps/settings') $scope.$watch('indexPattern.id', function (value) { $scope.indexPattern.title = value; }); + $scope.$watch('isTimeBased', function (value) { + if (value) { + $scope.indexPattern.timeFieldName = pickDefaultTimeFieldName($scope.dateFields); + } + else { + delete $scope.indexPattern.timeFieldName; + } + }); + $scope.$watch('indexPattern.fields', (fields) => { + $scope.dateFields = _.map(_.filter(fields, {type: 'date'}), 'name'); + }, true); $scope.columns = [ {title: 'Field'}, From 4df54be44c073277fc45c0b6f814ed390a4341b5 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 13 Jan 2016 14:17:11 -0500 Subject: [PATCH 18/60] lock type if we detect a geo_point --- .../settings/sections/data/partials/_edit_field_type.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html index eecf3a3f3548..accc574f4d72 100644 --- a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html +++ b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html @@ -1,4 +1,4 @@ - @@ -7,3 +7,7 @@ + + + geo_point + From 6709fbabe04c2d419244fb739bdc44bb3fbe486c Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 20 Jan 2016 17:31:31 -0500 Subject: [PATCH 19/60] Make the index pattern creation page a sub-section of the new Add Data start page --- .../settings/sections/indices/_create.js | 2 +- .../directives/kbn_settings_indices.html | 38 +++++++++++++ .../directives/kbn_settings_indices.js | 27 ++++++++++ .../settings/sections/indices/index.html | 54 ++++++------------- .../public/settings/sections/indices/index.js | 34 +++--------- 5 files changed, 89 insertions(+), 66 deletions(-) create mode 100644 src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html create mode 100644 src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index ec92360435ae..4437fbc7ddde 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -7,7 +7,7 @@ define(function (require) { require('ui/directives/auto_select_if_only_one'); require('ui/routes') - .when('/settings/indices/', { + .when('/settings/indices/existing', { template: require('plugins/kibana/settings/sections/indices/_create.html') }); diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html new file mode 100644 index 000000000000..95039645907b --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html @@ -0,0 +1,38 @@ +
+
+
+
+ Index Patterns  + + Add New + Add New + +
+
+
    +
  • +
    + Warning No default index pattern. You must select or create one to continue. +
    +
    • +
  • + +
    + + +
    +     +
    • +
+
+
+ +
diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js new file mode 100644 index 000000000000..6035eb85f003 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js @@ -0,0 +1,27 @@ +// wrapper directive, which sets some global stuff up like the left nav +require('ui/modules').get('apps/settings') +.directive('kbnSettingsIndices', function ($route, config, kbnUrl) { + return { + restrict: 'E', + transclude: true, + template: require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices.html'), + link: function ($scope) { + $scope.edittingId = $route.current.params.indexPatternId; + config.$bind($scope, 'defaultIndex'); + + $scope.$watch('defaultIndex', function () { + var ids = $route.current.locals.indexPatternIds; + $scope.indexPatternList = ids.map(function (id) { + return { + id: id, + url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}), + class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''), + default: $scope.defaultIndex === id + }; + }); + }); + + $scope.$emit('application.load'); + } + }; +}); diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html index 15809f900a47..a083d5a51105 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/index.html @@ -1,38 +1,18 @@ -
-
-
-
- Index Patterns  - - Add New - Add New - -
-
-
    -
  • -
    - Warning No default index pattern. You must select or create one to continue. -
    -
    • -
  • - -
    - - -
    -     -
    • -
-
-
+ + +
+
+

Add Data

+ Before we can get to the fun stuff, we'll have to get some data into your Elasticsearch cluster. + Pick the option that best suits your use case below, and we'll guide you through the process! +
-
+

+ Existing Indices +

+
+ Pick this option if you already have data in Elasticsearch. +
+
+ + diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js index b3588ef40bd7..45139727fa47 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/index.js @@ -1,6 +1,7 @@ define(function (require) { var _ = require('lodash'); + require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices'); require('plugins/kibana/settings/sections/indices/_create'); require('plugins/kibana/settings/sections/indices/_edit'); require('plugins/kibana/settings/sections/indices/_field_editor'); @@ -15,37 +16,14 @@ define(function (require) { } }); - // wrapper directive, which sets some global stuff up like the left nav - require('ui/modules').get('apps/settings') - .directive('kbnSettingsIndices', function ($route, config, kbnUrl) { - return { - restrict: 'E', - transclude: true, - template: require('plugins/kibana/settings/sections/indices/index.html'), - link: function ($scope) { - $scope.edittingId = $route.current.params.indexPatternId; - config.$bind($scope, 'defaultIndex'); - - $scope.$watch('defaultIndex', function () { - var ids = $route.current.locals.indexPatternIds; - $scope.indexPatternList = ids.map(function (id) { - return { - id: id, - url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}), - class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''), - default: $scope.defaultIndex === id - }; - }); - }); - - $scope.$emit('application.load'); - } - }; - }); + require('ui/routes') + .when('/settings/indices', { + template: require('plugins/kibana/settings/sections/indices/index.html') + }); return { name: 'indices', display: 'Indices', - url: '#/settings/indices', + url: '#/settings/indices' }; }); From b7ddd7e1ec4c74c9da3f42636e77f7f5ecac64d6 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 20 Jan 2016 18:02:49 -0500 Subject: [PATCH 20/60] move filebeat wizard under settings/indices --- .../public/settings/sections/data/index.html | 5 ----- .../kibana/public/settings/sections/data/index.js | 12 ------------ .../kibana/public/settings/sections/index.js | 1 - .../directives/install_filebeat_step.html | 0 .../directives/install_filebeat_step.js | 2 +- .../directives/paste_samples_step.html | 0 .../directives/paste_samples_step.js | 2 +- .../directives/pattern_review_step.html | 0 .../directives/pattern_review_step.js | 2 +- .../directives/pipeline_step.html | 0 .../{data => indices}/directives/pipeline_step.js | 2 +- .../sections/{data => indices}/filebeat/index.html | 4 ++-- .../sections/{data => indices}/filebeat/index.js | 14 +++++++------- .../public/settings/sections/indices/index.html | 7 +++++++ .../public/settings/sections/indices/index.js | 1 + 15 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 src/plugins/kibana/public/settings/sections/data/index.html delete mode 100644 src/plugins/kibana/public/settings/sections/data/index.js rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/install_filebeat_step.html (100%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/install_filebeat_step.js (73%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/paste_samples_step.html (100%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/paste_samples_step.js (67%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pattern_review_step.html (100%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pattern_review_step.js (71%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pipeline_step.html (100%) rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pipeline_step.js (72%) rename src/plugins/kibana/public/settings/sections/{data => indices}/filebeat/index.html (94%) rename src/plugins/kibana/public/settings/sections/{data => indices}/filebeat/index.js (54%) diff --git a/src/plugins/kibana/public/settings/sections/data/index.html b/src/plugins/kibana/public/settings/sections/data/index.html deleted file mode 100644 index ec9f280d1d6e..000000000000 --- a/src/plugins/kibana/public/settings/sections/data/index.html +++ /dev/null @@ -1,5 +0,0 @@ - -
- Tail a file -
- diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js deleted file mode 100644 index 12d9ec4fe3e0..000000000000 --- a/src/plugins/kibana/public/settings/sections/data/index.js +++ /dev/null @@ -1,12 +0,0 @@ -require('plugins/kibana/settings/sections/data/filebeat/index'); - -require('ui/routes') - .when('/settings/data', { - template: require('plugins/kibana/settings/sections/data/index.html') - }); - -module.exports = { - name: 'data', - display: 'Data', - url: '#/settings/data' -}; diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js index 394e6e488c9e..c2be1402c526 100644 --- a/src/plugins/kibana/public/settings/sections/index.js +++ b/src/plugins/kibana/public/settings/sections/index.js @@ -3,7 +3,6 @@ define(function (require) { // are used to create the nav bar return [ require('plugins/kibana/settings/sections/indices/index'), - require('plugins/kibana/settings/sections/data/index'), require('plugins/kibana/settings/sections/advanced/index'), require('plugins/kibana/settings/sections/objects/index'), require('plugins/kibana/settings/sections/status/index'), diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html rename to src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js similarity index 73% rename from src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js rename to src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js index c615e76c3752..be0ea96b2386 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/data/directives/install_filebeat_step.html'); +var template = require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step.html'); modules.get('apps/settings') .directive('installFilebeatStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html rename to src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js similarity index 67% rename from src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js rename to src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js index 03ae62052ea3..92050be87225 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/data/directives/paste_samples_step.html'); +var template = require('plugins/kibana/settings/sections/indices/directives/paste_samples_step.html'); modules.get('apps/settings') .directive('pasteSamplesStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html rename to src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js similarity index 71% rename from src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js rename to src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js index 63c1d1f71aa3..f5ac34e8c944 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html'); +var template = require('plugins/kibana/settings/sections/indices/directives/pattern_review_step.html'); modules.get('apps/settings') .directive('patternReviewStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html rename to src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js similarity index 72% rename from src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js rename to src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js index 99e7bee782ff..54d5c26cc1c7 100644 --- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/data/directives/pipeline_step.html'); +var template = require('plugins/kibana/settings/sections/indices/directives/pipeline_step.html'); modules.get('apps/settings') .directive('pipelineStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html similarity index 94% rename from src/plugins/kibana/public/settings/sections/data/filebeat/index.html rename to src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index f12112107e46..731580b59df9 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -1,5 +1,5 @@ - -
+ +
1. Paste diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js similarity index 54% rename from src/plugins/kibana/public/settings/sections/data/filebeat/index.js rename to src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index 81289972d371..9655b51760b4 100644 --- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -1,19 +1,19 @@ var routes = require('ui/routes'); var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/data/filebeat/index.html'); +var template = require('plugins/kibana/settings/sections/indices/filebeat/index.html'); -require('plugins/kibana/settings/sections/data/directives/pattern_review_step'); -require('plugins/kibana/settings/sections/data/directives/paste_samples_step'); -require('plugins/kibana/settings/sections/data/directives/pipeline_step'); -require('plugins/kibana/settings/sections/data/directives/install_filebeat_step'); +require('plugins/kibana/settings/sections/indices/directives/pattern_review_step'); +require('plugins/kibana/settings/sections/indices/directives/paste_samples_step'); +require('plugins/kibana/settings/sections/indices/directives/pipeline_step'); +require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step'); -routes.when('/settings/data/filebeat', { +routes.when('/settings/indices/filebeat', { template: template }); // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') - .controller('kbnSettingsDataFilebeat', function ($scope) { + .controller('kbnSettingsIndicesFilebeat', function ($scope) { var totalSteps = 4; $scope.currentStep = 0; $scope.stepResults = {}; diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html index a083d5a51105..53e4126ab322 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/index.html @@ -13,6 +13,13 @@
Pick this option if you already have data in Elasticsearch.
+ +

+ Tail a File +

+
+ Pick this option if you have log data you'd like to send to Elasticsearch. +
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js index 45139727fa47..fc96a0d24da9 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/index.js @@ -3,6 +3,7 @@ define(function (require) { require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices'); require('plugins/kibana/settings/sections/indices/_create'); + require('plugins/kibana/settings/sections/indices/filebeat/index'); require('plugins/kibana/settings/sections/indices/_edit'); require('plugins/kibana/settings/sections/indices/_field_editor'); From 70e21a24708c3f457db64adde6db6b5d43144936 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 20 Jan 2016 18:30:06 -0500 Subject: [PATCH 21/60] make filebeat wizard layout more consistent with the create index pattern page --- .../sections/indices/filebeat/index.html | 76 ++++++++++--------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index 731580b59df9..6a44020dd445 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -1,6 +1,13 @@ -
-
+ +
+
+

Tail a File

+ Let's send some log data to Elasticsearch. +
+
+
+
1. Paste @@ -13,45 +20,46 @@ 4. Install Filebeat -
- -
-
- -
- -
-
- - - -
- - +
+
+ +
+ +
-
-
- - +
+ + -
- - +
+ + +
-
-
- +
+ + + +
+ + +
+
+ +
+ +
-
+ From 944b78a241d694d52978a7d0e5503011c7f9a340 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 13:27:11 -0500 Subject: [PATCH 22/60] Update functional tests to know about the new add data landing page --- .../public/settings/sections/indices/_create.js | 2 +- .../public/settings/sections/indices/_edit.html | 2 +- .../public/settings/sections/indices/index.html | 4 ++-- test/functional/apps/discover/_discover.js | 2 +- test/functional/apps/settings/_advanced_settings.js | 2 +- .../apps/settings/_creation_form_changes.js | 2 +- .../apps/settings/_index_pattern_create_delete.js | 6 +++--- .../apps/settings/_index_pattern_popularity.js | 4 ++-- .../apps/settings/_index_pattern_results_sort.js | 5 +++-- test/functional/apps/settings/_initial_state.js | 2 +- test/functional/apps/visualize/_area_chart.js | 2 +- test/functional/apps/visualize/_chart_types.js | 2 +- test/functional/apps/visualize/_data_table.js | 2 +- test/functional/apps/visualize/_line_chart.js | 2 +- test/functional/apps/visualize/_metric_chart.js | 2 +- test/functional/apps/visualize/_pie_chart.js | 2 +- test/functional/apps/visualize/_tile_map.js | 2 +- .../functional/apps/visualize/_vertical_bar_chart.js | 2 +- test/support/pages/settings_page.js | 12 ++++++++---- 19 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index 4437fbc7ddde..a9b35867d3ca 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -7,7 +7,7 @@ define(function (require) { require('ui/directives/auto_select_if_only_one'); require('ui/routes') - .when('/settings/indices/existing', { + .when('/settings/indices/create/existing', { template: require('plugins/kibana/settings/sections/indices/_create.html') }); diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.html b/src/plugins/kibana/public/settings/sections/indices/_edit.html index ee0e6f65a307..5e0e95d19ce1 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_edit.html +++ b/src/plugins/kibana/public/settings/sections/indices/_edit.html @@ -1,6 +1,6 @@ -
+
-
+

Add Data

Before we can get to the fun stuff, we'll have to get some data into your Elasticsearch cluster. @@ -8,7 +8,7 @@

- Existing Indices + Existing Indices

Pick this option if you already have data in Elasticsearch. diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js index 13707abc2e58..100336e8fb80 100644 --- a/test/functional/apps/discover/_discover.js +++ b/test/functional/apps/discover/_discover.js @@ -28,7 +28,7 @@ define(function (require) { }) .then(function (navigateTo) { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/settings/_advanced_settings.js b/test/functional/apps/settings/_advanced_settings.js index edf14b191442..94eaa54a68a2 100644 --- a/test/functional/apps/settings/_advanced_settings.js +++ b/test/functional/apps/settings/_advanced_settings.js @@ -14,7 +14,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); }); diff --git a/test/functional/apps/settings/_creation_form_changes.js b/test/functional/apps/settings/_creation_form_changes.js index 932756d15336..aadd1202cc7a 100644 --- a/test/functional/apps/settings/_creation_form_changes.js +++ b/test/functional/apps/settings/_creation_form_changes.js @@ -16,7 +16,7 @@ define(function (require) { bdd.beforeEach(function () { return scenarioManager.reload('emptyKibana') .then(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); }); diff --git a/test/functional/apps/settings/_index_pattern_create_delete.js b/test/functional/apps/settings/_index_pattern_create_delete.js index 9c8d27b810cb..80c57c5e2b34 100644 --- a/test/functional/apps/settings/_index_pattern_create_delete.js +++ b/test/functional/apps/settings/_index_pattern_create_delete.js @@ -16,7 +16,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); }); @@ -81,9 +81,9 @@ define(function (require) { }); }); - bdd.it('should return to index pattern creation page', function returnToPage() { + bdd.it('should return to the add data landing page', function returnToPage() { return common.tryForTime(5000, function () { - return settingsPage.getCreateButton(); + return common.findTestSubject('addData'); }) .catch(common.handleError(this)); }); diff --git a/test/functional/apps/settings/_index_pattern_popularity.js b/test/functional/apps/settings/_index_pattern_popularity.js index a8c36e91194a..b13e4332e6ca 100644 --- a/test/functional/apps/settings/_index_pattern_popularity.js +++ b/test/functional/apps/settings/_index_pattern_popularity.js @@ -16,7 +16,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); }); @@ -25,7 +25,7 @@ define(function (require) { }); bdd.afterEach(function ae() { - return settingsPage.removeIndexPattern(); + return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink); }); bdd.describe('change popularity', function indexPatternCreation() { diff --git a/test/functional/apps/settings/_index_pattern_results_sort.js b/test/functional/apps/settings/_index_pattern_results_sort.js index c9f42ae95aff..a6c89434ce4a 100644 --- a/test/functional/apps/settings/_index_pattern_results_sort.js +++ b/test/functional/apps/settings/_index_pattern_results_sort.js @@ -38,7 +38,7 @@ define(function (require) { columns.forEach(function (col) { bdd.describe('sort by heading - ' + col.heading, function indexPatternCreation() { bdd.before(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); bdd.beforeEach(function () { @@ -46,7 +46,7 @@ define(function (require) { }); bdd.afterEach(function () { - return settingsPage.removeIndexPattern(); + return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink); }); bdd.it('should sort ascending', function pageHeader() { @@ -84,6 +84,7 @@ define(function (require) { bdd.before(function () { return settingsPage.navigateTo() + .then(settingsPage.clickExistingIndicesAddDataLink) .then(function () { return settingsPage.createIndexPattern(); }); diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/settings/_initial_state.js index cd6a3bca7086..1b484b5cb664 100644 --- a/test/functional/apps/settings/_initial_state.js +++ b/test/functional/apps/settings/_initial_state.js @@ -14,7 +14,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }); }); diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 8251cec57d8c..1abb4f7062f7 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -31,7 +31,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js index ee0243159e74..74b7853a84f1 100644 --- a/test/functional/apps/visualize/_chart_types.js +++ b/test/functional/apps/visualize/_chart_types.js @@ -18,7 +18,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js index 72a23b032246..7592e228f489 100644 --- a/test/functional/apps/visualize/_data_table.js +++ b/test/functional/apps/visualize/_data_table.js @@ -31,7 +31,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js index a6c817d20e8c..48e692b6a70c 100644 --- a/test/functional/apps/visualize/_line_chart.js +++ b/test/functional/apps/visualize/_line_chart.js @@ -28,7 +28,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js index fa04e6c9c015..720be22184a4 100644 --- a/test/functional/apps/visualize/_metric_chart.js +++ b/test/functional/apps/visualize/_metric_chart.js @@ -34,7 +34,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js index 6ff909606947..50f7f2b10091 100644 --- a/test/functional/apps/visualize/_pie_chart.js +++ b/test/functional/apps/visualize/_pie_chart.js @@ -28,7 +28,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js index 75044876c2ac..0f2affc7898b 100644 --- a/test/functional/apps/visualize/_tile_map.js +++ b/test/functional/apps/visualize/_tile_map.js @@ -30,7 +30,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js index 88ee497427da..f3c18a20eca9 100644 --- a/test/functional/apps/visualize/_vertical_bar_chart.js +++ b/test/functional/apps/visualize/_vertical_bar_chart.js @@ -30,7 +30,7 @@ define(function (require) { return scenarioManager.reload('emptyKibana') .then(function () { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js index 8e1fa69aa499..2f2ef521fac9 100644 --- a/test/support/pages/settings_page.js +++ b/test/support/pages/settings_page.js @@ -20,6 +20,10 @@ define(function (require) { return common.findTestSubject('settingsNav advanced').click(); }, + clickExistingIndicesAddDataLink: function () { + return common.findTestSubject('addData existingIndices').click(); + }, + setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) { var self = this; return common.findTestSubject('advancedSetting&' + propertyName + ' editButton') @@ -310,12 +314,12 @@ define(function (require) { }) .then(function () { return common.tryForTime(defaultTimeout, function () { - return self.remote.getCurrentUrl() - .then(function (currentUrl) { - if (!currentUrl.match(/indices\/.+\?/)) { + return common.findTestSubject('editIndexPattern') + .then(function (editPatternContainer) { + if (!editPatternContainer) { throw new Error('Index pattern not created'); } else { - common.debug('Index pattern created: ' + currentUrl); + common.debug('Index pattern created'); } }); }); From 35bd6f45b07322a0c2241ca701a55058ea35941c Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 14:53:33 -0500 Subject: [PATCH 23/60] Use AppState to keep track of current step in the filebeat wizard --- .../sections/indices/filebeat/index.html | 10 ++++----- .../sections/indices/filebeat/index.js | 21 +++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index 6a44020dd445..4904df7595a2 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -8,21 +8,21 @@
- + 1. Paste - + 2. Parse - + 3. Review - + 4. Install Filebeat
-
+
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index 9655b51760b4..da021e67fc3d 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -13,22 +13,25 @@ routes.when('/settings/indices/filebeat', { // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') - .controller('kbnSettingsIndicesFilebeat', function ($scope) { + .controller('kbnSettingsIndicesFilebeat', function ($scope, AppState) { + var $state = $scope.state = new AppState(); var totalSteps = 4; - $scope.currentStep = 0; $scope.stepResults = {}; + $scope.setCurrentStep = function (step) { + $state.currentStep = step; + $state.save(); + }; + $scope.setCurrentStep(0); + $scope.nextStep = function () { - if ($scope.currentStep + 1 < totalSteps) { - ++$scope.currentStep; + if ($state.currentStep + 1 < totalSteps) { + $scope.setCurrentStep($state.currentStep + 1); } }; $scope.prevStep = function () { - if ($scope.currentStep > 0) { - --$scope.currentStep; + if ($state.currentStep > 0) { + $scope.setCurrentStep($state.currentStep - 1); } }; - $scope.setCurrentStep = function (step) { - $scope.currentStep = step; - }; }); From 20b1e6e24a922e7b187db5bcc3125b6492d7b63e Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 16:53:50 -0500 Subject: [PATCH 24/60] Delete changes to current step when navigating backwards, warning the user first --- .../sections/indices/filebeat/index.html | 10 +-- .../sections/indices/filebeat/index.js | 62 +++++++++++++------ 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index 4904df7595a2..6a44020dd445 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -8,21 +8,21 @@
- + 1. Paste - + 2. Parse - + 3. Review - + 4. Install Filebeat
-
+
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index da021e67fc3d..cc34ff5b6021 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -13,25 +13,49 @@ routes.when('/settings/indices/filebeat', { // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') - .controller('kbnSettingsIndicesFilebeat', function ($scope, AppState) { - var $state = $scope.state = new AppState(); - var totalSteps = 4; - $scope.stepResults = {}; +.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm) { + var $state = $scope.state = new AppState(); + var totalSteps = 4; + $scope.stepResults = {}; - $scope.setCurrentStep = function (step) { - $state.currentStep = step; - $state.save(); - }; - $scope.setCurrentStep(0); + $scope.setCurrentStep = function (step) { + $state.currentStep = step; + $state.save(); + }; + $scope.setCurrentStep(0); - $scope.nextStep = function () { - if ($state.currentStep + 1 < totalSteps) { - $scope.setCurrentStep($state.currentStep + 1); - } - }; - $scope.prevStep = function () { - if ($state.currentStep > 0) { - $scope.setCurrentStep($state.currentStep - 1); - } - }; + $scope.nextStep = function () { + if ($state.currentStep + 1 < totalSteps) { + $scope.setCurrentStep($state.currentStep + 1); + } + }; + $scope.prevStep = function () { + if ($state.currentStep > 0) { + $scope.setCurrentStep($state.currentStep - 1); + } + }; + + $scope.$watch('state.currentStep', function (newValue, oldValue) { + if (newValue < oldValue) { + return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?') + .then( + function () { + if ($state.currentStep < 1) { + delete $scope.stepResults.pipeline; + } + if ($state.currentStep < 2) { + delete $scope.stepResults.indexPattern; + } + $scope.currentStep = newValue; + }, + function () { + $state.currentStep = oldValue; + $state.save(); + } + ); + } + else { + $scope.currentStep = newValue; + } }); +}); From 38a5ef094d8e844565dce6202bb70568453149f9 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 17:20:21 -0500 Subject: [PATCH 25/60] Make the step headings clickable --- .../sections/indices/filebeat/index.html | 16 ++++++++++++---- .../kibana/public/settings/styles/main.less | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index 6a44020dd445..3a0228d34d00 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -8,16 +8,24 @@
- + 1. Paste - + 2. Parse - + 3. Review - + 4. Install Filebeat
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less index c9bf7066da97..d2deb37b1b50 100644 --- a/src/plugins/kibana/public/settings/styles/main.less +++ b/src/plugins/kibana/public/settings/styles/main.less @@ -195,7 +195,12 @@ kbn-settings-indices { padding-right: 1.5em; &.active { + cursor: default; font-weight: bold; } + &.aheadActive { + cursor: default; + font-weight: 300; + } } } From 97cb64c2acd3165d1a6f208edc1050aafe6851cc Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 18:56:27 -0500 Subject: [PATCH 26/60] updated new functional test to work with new page layout --- test/functional/apps/discover/_field_data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js index e50f65678ca2..4b3d4dbbb936 100644 --- a/test/functional/apps/discover/_field_data.js +++ b/test/functional/apps/discover/_field_data.js @@ -28,7 +28,7 @@ define(function (require) { }) .then(function (navigateTo) { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); From 47609ea350bbd4fc200729b8c15fcfb1369789ad Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 19:02:58 -0500 Subject: [PATCH 27/60] remove jsdata files --- package.json | 2 -- src/optimize/BaseOptimizer.js | 2 -- src/ui/public/store/store.js | 6 ------ 3 files changed, 10 deletions(-) delete mode 100644 src/ui/public/store/store.js diff --git a/package.json b/package.json index 9d20557bd3ec..067eaea06baa 100644 --- a/package.json +++ b/package.json @@ -110,8 +110,6 @@ "jade-loader": "0.7.1", "joi": "6.6.1", "jquery": "2.1.4", - "js-data": "2.8.2", - "js-data-angular": "3.1.0", "js-yaml": "3.4.1", "json-loader": "0.5.3", "json-stringify-safe": "5.0.1", diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js index b6fbb05a55b6..9ca708ab04fd 100644 --- a/src/optimize/BaseOptimizer.js +++ b/src/optimize/BaseOptimizer.js @@ -79,8 +79,6 @@ class BaseOptimizer { devtoolModuleFilenameTemplate: '[absolute-resource-path]' }, - externals: ['axios'], - recordsPath: resolve(this.env.workingDir, 'webpack.records'), plugins: [ diff --git a/src/ui/public/store/store.js b/src/ui/public/store/store.js deleted file mode 100644 index 91ed994522e4..000000000000 --- a/src/ui/public/store/store.js +++ /dev/null @@ -1,6 +0,0 @@ -import modules from 'ui/modules'; -const module = modules.get('kibana', [require('js-data-angular')]); - -export default function storeProvider(DS) { - return DS; -} From f93707b573cc0ff918d534b5f458d59cf2daab39 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 22 Jan 2016 19:18:02 -0500 Subject: [PATCH 28/60] update the filebeat wizard url to match the existing index pattern creation page --- .../kibana/public/settings/sections/indices/filebeat/index.js | 2 +- src/plugins/kibana/public/settings/sections/indices/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index cc34ff5b6021..cf2e330de379 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -7,7 +7,7 @@ require('plugins/kibana/settings/sections/indices/directives/paste_samples_step' require('plugins/kibana/settings/sections/indices/directives/pipeline_step'); require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step'); -routes.when('/settings/indices/filebeat', { +routes.when('/settings/indices/create/filebeat', { template: template }); diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html index baa77d6659a5..6623afb3a011 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/index.html @@ -15,7 +15,7 @@

- Tail a File + Tail a File

Pick this option if you have log data you'd like to send to Elasticsearch. From 132bc9cc9702dbea133908682aef64658c979dcc Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Mon, 25 Jan 2016 13:31:11 -0500 Subject: [PATCH 29/60] Change url of index pattern edit screen to avoid conflicts with the urls for the new ingest wizards --- .../kibana/public/settings/sections/indices/_create.js | 2 +- .../kibana/public/settings/sections/indices/_edit.js | 2 +- .../public/settings/sections/indices/_field_editor.js | 6 +++--- .../public/settings/sections/indices/_scripted_fields.js | 2 +- .../sections/indices/directives/kbn_settings_indices.js | 2 +- src/ui/public/index_patterns/_field.js | 2 +- src/ui/public/index_patterns/_index_pattern.js | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index a9b35867d3ca..0b2f060b625f 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -70,7 +70,7 @@ define(function (require) { config.set('defaultIndex', indexPattern.id); } indexPatterns.cache.clear(indexPattern.id); - kbnUrl.change('/settings/indices/' + indexPattern.id); + kbnUrl.change('/settings/indices/edit/' + indexPattern.id); }); } }); diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.js b/src/plugins/kibana/public/settings/sections/indices/_edit.js index abd5ee43ea8a..5ab19d2186bd 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_edit.js +++ b/src/plugins/kibana/public/settings/sections/indices/_edit.js @@ -5,7 +5,7 @@ define(function (require) { require('plugins/kibana/settings/sections/indices/_index_header'); require('ui/routes') - .when('/settings/indices/:indexPatternId', { + .when('/settings/indices/edit/:indexPatternId', { template: require('plugins/kibana/settings/sections/indices/_edit.html'), resolve: { indexPattern: function ($route, courier) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js index a93db7f71654..df4831e0a6ce 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js +++ b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js @@ -3,9 +3,9 @@ define(function (require) { require('plugins/kibana/settings/sections/indices/_index_header'); require('ui/routes') - .when('/settings/indices/:indexPatternId/field/:fieldName', { mode: 'edit' }) - .when('/settings/indices/:indexPatternId/create-field/', { mode: 'create' }) - .defaults(/settings\/indices\/[^\/]+\/(field|create-field)(\/|$)/, { + .when('/settings/indices/edit/:indexPatternId/field/:fieldName', { mode: 'edit' }) + .when('/settings/indices/edit/:indexPatternId/create-field/', { mode: 'create' }) + .defaults(/settings\/indices\/edit\/[^\/]+\/(field|create-field)(\/|$)/, { template: require('plugins/kibana/settings/sections/indices/_field_editor.html'), resolve: { indexPattern: function ($route, courier) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js index 5c75e66c12d5..7724d0af6a26 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js +++ b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js @@ -18,7 +18,7 @@ define(function (require) { link: function ($scope) { var dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts'); - var fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField'; + var fieldCreatorPath = '/settings/indices/edit/{{ indexPattern }}/scriptedField'; var fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}'; $scope.perPage = 25; diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js index 6035eb85f003..cf1732177add 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js @@ -14,7 +14,7 @@ require('ui/modules').get('apps/settings') $scope.indexPatternList = ids.map(function (id) { return { id: id, - url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}), + url: kbnUrl.eval('#/settings/indices/edit/{{id}}', {id: id}), class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''), default: $scope.defaultIndex === id }; diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js index caabb8a1d08c..0ff09177467b 100644 --- a/src/ui/public/index_patterns/_field.js +++ b/src/ui/public/index_patterns/_field.js @@ -69,7 +69,7 @@ define(function (require) { } Field.prototype.routes = { - edit: '/settings/indices/{{indexPattern.id}}/field/{{name}}' + edit: '/settings/indices/edit/{{indexPattern.id}}/field/{{name}}' }; return Field; diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js index d99f67ff607b..833a436d2c8b 100644 --- a/src/ui/public/index_patterns/_index_pattern.js +++ b/src/ui/public/index_patterns/_index_pattern.js @@ -314,10 +314,10 @@ define(function (require) { } IndexPattern.prototype.routes = { - edit: '/settings/indices/{{id}}', - addField: '/settings/indices/{{id}}/create-field', - indexedFields: '/settings/indices/{{id}}?_a=(tab:indexedFields)', - scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)' + edit: '/settings/indices/edit/{{id}}', + addField: '/settings/indices/edit/{{id}}/create-field', + indexedFields: '/settings/indices/edit/{{id}}?_a=(tab:indexedFields)', + scriptedFields: '/settings/indices/edit/{{id}}?_a=(tab:scriptedFields)' }; return IndexPattern; From af9c3dd8ce5111e4e9f382fd3fec3d00b2b8ee05 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Mon, 25 Jan 2016 13:41:49 -0500 Subject: [PATCH 30/60] show the Add New index pattern link on ingest wizard pages so there's a way to get back to the landing page --- .../sections/indices/directives/kbn_settings_indices.html | 2 +- .../sections/indices/directives/kbn_settings_indices.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html index 95039645907b..3e5329af54c7 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.html @@ -4,7 +4,7 @@
Index Patterns  diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js index cf1732177add..401850d5d6a9 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js @@ -6,6 +6,7 @@ require('ui/modules').get('apps/settings') transclude: true, template: require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices.html'), link: function ($scope) { + $scope.showAddNew = !/^\/settings\/indices$/.test($route.current.$$route.originalPath); $scope.edittingId = $route.current.params.indexPatternId; config.$bind($scope, 'defaultIndex'); From d262deaba267ad4e45019b99ff34e11871f7b8e7 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Mon, 25 Jan 2016 17:09:15 -0500 Subject: [PATCH 31/60] use data-test-subj click create button in a less fragile manner --- .../kibana/public/settings/sections/indices/_create.html | 1 + test/support/pages/settings_page.js | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.html b/src/plugins/kibana/public/settings/sections/indices/_create.html index 4bf6c76fec6c..7cf592c69441 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.html +++ b/src/plugins/kibana/public/settings/sections/indices/_create.html @@ -167,6 +167,7 @@
+
+ +
diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js index 92050be87225..99d947c3c94c 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js @@ -7,6 +7,12 @@ modules.get('apps/settings') template: template, scope: { samples: '=' + }, + controller: function ($scope) { + $scope.userSamples = ''; + $scope.$watch('userSamples', function (newValue) { + $scope.samples = newValue.split('\n'); + }); } }; }); diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less index d2deb37b1b50..8918afd3c0c3 100644 --- a/src/plugins/kibana/public/settings/styles/main.less +++ b/src/plugins/kibana/public/settings/styles/main.less @@ -204,3 +204,14 @@ kbn-settings-indices { } } } + +.wizard-step-title { + padding-bottom: 1em; +} + +.paste-samples { + textarea { + width:700px; + height: 250px; + } +} From 8e8e80001182d8150d959b9d92c94f4de9bd2bb7 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Mon, 25 Jan 2016 20:01:13 -0500 Subject: [PATCH 36/60] attempt to parse the logs as json, falling back on treating them as strings if it fails --- .../indices/directives/paste_samples_step.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js index 99d947c3c94c..c967a0ff3c46 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js @@ -1,5 +1,7 @@ -var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/directives/paste_samples_step.html'); +const modules = require('ui/modules'); +const template = require('plugins/kibana/settings/sections/indices/directives/paste_samples_step.html'); +const _ = require('lodash'); + modules.get('apps/settings') .directive('pasteSamplesStep', function () { @@ -11,7 +13,18 @@ modules.get('apps/settings') controller: function ($scope) { $scope.userSamples = ''; $scope.$watch('userSamples', function (newValue) { - $scope.samples = newValue.split('\n'); + const splitUserSamples = newValue.split('\n'); + + try { + $scope.samples = _.map(splitUserSamples, function (sample) { + return JSON.parse(sample); + }); + } + catch (error) { + $scope.samples = _.map(splitUserSamples, function (sample) { + return {message: sample}; + }); + } }); } }; From 5321f5515daace72fe11a9aa7b3e8583aaaca077 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Mon, 25 Jan 2016 20:18:17 -0500 Subject: [PATCH 37/60] Adding some additional instructions for filebeat --- .../sections/indices/directives/paste_samples_step.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html index 33ecc8127b0a..86b63c6dd8be 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html @@ -1,9 +1,13 @@

Provide some sample logs

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 interactively build an ingest pipeline and configure a Kibana index pattern. + 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 + Filebeat's metadata, + you'll want to paste the JSON as it will come out of Filebeat.
+ From 78d004be2a7e5fe1e6cb3e38374a7267f4a7ff58 Mon Sep 17 00:00:00 2001 From: michaelcheng429 Date: Tue, 26 Jan 2016 14:49:45 -0600 Subject: [PATCH 38/60] minor copy improvements (typos) --- .../components/field_chooser/discover_field.js | 4 ++-- .../settings/sections/advanced/advanced_row.html | 12 ++++++------ .../settings/sections/advanced/advanced_row.js | 8 ++++---- .../public/settings/sections/indices/index.html | 2 +- .../kibana/public/settings/sections/indices/index.js | 4 ++-- src/ui/public/state_management/state.js | 6 +++--- src/ui/public/time_buckets/time_buckets.js | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js index 1f9bf7b62235..2411e915e149 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -60,11 +60,11 @@ define(function (require) { }; $scope.toggleDisplay = function (field) { - // inheritted param to fieldChooser + // This is inherited from fieldChooser $scope.toggle(field.name); if (field.display) $scope.increaseFieldCounter(field); - // we are now displaying the field, kill it's details + // we are now displaying the field, kill its details if (field.details) { $scope.toggleDetails(field); } diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html index 1bd6edaac644..4b57f3304114 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html +++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html @@ -16,7 +16,7 @@
@@ -65,7 +65,7 @@
- + {{conf.value || conf.defVal}} {{(conf.value || conf.defVal).join(', ')}} {{conf.value === undefined ? conf.defVal : conf.value}} @@ -74,7 +74,7 @@ +
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index cf2e330de379..c23baf362161 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -13,7 +13,7 @@ routes.when('/settings/indices/create/filebeat', { // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') -.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm) { +.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm, kbnUrl) { var $state = $scope.state = new AppState(); var totalSteps = 4; $scope.stepResults = {}; @@ -28,6 +28,9 @@ modules.get('apps/settings') if ($state.currentStep + 1 < totalSteps) { $scope.setCurrentStep($state.currentStep + 1); } + else if ($state.currentStep + 1 === totalSteps) { + kbnUrl.change('/discover'); + } }; $scope.prevStep = function () { if ($state.currentStep > 0) { From 2e112f59df49c64fbeffbbf8c2bea0b7061c3290 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 12:28:40 -0500 Subject: [PATCH 42/60] Convert filebeat wizard into a directive --- .../filebeat/directives/filebeat_wizard.html | 70 +++++++++++++++++++ .../filebeat/directives/filebeat_wizard.js | 65 +++++++++++++++++ .../sections/indices/filebeat/index.html | 70 +------------------ .../sections/indices/filebeat/index.js | 55 +-------------- 4 files changed, 137 insertions(+), 123 deletions(-) create mode 100644 src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html create mode 100644 src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html new file mode 100644 index 000000000000..51a0c59b9bc2 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html @@ -0,0 +1,70 @@ +
+
+

Tail a File

+ Let's send some log data to Elasticsearch. +
+
+ +
+
+ + 1. Paste + + + 2. Parse + + + 3. Review + + + 4. Install Filebeat + +
+ +
+
+ +
+ +
+
+ +
+ + + +
+ + +
+
+ +
+ + + +
+ + +
+
+ +
+ +
+
+
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js new file mode 100644 index 000000000000..5e863fc8fb07 --- /dev/null +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -0,0 +1,65 @@ +var modules = require('ui/modules'); +var template = require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard.html'); + +require('plugins/kibana/settings/sections/indices/directives/pattern_review_step'); +require('plugins/kibana/settings/sections/indices/directives/paste_samples_step'); +require('plugins/kibana/settings/sections/indices/directives/pipeline_step'); +require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step'); + +// wrapper directive, which sets up the breadcrumb for all filebeat steps +modules.get('apps/settings') +.directive('filebeatWizard', function () { + return { + restrict: 'E', + template: template, + scope: {}, + bindToController: true, + controllerAs: 'wizard', + controller: function ($scope, AppState, safeConfirm) { + var $state = this.state = new AppState(); + var totalSteps = 4; + this.stepResults = {}; + + this.setCurrentStep = (step) => { + $state.currentStep = step; + $state.save(); + }; + this.setCurrentStep(0); + + this.nextStep = () => { + if ($state.currentStep + 1 < totalSteps) { + this.setCurrentStep($state.currentStep + 1); + } + }; + this.prevStep = () => { + if ($state.currentStep > 0) { + this.setCurrentStep($state.currentStep - 1); + } + }; + + $scope.$watch('wizard.state.currentStep', (newValue, oldValue) => { + if (newValue < oldValue) { + return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?') + .then( + () => { + if ($state.currentStep < 1) { + delete this.stepResults.pipeline; + } + if ($state.currentStep < 2) { + delete this.stepResults.indexPattern; + } + this.currentStep = newValue; + }, + () => { + $state.currentStep = oldValue; + $state.save(); + } + ); + } + else { + this.currentStep = newValue; + } + }); + } + }; +}); diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html index 4ee0a4790fdd..714999f29e36 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html @@ -1,73 +1,5 @@ -
-
-

Tail a File

- Let's send some log data to Elasticsearch. -
-
-
-
- - 1. Paste - - - 2. Parse - - - 3. Review - - - 4. Install Filebeat - -
- -
-
- -
- -
-
- -
- - - -
- - -
-
- -
- - - -
- - -
-
- -
- -
-
-
+ diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js index cf2e330de379..bc3859e9b1c3 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js @@ -1,61 +1,8 @@ var routes = require('ui/routes'); -var modules = require('ui/modules'); var template = require('plugins/kibana/settings/sections/indices/filebeat/index.html'); -require('plugins/kibana/settings/sections/indices/directives/pattern_review_step'); -require('plugins/kibana/settings/sections/indices/directives/paste_samples_step'); -require('plugins/kibana/settings/sections/indices/directives/pipeline_step'); -require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step'); +require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard'); routes.when('/settings/indices/create/filebeat', { template: template }); - -// wrapper directive, which sets up the breadcrumb for all filebeat steps -modules.get('apps/settings') -.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm) { - var $state = $scope.state = new AppState(); - var totalSteps = 4; - $scope.stepResults = {}; - - $scope.setCurrentStep = function (step) { - $state.currentStep = step; - $state.save(); - }; - $scope.setCurrentStep(0); - - $scope.nextStep = function () { - if ($state.currentStep + 1 < totalSteps) { - $scope.setCurrentStep($state.currentStep + 1); - } - }; - $scope.prevStep = function () { - if ($state.currentStep > 0) { - $scope.setCurrentStep($state.currentStep - 1); - } - }; - - $scope.$watch('state.currentStep', function (newValue, oldValue) { - if (newValue < oldValue) { - return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?') - .then( - function () { - if ($state.currentStep < 1) { - delete $scope.stepResults.pipeline; - } - if ($state.currentStep < 2) { - delete $scope.stepResults.indexPattern; - } - $scope.currentStep = newValue; - }, - function () { - $state.currentStep = oldValue; - $state.save(); - } - ); - } - else { - $scope.currentStep = newValue; - } - }); -}); From e84b0285c4d52306d75e0a95bce8427eb20431e4 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 12:58:18 -0500 Subject: [PATCH 43/60] don't allow users to navigate back through the wizard after clicking save --- .../filebeat/directives/filebeat_wizard.html | 2 +- .../indices/filebeat/directives/filebeat_wizard.js | 14 ++++++++++++-- .../kibana/public/settings/styles/main.less | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html index 51a0c59b9bc2..5b8588947c1c 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html @@ -6,7 +6,7 @@
-
+
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js index 5e863fc8fb07..98b95ccf5c01 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -21,8 +21,10 @@ modules.get('apps/settings') this.stepResults = {}; this.setCurrentStep = (step) => { - $state.currentStep = step; - $state.save(); + if (!this.complete) { + $state.currentStep = step; + $state.save(); + } }; this.setCurrentStep(0); @@ -38,6 +40,14 @@ modules.get('apps/settings') }; $scope.$watch('wizard.state.currentStep', (newValue, oldValue) => { + if (this.complete) { + $state.currentStep = totalSteps - 1; + $state.save(); + return; + } + if (newValue + 1 === totalSteps) { + this.complete = true; + } if (newValue < oldValue) { return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?') .then( diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less index d2deb37b1b50..e9f815085608 100644 --- a/src/plugins/kibana/public/settings/styles/main.less +++ b/src/plugins/kibana/public/settings/styles/main.less @@ -203,4 +203,11 @@ kbn-settings-indices { font-weight: 300; } } + + &.complete { + .wizard-step-heading:not(.active) { + color: #dddddd; + cursor: default; + } + } } From 911cc51f6e0ac3a36abb3b914752f6f283b6b0b9 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 13:02:18 -0500 Subject: [PATCH 44/60] better wording for tail a file description --- src/plugins/kibana/public/settings/sections/indices/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html index 6623afb3a011..245753e76218 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.html +++ b/src/plugins/kibana/public/settings/sections/indices/index.html @@ -18,7 +18,7 @@ Tail a File
- Pick this option if you have log data you'd like to send to Elasticsearch. + Pick this option if you have log file data you'd like to send to Elasticsearch.
From bab406b90570fc1624ba7e7493dad869b3fe0a1e Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 13:50:33 -0500 Subject: [PATCH 45/60] Fix spelling to stay consistent with merged fixes --- .../sections/indices/directives/kbn_settings_indices.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js index 401850d5d6a9..6a590bc29d8a 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js +++ b/src/plugins/kibana/public/settings/sections/indices/directives/kbn_settings_indices.js @@ -7,7 +7,7 @@ require('ui/modules').get('apps/settings') template: require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices.html'), link: function ($scope) { $scope.showAddNew = !/^\/settings\/indices$/.test($route.current.$$route.originalPath); - $scope.edittingId = $route.current.params.indexPatternId; + $scope.editingId = $route.current.params.indexPatternId; config.$bind($scope, 'defaultIndex'); $scope.$watch('defaultIndex', function () { @@ -16,7 +16,7 @@ require('ui/modules').get('apps/settings') return { id: id, url: kbnUrl.eval('#/settings/indices/edit/{{id}}', {id: id}), - class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''), + class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''), default: $scope.defaultIndex === id }; }); From 97483283097449ae270b36fe80c505317a33b929 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 15:08:46 -0500 Subject: [PATCH 46/60] update new tests to work with add data landing page --- test/functional/apps/discover/_collapse_expand.js | 2 +- test/functional/apps/discover/_shared_links.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js index 5e271d29724b..ec16a5b2d484 100644 --- a/test/functional/apps/discover/_collapse_expand.js +++ b/test/functional/apps/discover/_collapse_expand.js @@ -32,7 +32,7 @@ define(function (require) { }) .then(function (navigateTo) { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js index f590cc2dd44c..366b35fc4e67 100644 --- a/test/functional/apps/discover/_shared_links.js +++ b/test/functional/apps/discover/_shared_links.js @@ -37,7 +37,7 @@ define(function (require) { }) .then(function (navigateTo) { common.debug('navigateTo'); - return settingsPage.navigateTo(); + return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink); }) .then(function () { common.debug('createIndexPattern'); From e90b1b71177d0383f842fe2dc1bcbd307fc12f44 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 15:45:02 -0500 Subject: [PATCH 47/60] change directory structure so add data steps can be composed of more than a single directive --- .../install_filebeat_step.html | 0 .../install_filebeat_step.js | 2 +- .../paste_samples_step.html | 0 .../{directives => add_data_steps}/paste_samples_step.js | 2 +- .../pattern_review_step.html | 0 .../{directives => add_data_steps}/pattern_review_step.js | 2 +- .../{directives => add_data_steps}/pipeline_step.html | 0 .../{directives => add_data_steps}/pipeline_step.js | 2 +- .../indices/filebeat/directives/filebeat_wizard.js | 8 ++++---- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/install_filebeat_step.html (100%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/install_filebeat_step.js (88%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/paste_samples_step.html (100%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/paste_samples_step.js (86%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/pattern_review_step.html (100%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/pattern_review_step.js (88%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/pipeline_step.html (100%) rename src/plugins/kibana/public/settings/sections/indices/{directives => add_data_steps}/pipeline_step.js (89%) diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.html diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js similarity index 88% rename from src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js index be0ea96b2386..6432d0a74c1d 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step.html'); +var template = require('plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step.html'); modules.get('apps/settings') .directive('installFilebeatStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js similarity index 86% rename from src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js index 92050be87225..8b072c213d10 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/directives/paste_samples_step.html'); +var template = require('plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step.html'); modules.get('apps/settings') .directive('pasteSamplesStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js similarity index 88% rename from src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js index f5ac34e8c944..240e97a036a5 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/directives/pattern_review_step.html'); +var template = require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html'); modules.get('apps/settings') .directive('patternReviewStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_step.html similarity index 100% rename from src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_step.html diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_step.js similarity index 89% rename from src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js rename to src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_step.js index 54d5c26cc1c7..fc946f14f40a 100644 --- a/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_step.js @@ -1,5 +1,5 @@ var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/directives/pipeline_step.html'); +var template = require('plugins/kibana/settings/sections/indices/add_data_steps/pipeline_step.html'); modules.get('apps/settings') .directive('pipelineStep', function () { diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js index 98b95ccf5c01..38d4c2a2cd1b 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -1,10 +1,10 @@ var modules = require('ui/modules'); var template = require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard.html'); -require('plugins/kibana/settings/sections/indices/directives/pattern_review_step'); -require('plugins/kibana/settings/sections/indices/directives/paste_samples_step'); -require('plugins/kibana/settings/sections/indices/directives/pipeline_step'); -require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step'); +require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step'); +require('plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step'); +require('plugins/kibana/settings/sections/indices/add_data_steps/pipeline_step'); +require('plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step'); // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') From f5312063219e3fb55581fbf3ee452c79071dbec8 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 16:26:45 -0500 Subject: [PATCH 48/60] Persist provided raw samples when the user navigates back to step 1 from a future step --- .../add_data_steps/paste_samples_step.html | 2 +- .../indices/add_data_steps/paste_samples_step.js | 16 ++++++++++------ .../filebeat/directives/filebeat_wizard.html | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html index 86b63c6dd8be..f0dd0e5216a8 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.html @@ -8,6 +8,6 @@
- +
diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js index 1f5d6460c197..b861f7e4c6d7 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js @@ -7,20 +7,24 @@ modules.get('apps/settings') return { template: template, scope: { - samples: '=' + samples: '=', + rawSamples: '=' }, controller: function ($scope) { - $scope.userSamples = ''; - $scope.$watch('userSamples', function (newValue) { - const splitUserSamples = newValue.split('\n'); + if (_.isUndefined($scope.rawSamples)) { + $scope.rawSamples = ''; + } + + $scope.$watch('rawSamples', function (newValue) { + const splitRawSamples = newValue.split('\n'); try { - $scope.samples = _.map(splitUserSamples, function (sample) { + $scope.samples = _.map(splitRawSamples, function (sample) { return JSON.parse(sample); }); } catch (error) { - $scope.samples = _.map(splitUserSamples, function (sample) { + $scope.samples = _.map(splitRawSamples, function (sample) { return {message: sample}; }); } diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html index 5b8588947c1c..094cbeecdfe6 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html @@ -31,7 +31,7 @@
- +
From 3d94e1ada2775fce7988b031d2d584991410e471 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 2 Feb 2016 17:17:08 -0500 Subject: [PATCH 49/60] Access scope context via controller instead of directly accessing --- .../add_data_steps/pattern_review_step.html | 14 +++--- .../add_data_steps/pattern_review_step.js | 44 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html index d98f2e43ba6e..8e89ecf89e4e 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html @@ -5,15 +5,15 @@
- + -
+
+ + +
From edd950a70687cfe781d089b6812d92eccc861d63 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Thu, 4 Feb 2016 12:58:11 -0500 Subject: [PATCH 58/60] use import instead of require --- .../sections/indices/add_data_steps/paste_samples_step.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js index f14543497997..1e78ea45559f 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/paste_samples_step.js @@ -1,6 +1,6 @@ -const modules = require('ui/modules'); -const template = require('plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step.html'); -const _ = require('lodash'); +import modules from 'ui/modules'; +import template from 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step.html'; +import _ from 'lodash'; modules.get('apps/settings') .directive('pasteSamplesStep', function () { From 7e910ba7bbbdc79b0bea991307d6d0e0b374933d Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Thu, 4 Feb 2016 15:51:37 -0500 Subject: [PATCH 59/60] use import instead of require --- .../sections/indices/add_data_steps/install_filebeat_step.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js index 6432d0a74c1d..5869d4b385a3 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js @@ -1,5 +1,5 @@ -var modules = require('ui/modules'); -var template = require('plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step.html'); +import modules from 'ui/modules'; +import template from 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step.html'; modules.get('apps/settings') .directive('installFilebeatStep', function () { From 3a7c2bfd88a70e525f83f10226b53136d7d78c43 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Thu, 4 Feb 2016 16:05:07 -0500 Subject: [PATCH 60/60] reapply changes that got lost in merge --- .../indices/filebeat/directives/filebeat_wizard.html | 5 +++++ .../sections/indices/filebeat/directives/filebeat_wizard.js | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html index 7fc03086509c..0a9983258197 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html @@ -68,6 +68,11 @@
+ +
+ Click Done to go explore your data + +
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js index 38d4c2a2cd1b..2c5cc55a6133 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -15,7 +15,7 @@ modules.get('apps/settings') scope: {}, bindToController: true, controllerAs: 'wizard', - controller: function ($scope, AppState, safeConfirm) { + controller: function ($scope, AppState, safeConfirm, kbnUrl) { var $state = this.state = new AppState(); var totalSteps = 4; this.stepResults = {}; @@ -32,6 +32,9 @@ modules.get('apps/settings') if ($state.currentStep + 1 < totalSteps) { this.setCurrentStep($state.currentStep + 1); } + else if ($state.currentStep + 1 === totalSteps) { + kbnUrl.change('/discover'); + } }; this.prevStep = () => { if ($state.currentStep > 0) {