github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:elasticsearch/kibana4

Browse source
This commit is contained in:
Rashid Khan 2014-06-17 14:20:19 -07:00
commit 65a5e23389
85 changed files with 257 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config.js
View file

@ -19,7 +19,7 @@ define(function () {
* kibana installed on. You probably want to set it to the FQDN of your
* elasticsearch host
*/
elasticsearch: 'http://' + window.location.hostname + ':9200',
// elasticsearch: 'http://' + location.hostname + ':9200',
/** @scratch /configuration/config.js/5
* ==== kibana-int

2
src/kibana/apps/dashboard/directives/grid.js
View file

@ -3,7 +3,7 @@ define(function (require) {
var $ = require('jquery');
require('gridster');
require('css!../../../../bower_components/gridster/dist/jquery.gridster.css');
require('css!bower_components/gridster/dist/jquery.gridster.css');
var app = require('modules').get('app/dashboard');

2
src/kibana/apps/dashboard/directives/panel.js
View file

@ -8,7 +8,7 @@ define(function (require) {
var notify = new Notifier();
return {
restrict: 'E',
template: require('text!../partials/panel.html'),
template: require('text!apps/dashboard/partials/panel.html'),
requires: '^dashboardGrid',
link: function ($scope, $el) {
// using $scope inheritance, panels are available in AppState

23
src/kibana/apps/dashboard/index.js
View file

@ -3,16 +3,15 @@ define(function (require) {
var $ = require('jquery');
var ConfigTemplate = require('utils/config_template');
require('css!./styles/main.css');
require('directives/config');
require('courier/courier');
require('config/config');
require('notify/notify');
require('components/courier/courier');
require('components/config/config');
require('components/notify/notify');
require('./directives/grid');
require('./directives/panel');
require('./services/saved_dashboards');
require('apps/dashboard/directives/grid');
require('apps/dashboard/directives/panel');
require('apps/dashboard/services/saved_dashboards');
require('css!apps/dashboard/styles/main.css');
var app = require('modules').get('app/dashboard', [
'elasticsearch',
@ -60,10 +59,10 @@ define(function (require) {
var $state = $scope.$state = new AppState(stateDefaults);
$scope.configTemplate = new ConfigTemplate({
save: require('text!./partials/save_dashboard.html'),
load: require('text!./partials/load_dashboard.html'),
share: require('text!./partials/share.html'),
pickVis: require('text!./partials/pick_visualization.html')
save: require('text!apps/dashboard/partials/save_dashboard.html'),
load: require('text!apps/dashboard/partials/load_dashboard.html'),
share: require('text!apps/dashboard/partials/share.html'),
pickVis: require('text!apps/dashboard/partials/pick_visualization.html')
});
$scope.openSave = _.partial($scope.configTemplate.toggle, 'save');

2
src/kibana/apps/dashboard/services/saved_dashboards.js
View file

@ -2,7 +2,7 @@ define(function (require) {
var module = require('modules').get('app/dashboard');
var _ = require('lodash');
// bring in the factory
require('./_saved_dashboard');
require('apps/dashboard/services/_saved_dashboard');
// Register this service with the saved object registry so it can be

18
src/kibana/apps/discover/controllers/discover.js
View file

@ -2,27 +2,27 @@ define(function (require) {
var _ = require('utils/mixins');
var angular = require('angular');
var moment = require('moment');
var settingsHtml = require('text!../partials/settings.html');
var saveHtml = require('text!../partials/save_search.html');
var loadHtml = require('text!../partials/load_search.html');
var settingsHtml = require('text!apps/discover/partials/settings.html');
var saveHtml = require('text!apps/discover/partials/save_search.html');
var loadHtml = require('text!apps/discover/partials/load_search.html');
var interval = require('utils/interval');
var datemath = require('utils/datemath');
require('notify/notify');
require('components/notify/notify');
require('components/timepicker/timepicker');
require('directives/fixed_scroll');
require('filters/moment');
require('courier/courier');
require('index_patterns/index_patterns');
require('state_management/app_state');
require('components/courier/courier');
require('components/index_patterns/index_patterns');
require('components/state_management/app_state');
require('services/timefilter');
require('./table');
require('apps/discover/directives/table');
require('apps/visualize/saved_visualizations/_adhoc_vis');
var app = require('modules').get('app/discover', [
var app = require('modules').get('apps/discover', [
'kibana/services',
'kibana/notify',
'kibana/courier',

21
src/kibana/apps/discover/controllers/table.js
View file

@ -2,33 +2,28 @@ define(function (require) {
var _ = require('utils/mixins');
var angular = require('angular');
var moment = require('moment');
var settingsHtml = require('text!../partials/settings.html');
var saveHtml = require('text!../partials/save_search.html');
var loadHtml = require('text!../partials/load_search.html');
var settingsHtml = require('text!apps/discover/partials/settings.html');
var saveHtml = require('text!apps/discover/partials/save_search.html');
var loadHtml = require('text!apps/discover/partials/load_search.html');
var interval = require('utils/interval');
var datemath = require('utils/datemath');
require('notify/notify');
require('components/notify/notify');
require('components/timepicker/timepicker');
require('directives/fixed_scroll');
require('filters/moment');
require('courier/courier');
require('index_patterns/index_patterns');
require('state_management/app_state');
require('components/courier/courier');
require('components/index_patterns/index_patterns');
require('components/state_management/app_state');
require('services/timefilter');
require('apps/visualize/saved_visualizations/_adhoc_vis');
var app = require('modules').get('app/discover', [
var app = require('modules').get('apps/discover', [
'kibana/services',
'kibana/notify',
'kibana/courier',
'kibana/index_patterns'
]);
app.controller('discoverTable', function ($scope, config, courier, $route, savedSearches, savedVisualizations,
Notifier, $location, globalState, AppState, timefilter, AdhocVis, Promise) {
});
});

6
src/kibana/apps/discover/directives/discover_field.js
View file

@ -1,8 +1,8 @@
define(function (require) {
var $ = require('jquery');
var app = require('modules').get('app/discover');
var html = require('text!../partials/discover_field.html');
var detailsHtml = require('text!../partials/discover_field_details.html');
var app = require('modules').get('apps/discover');
var html = require('text!apps/discover/partials/discover_field.html');
var detailsHtml = require('text!apps/discover/partials/discover_field_details.html');
var _ = require('lodash');
require('directives/css_truncate');

6
src/kibana/apps/discover/directives/field_chooser.js
View file

@ -1,6 +1,6 @@
define(function (require) {
var app = require('modules').get('app/discover');
var html = require('text!../partials/field_chooser.html');
var app = require('modules').get('apps/discover');
var html = require('text!apps/discover/partials/field_chooser.html');
var _ = require('lodash');
var jsonPath = require('jsonpath');
var rison = require('utils/rison');
@ -8,7 +8,7 @@ define(function (require) {
require('directives/css_truncate');
require('directives/field_name');
require('./discover_field');
require('apps/discover/directives/discover_field');

6
src/kibana/apps/discover/directives/table.js
View file

@ -1,7 +1,7 @@
define(function (require) {
var angular = require('angular');
var html = require('text!../partials/table.html');
var detailsHtml = require('text!../partials/row_details.html');
var html = require('text!apps/discover/partials/table.html');
var detailsHtml = require('text!apps/discover/partials/row_details.html');
var moment = require('moment');
var _ = require('lodash');
@ -14,7 +14,7 @@ define(function (require) {
var module = require('modules').get('kibana/directives');
module.directive('kbnTableHeader', function () {
var headerHtml = require('text!../partials/table_header.html');
var headerHtml = require('text!apps/discover/partials/table_header.html');
return {
restrict: 'A',
scope: {

2
src/kibana/apps/discover/directives/timechart.js
View file

@ -3,7 +3,7 @@ define(function (require) {
var $ = require('jquery');
var k4 = require('k4d3');
var app = require('modules').get('app/discover');
var app = require('modules').get('apps/discover');
app.directive('discoverTimechart', function ($compile) {
return {

2
src/kibana/apps/discover/index.html
View file

@ -31,7 +31,7 @@
state="state">
</disc-field-chooser>
</div>
<div class="col-md-10" ng-controller="discoverTable">
<div class="col-md-10">
<div class="discover-timechart" ng-if="vis">
<center class="small">

12
src/kibana/apps/discover/index.js
View file

@ -1,8 +1,8 @@
define(function (require, module, exports) {
require('./directives/table');
require('./saved_searches/saved_searches');
require('./directives/timechart');
require('./directives/field_chooser');
require('./controllers/discover');
require('css!./styles/main.css');
require('apps/discover/directives/table');
require('apps/discover/saved_searches/saved_searches');
require('apps/discover/directives/timechart');
require('apps/discover/directives/field_chooser');
require('apps/discover/controllers/discover');
require('css!apps/discover/styles/main.css');
});

2
src/kibana/apps/discover/saved_searches/_saved_search.js
View file

@ -2,7 +2,7 @@ define(function (require) {
var _ = require('lodash');
var inherits = require('utils/inherits');
require('notify/notify');
require('components/notify/notify');
var module = require('modules').get('discover/saved_searches', [
'kibana/notify',

4
src/kibana/apps/discover/saved_searches/saved_searches.js
View file

@ -1,8 +1,8 @@
define(function (require) {
var _ = require('lodash');
require('./_saved_search');
require('notify/notify');
require('apps/discover/saved_searches/_saved_search');
require('components/notify/notify');
var module = require('modules').get('discover/saved_searches', [
'kibana/notify'

8
src/kibana/apps/settings/index.js
View file

@ -1,7 +1,7 @@
define(function (require, module, exports) {
var _ = require('utils/mixins');
require('css!./styles/main.css');
require('css!apps/settings/styles/main.css');
require('filters/start_from');
require('routes')
@ -9,18 +9,18 @@ define(function (require, module, exports) {
redirectTo: '/settings/indices'
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.directive('kbnSettingsApp', function (Private, $route, timefilter) {
return {
restrict: 'E',
template: require('text!./app.html'),
template: require('text!apps/settings/app.html'),
transclude: true,
scope: {
sectionName: '@section'
},
link: function ($scope, $el) {
timefilter.enabled(false);
$scope.sections = require('./sections/index');
$scope.sections = require('apps/settings/sections/index');
$scope.section = _.find($scope.sections, { name: $scope.sectionName });
$scope.sections.forEach(function (section) {

6
src/kibana/apps/settings/sections/advanced/index.js
View file

@ -1,13 +1,13 @@
define(function (require) {
var _ = require('lodash');
var configDefaults = require('config/defaults');
var configDefaults = require('components/config/defaults');
require('routes')
.when('/settings/advanced', {
template: require('text!./index.html')
template: require('text!apps/settings/sections/advanced/index.html')
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.directive('kbnSettingsAdvanced', function (config, Notifier, Private) {
return {
restrict: 'E',

6
src/kibana/apps/settings/sections/index.js
View file

@ -2,8 +2,8 @@ define(function (require) {
// each of these private modules returns an object defining that section, their properties
// are used to create the nav bar
return [
require('./indices/index'),
require('./advanced/index'),
require('./objects/index')
require('apps/settings/sections/indices/index'),
require('apps/settings/sections/advanced/index'),
require('apps/settings/sections/objects/index')
];
});

6
src/kibana/apps/settings/sections/indices/_create.js
View file

@ -5,14 +5,14 @@ define(function (require) {
require('routes')
.when('/settings/indices/', {
template: require('text!./_create.html')
template: require('text!apps/settings/sections/indices/_create.html')
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.controller('settingsIndicesCreate', function ($scope, $location, Private, Notifier, indexPatterns, es, config) {
var notify = new Notifier();
var MissingIndices = errors.IndexPatternMissingIndices;
var refreshKibanaIndex = Private(require('./_refresh_kibana_index'));
var refreshKibanaIndex = Private(require('apps/settings/sections/indices/_refresh_kibana_index'));
var intervals = indexPatterns.intervals;
// this and child scopes will write pattern vars here

6
src/kibana/apps/settings/sections/indices/_edit.js
View file

@ -3,7 +3,7 @@ define(function (require) {
require('routes')
.when('/settings/indices/:id', {
template: require('text!./_edit.html'),
template: require('text!apps/settings/sections/indices/_edit.html'),
resolve: {
indexPattern: function ($route, courier) {
return courier.indexPatterns.get($route.current.params.id)
@ -12,10 +12,10 @@ define(function (require) {
}
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private) {
var notify = new Notifier();
var refreshKibanaIndex = Private(require('./_refresh_kibana_index'));
var refreshKibanaIndex = Private(require('apps/settings/sections/indices/_refresh_kibana_index'));
$scope.indexPattern = $route.current.locals.indexPattern;
var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);

8
src/kibana/apps/settings/sections/indices/index.js
View file

@ -1,8 +1,8 @@
define(function (require) {
var _ = require('lodash');
require('./_create');
require('./_edit');
require('apps/settings/sections/indices/_create');
require('apps/settings/sections/indices/_edit');
// add a dependency to all of the subsection routes
require('routes')
@ -13,12 +13,12 @@ define(function (require) {
});
// wrapper directive, which sets some global stuff up like the left nav
require('modules').get('app/settings')
require('modules').get('apps/settings')
.directive('kbnSettingsIndices', function ($route, config) {
return {
restrict: 'E',
transclude: true,
template: require('text!./index.html'),
template: require('text!apps/settings/sections/indices/index.html'),
link: function ($scope) {
$scope.edittingId = $route.current.params.id;
$scope.defaultIndex = config.get('defaultIndex');

7
src/kibana/apps/settings/sections/objects/_objects.js
View file

@ -1,13 +1,14 @@
define(function (require) {
var _ = require('lodash');
var registry = require('../../saved_object_registry');
var registry = require('apps/settings/saved_object_registry');
var objectIndexHTML = require('text!apps/settings/sections/objects/_objects.html');
require('routes')
.when('/settings/objects', {
template: require('text!./_objects.html')
template: objectIndexHTML
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.directive('kbnSettingsObjects', function (config, Notifier, Private) {
return {
restrict: 'E',

7
src/kibana/apps/settings/sections/objects/_view.js
View file

@ -2,14 +2,15 @@ define(function (require) {
var _ = require('lodash');
var inflection = require('inflection');
var rison = require('utils/rison');
var registry = require('../../saved_object_registry');
var registry = require('apps/settings/saved_object_registry');
var objectViewHTML = require('text!apps/settings/sections/objects/_view.html');
require('routes')
.when('/settings/objects/:service/:id', {
template: require('text!./_view.html')
template: objectViewHTML
});
require('modules').get('app/settings')
require('modules').get('apps/settings')
.directive('kbnSettingsObjectsView', function (config, Notifier) {
return {
restrict: 'E',

6
src/kibana/apps/settings/sections/objects/index.js
View file

@ -1,13 +1,13 @@
define(function (require) {
require('./_view');
require('./_objects');
require('apps/settings/sections/objects/_view');
require('apps/settings/sections/objects/_objects');
require('angular-ui-ace');
require('angular-elastic');
require('directives/confirm_click');
// add the module deps to this module
require('modules').get('app/settings', ['ui.ace', 'monospaced.elastic']);
require('modules').get('apps/settings', ['ui.ace', 'monospaced.elastic']);
return {
name: 'objects',

22
src/kibana/apps/visualize/controllers/editor.js
View file

@ -2,19 +2,19 @@ define(function (require) {
var _ = require('lodash');
var angular = require('angular');
var ConfigTemplate = require('utils/config_template');
var typeDefs = require('../saved_visualizations/_type_defs');
var typeDefs = require('apps/visualize/saved_visualizations/_type_defs');
var qs = require('utils/query_string');
require('../saved_visualizations/saved_visualizations');
require('notify/notify');
require('apps/visualize/saved_visualizations/saved_visualizations');
require('components/notify/notify');
require('filters/uriescape');
var app = require('modules').get('app/visualize', [
var app = require('modules').get('apps/visualize', [
'kibana/notify',
'kibana/courier'
]);
var visConfigCategories = require('../saved_visualizations/_config_categories');
var visConfigCategories = require('apps/visualize/saved_visualizations/_config_categories');
var createFn = function (savedVisualizations, courier, $route) {
if (!$route.current.params.indexPattern && !$route.current.params.savedSearchId) {
@ -38,13 +38,13 @@ define(function (require) {
require('routes')
.when('/visualize/create', {
template: require('text!../editor.html'),
template: require('text!apps/visualize/editor.html'),
resolve: {
vis: createFn
}
})
.when('/visualize/edit/:id', {
template: require('text!../editor.html'),
template: require('text!apps/visualize/editor.html'),
resolve: {
vis: editFn
}
@ -52,7 +52,7 @@ define(function (require) {
app.controller('VisualizeEditor', function ($scope, $route, $timeout, $window, Notifier, $location,
globalState, AppState, timefilter, Private) {
var aggs = Private(require('../saved_visualizations/_aggs'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
var notify = new Notifier({
location: 'Visualization Editor'
@ -198,9 +198,9 @@ define(function (require) {
// config panel templates
var configTemplate = $scope.configTemplate = new ConfigTemplate({
save: require('text!../partials/save.html'),
load: require('text!../partials/load.html'),
share: require('text!../partials/share.html'),
save: require('text!apps/visualize/partials/save.html'),
load: require('text!apps/visualize/partials/load.html'),
share: require('text!apps/visualize/partials/share.html'),
});
$scope.toggleShare = _.bindKey(configTemplate, 'toggle', 'share');

10
src/kibana/apps/visualize/controllers/wizard.js
View file

@ -1,12 +1,12 @@
define(function (require) {
var _ = require('lodash');
var typeDefs = require('../saved_visualizations/_type_defs');
var typeDefs = require('apps/visualize/saved_visualizations/_type_defs');
require('../saved_visualizations/saved_visualizations');
require('apps/visualize/saved_visualizations/saved_visualizations');
require('directives/saved_object_finder');
require('apps/discover/saved_searches/saved_searches');
var app = require('modules').get('app/visualize', [
var app = require('modules').get('apps/visualize', [
'kibana/courier'
]);
@ -20,7 +20,7 @@ define(function (require) {
/** Wizard Step 1
/********/
routes.when('/visualize/step/1', {
template: templateStep(1, require('text!../partials/wizard/step_1.html')),
template: templateStep(1, require('text!apps/visualize/partials/wizard/step_1.html')),
resolve: {
indexPatternIds: function (courier) {
return courier.indexPatterns.getIds()
@ -51,7 +51,7 @@ define(function (require) {
/** Wizard Step 2
/********/
routes.when('/visualize/step/2', {
template: templateStep(2, require('text!../partials/wizard/step_2.html'))
template: templateStep(2, require('text!apps/visualize/partials/wizard/step_2.html'))
});
app.controller('VisualizeWizardStep2', function ($scope, $route, $location, timefilter) {

2
src/kibana/apps/visualize/directives/canvas.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
var $ = require('jquery');
var _ = require('lodash');

6
src/kibana/apps/visualize/directives/config_category.js
View file

@ -1,10 +1,10 @@
define(function (require) {
var html = require('text!../partials/config_category.html');
var html = require('text!apps/visualize/partials/config_category.html');
require('./config_editor');
require('apps/visualize/directives/config_editor');
require('modules')
.get('app/visualize')
.get('apps/visualize')
.directive('visConfigCategory', function (Private) {
return {

28
src/kibana/apps/visualize/directives/config_editor.js
View file

@ -1,40 +1,40 @@
define(function (require) {
var app = require('modules').get('app/visualize');
var app = require('modules').get('apps/visualize');
var _ = require('lodash');
var $ = require('jquery');
require('filters/field_type');
var visConfigCategories = require('../saved_visualizations/_config_categories');
var visConfigCategories = require('apps/visualize/saved_visualizations/_config_categories');
var headerHtml = require('text!../partials/editor/header.html');
var headerHtml = require('text!apps/visualize/partials/editor/header.html');
var controlHtml = {
ranges: require('text!../partials/controls/ranges.html'),
orderAndSize: require('text!../partials/controls/order_and_size.html'),
minDocCount: require('text!../partials/controls/min_doc_count.html'),
extendedBounds: require('text!../partials/controls/extended_bounds.html'),
interval: require('text!../partials/controls/interval.html'),
globalLocal: require('text!../partials/controls/global_local.html')
ranges: require('text!apps/visualize/partials/controls/ranges.html'),
orderAndSize: require('text!apps/visualize/partials/controls/order_and_size.html'),
minDocCount: require('text!apps/visualize/partials/controls/min_doc_count.html'),
extendedBounds: require('text!apps/visualize/partials/controls/extended_bounds.html'),
interval: require('text!apps/visualize/partials/controls/interval.html'),
globalLocal: require('text!apps/visualize/partials/controls/global_local.html')
};
app.directive('visConfigEditor', function ($compile, Private) {
var aggs = Private(require('../saved_visualizations/_aggs'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
var categoryOptions = {
metric: {
template: require('text!../partials/editor/metric.html')
template: require('text!apps/visualize/partials/editor/metric.html')
},
segment: {
template: require('text!../partials/editor/dimension.html'),
template: require('text!apps/visualize/partials/editor/dimension.html'),
setup: setupDimension
},
group: {
template: require('text!../partials/editor/dimension.html'),
template: require('text!apps/visualize/partials/editor/dimension.html'),
setup: setupDimension
},
split: {
template: require('text!../partials/editor/dimension.html'),
template: require('text!apps/visualize/partials/editor/dimension.html'),
setup: setupDimension
}
};

4
src/kibana/apps/visualize/directives/search_editor.js
View file

@ -1,12 +1,12 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
module.directive('visSearchEditor', function () {
return {
restrict: 'E',
scope: {
vis: '='
},
template: require('text!../partials/search_editor.html'),
template: require('text!apps/visualize/partials/search_editor.html'),
link: function ($scope, $el) {
}

8
src/kibana/apps/visualize/directives/visualize.js
View file

@ -2,11 +2,11 @@ define(function (require) {
var k4d3 = require('k4d3');
var $ = require('jquery');
var _ = require('lodash');
var typeDefs = require('../saved_visualizations/_type_defs');
var typeDefs = require('apps/visualize/saved_visualizations/_type_defs');
require('css!../styles/visualization.css');
require('../visualize_extras/extras');
require('css!apps/visualize/styles/visualization.css');
require('apps/visualize/visualize_extras/extras');
var module = require('modules').get('kibana/directive');
@ -16,7 +16,7 @@ define(function (require) {
scope : {
vis: '=',
},
template: require('text!../partials/visualize.html'),
template: require('text!apps/visualize/partials/visualize.html'),
link: function ($scope, $el) {
var chart; // set in "vis" watcher
var notify = createNotifier();

2
src/kibana/apps/visualize/directives/visualize_table.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
var _ = require('lodash');
var saveAs = require('file_saver');

14
src/kibana/apps/visualize/index.js
View file

@ -1,13 +1,13 @@
define(function (require) {
require('css!./styles/main.css');
require('css!apps/visualize/styles/main.css');
require('./controllers/editor');
require('./controllers/wizard');
require('apps/visualize/controllers/editor');
require('apps/visualize/controllers/wizard');
require('./directives/canvas');
require('./directives/visualize');
require('./directives/config_category');
require('./directives/search_editor');
require('apps/visualize/directives/canvas');
require('apps/visualize/directives/visualize');
require('apps/visualize/directives/config_category');
require('apps/visualize/directives/search_editor');
require('routes')
.when('/visualize', {

8
src/kibana/apps/visualize/saved_visualizations/_adhoc_vis.js
View file

@ -2,11 +2,11 @@ define(function (require) {
var _ = require('lodash');
var module = require('modules').get('kibana/services');
var configCats = require('./_config_categories');
var configCats = require('apps/visualize/saved_visualizations/_config_categories');
module.factory('AdhocVis', function (courier, Private, Promise) {
var aggs = Private(require('./_aggs'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
/**
opts params:
@ -119,14 +119,14 @@ define(function (require) {
*
* @return {Array} - The list of config objects
*/
vis.getConfig = Private(require('./_read_config'));
vis.getConfig = Private(require('apps/visualize/saved_visualizations/_read_config'));
/**
* Transform an ES Response into data for this visualization
* @param {object} resp The elasticsearch response
* @return {array} An array of flattened response rows
*/
vis.buildChartDataFromResponse = Private(require('./_build_chart_data'));
vis.buildChartDataFromResponse = Private(require('apps/visualize/saved_visualizations/_build_chart_data'));
}

2
src/kibana/apps/visualize/saved_visualizations/_aggs.js
View file

@ -57,7 +57,7 @@ define(function (require) {
];
aggs.metricAggsByName = _.indexBy(aggs.metricAggs, 'name');
aggs.bucketAggs = Private(require('./bucket_aggs/_index'));
aggs.bucketAggs = Private(require('apps/visualize/saved_visualizations/bucket_aggs/_index'));
aggs.bucketAggsByName = _.indexBy(aggs.bucketAggs, 'name');
aggs.byName = _.assign({}, aggs.bucketAggsByName, aggs.metricAggsByName);

4
src/kibana/apps/visualize/saved_visualizations/_build_chart_data.js
View file

@ -1,8 +1,8 @@
define(function (require) {
return function BuildChartDataFn(Notifier, Private, courier) {
var _ = require('lodash');
var aggs = Private(require('./_aggs'));
var converters = Private(require('./resp_converters/index'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
var converters = Private(require('apps/visualize/saved_visualizations/resp_converters/index'));
var notify = new Notifier();

6
src/kibana/apps/visualize/saved_visualizations/_read_config.js
View file

@ -1,9 +1,9 @@
define(function (require) {
return function ReadConfigFn(Private, $injector) {
var _ = require('lodash');
var configCategories = require('./_config_categories');
var aggs = Private(require('./_aggs'));
var courier = require('courier/courier');
var configCategories = require('apps/visualize/saved_visualizations/_config_categories');
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
var courier = require('components/courier/courier');
return function readConfig() {
var vis = this;

10
src/kibana/apps/visualize/saved_visualizations/_saved_vis.js
View file

@ -2,13 +2,13 @@ define(function (require) {
var _ = require('lodash');
var inherits = require('utils/inherits');
var configCats = require('./_config_categories');
var typeDefs = require('./_type_defs');
var configCats = require('apps/visualize/saved_visualizations/_config_categories');
var typeDefs = require('apps/visualize/saved_visualizations/_type_defs');
var module = require('modules').get('kibana/services');
module.factory('SavedVis', function (config, $injector, courier, indexPatterns, Promise, savedSearches, Private) {
var aggs = Private(require('./_aggs'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
function SavedVis(opts) {
var vis = this;
@ -211,13 +211,13 @@ define(function (require) {
*
* @return {Array} - The list of config objects
*/
vis.getConfig = Private(require('./_read_config'));
vis.getConfig = Private(require('apps/visualize/saved_visualizations/_read_config'));
/**
* Transform an ES Response into data for this visualization
* @param {object} resp The elasticsearch response
* @return {array} An array of flattened response rows
*/
vis.buildChartDataFromResponse = Private(require('./_build_chart_data'));
vis.buildChartDataFromResponse = Private(require('apps/visualize/saved_visualizations/_build_chart_data'));
}
inherits(SavedVis, courier.SavedObject);

2
src/kibana/apps/visualize/saved_visualizations/_type_defs.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
var _ = require('lodash');
var typeDefs = [

8
src/kibana/apps/visualize/saved_visualizations/bucket_aggs/_index.js
View file

@ -1,10 +1,10 @@
define(function (require) {
return function AggsService(Private) {
return [
Private(require('./date_histogram')),
Private(require('./histogram')),
Private(require('./range')),
Private(require('./terms'))
Private(require('apps/visualize/saved_visualizations/bucket_aggs/date_histogram')),
Private(require('apps/visualize/saved_visualizations/bucket_aggs/histogram')),
Private(require('apps/visualize/saved_visualizations/bucket_aggs/range')),
Private(require('apps/visualize/saved_visualizations/bucket_aggs/terms'))
];
};
});

2
src/kibana/apps/visualize/saved_visualizations/resp_converters/histogram.js
View file

@ -2,7 +2,7 @@ define(function (require) {
return function HistogramConverterFn(Private, timefilter) {
var _ = require('lodash');
var moment = require('moment');
var aggs = Private(require('../_aggs'));
var aggs = Private(require('apps/visualize/saved_visualizations/_aggs'));
var interval = require('utils/interval');
return function (chart, columns, rows) {

6
src/kibana/apps/visualize/saved_visualizations/resp_converters/index.js
View file

@ -1,9 +1,9 @@
define(function (require) {
return function RespConvertersService(Private) {
var histogram = Private(require('apps/visualize/saved_visualizations/resp_converters/histogram'));
return {
histogram: Private(require('./histogram')),
line: Private(require('./histogram'))
histogram: histogram,
line: histogram
};
};
});

6
src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js
View file

@ -1,9 +1,9 @@
define(function (require) {
var app = require('modules').get('app/visualize');
var typeDefs = require('./_type_defs');
var app = require('modules').get('apps/visualize');
var typeDefs = require('apps/visualize/saved_visualizations/_type_defs');
var _ = require('lodash');
require('./_saved_vis');
require('apps/visualize/saved_visualizations/_saved_vis');
// Register this service with the saved object registry so it can be
// edited by the object editor.

2
src/kibana/apps/visualize/visualize_extras/_spy.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
var _ = require('lodash');
var saveAs = require('file_saver');
var moment = require('moment');

8
src/kibana/apps/visualize/visualize_extras/extras.js
View file

@ -1,15 +1,15 @@
define(function (require) {
var module = require('modules').get('app/visualize');
var module = require('modules').get('apps/visualize');
module.directive('visualizeExtras', function (Private, $compile) {
var $ = require('jquery');
var _ = require('lodash');
var contentTemplate = require('text!./_spy.html');
var link = Private(require('./_spy'));
var contentTemplate = require('text!apps/visualize/visualize_extras/_spy.html');
var link = Private(require('apps/visualize/visualize_extras/_spy'));
return {
restrict: 'E',
template: require('text!./_extras.html'),
template: require('text!apps/visualize/visualize_extras/_extras.html'),
link: function ($scope, $el) {
$scope.currentExtra = null;

3
src/kibana/components/config/_delayed_updater.js
View file

@ -3,7 +3,8 @@ define(function (require) {
var notify = new Notifier();
var _ = require('lodash');
var angular = require('angular');
var vals = Private(require('./_vals'));
var vals = Private(require('components/config/_vals'));
return function DelayedUpdater(doc) {
var updater = this;

10
src/kibana/components/config/config.js
View file

@ -3,7 +3,7 @@ define(function (require) {
'kibana/notify'
]);
var configFile = require('../../../config');
var configFile = window.kbnConfigFile;
// allow the rest of the app to get the configFile easily
module.constant('configFile', configFile);
@ -13,9 +13,9 @@ define(function (require) {
var angular = require('angular');
var _ = require('lodash');
var defaults = require('./defaults');
var DelayedUpdater = Private(require('./_delayed_updater'));
var vals = Private(require('./_vals'));
var defaults = require('components/config/defaults');
var DelayedUpdater = Private(require('components/config/_delayed_updater'));
var vals = Private(require('components/config/_vals'));
var notify = new Notifier({
location: 'Config'
@ -25,7 +25,7 @@ define(function (require) {
// update once it is requested by calling #set() or #clear().
var updater;
var DocSource = Private(require('courier/data_source/doc_source'));
var DocSource = Private(require('components/courier/data_source/doc_source'));
var doc = (new DocSource())
.index(configFile.kibanaIndex)
.type('config')

2
src/kibana/components/courier/_get_root_search.js
View file

@ -1,6 +1,6 @@
define(function (require) {
return function RootSearchFactory(Private, config, $rootScope, timefilter, indexPatterns, Promise) {
var SearchSource = Private(require('./data_source/search_source'));
var SearchSource = Private(require('components/courier/data_source/search_source'));
var source; // the actual search source
var prom; // promise that must be resolved before the source is acurrate (updated by loadDefaultPattern)

18
src/kibana/components/courier/courier.js
View file

@ -3,25 +3,25 @@ define(function (require) {
require('services/es');
require('services/promises');
require('index_patterns/index_patterns');
require('components/index_patterns/index_patterns');
require('modules').get('kibana/courier')
.service('courier', function ($rootScope, Private, Promise, indexPatterns) {
function Courier() {
var courier = this;
var DocSource = Private(require('./data_source/doc_source'));
var SearchSource = Private(require('./data_source/search_source'));
var DocSource = Private(require('components/courier/data_source/doc_source'));
var SearchSource = Private(require('components/courier/data_source/search_source'));
var pendingRequests = Private(require('./_pending_requests'));
var searchLooper = Private(require('./looper/search'));
var docLooper = Private(require('./looper/doc'));
var pendingRequests = Private(require('components/courier/_pending_requests'));
var searchLooper = Private(require('components/courier/looper/search'));
var docLooper = Private(require('components/courier/looper/doc'));
// expose some internal modules
courier.getRootSearch = Private(require('./_get_root_search'));
courier.SavedObject = Private(require('./saved_object/saved_object'));
courier.getRootSearch = Private(require('components/courier/_get_root_search'));
courier.SavedObject = Private(require('components/courier/saved_object/saved_object'));
courier.indexPatterns = indexPatterns;
courier.redirectWhenMissing = Private(require('./_redirect_when_missing'));
courier.redirectWhenMissing = Private(require('components/courier/_redirect_when_missing'));
var HastyRefresh = errors.HastyRefresh;
var Abort = errors.Abort;

6
src/kibana/components/courier/data_source/_abstract.js
View file

@ -4,9 +4,9 @@ define(function (require) {
var nextTick = require('utils/next_tick');
return function SourceAbstractFactory(Private, Promise, timefilter) {
var pendingRequests = Private(require('../_pending_requests'));
var errorHandlers = Private(require('../_error_handlers'));
var fetch = Private(require('../fetch/fetch'));
var pendingRequests = Private(require('components/courier/_pending_requests'));
var errorHandlers = Private(require('components/courier/_error_handlers'));
var fetch = Private(require('components/courier/fetch/fetch'));
function SourceAbstract(initialState) {
this._instanceid = _.uniqueId('data_source');

2
src/kibana/components/courier/data_source/_doc_send_to_es.js
View file

@ -3,7 +3,7 @@ define(function (require) {
var errors = require('errors');
return function (Promise, Private, es) {
var pendingRequests = Private(require('../_pending_requests'));
var pendingRequests = Private(require('components/courier/_pending_requests'));
/**
* Backend for doUpdate and doIndex

4
src/kibana/components/courier/data_source/doc_source.js
View file

@ -5,8 +5,8 @@ define(function (require) {
var inherits = require('utils/inherits');
return function DocSourceFactory(Private, Promise, es) {
var sendToEs = Private(require('./_doc_send_to_es'));
var SourceAbstract = Private(require('./_abstract'));
var sendToEs = Private(require('components/courier/data_source/_doc_send_to_es'));
var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
var VersionConflict = errors.VersionConflict;
var RequestFailure = errors.RequestFailure;

2
src/kibana/components/courier/data_source/search_source.js
View file

@ -4,7 +4,7 @@ define(function (require) {
var errors = require('errors');
return function SearchSourceFactory(Promise, Private) {
var SourceAbstract = Private(require('./_abstract'));
var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
var FetchFailure = errors.FetchFailure;
var RequestFailure = errors.RequestFailure;

4
src/kibana/components/courier/fetch/_request_error_handler.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function RequestErrorHandlerFactory(Private, Notifier) {
var pendingRequests = Private(require('../_pending_requests'));
var errorHandlers = Private(require('../_error_handlers'));
var pendingRequests = Private(require('components/courier/_pending_requests'));
var errorHandlers = Private(require('components/courier/_error_handlers'));
var notify = new Notifier({
location: 'Courier Fetch Error'

8
src/kibana/components/courier/fetch/fetch.js
View file

@ -4,15 +4,15 @@ define(function (require) {
var errors = require('errors');
var moment = require('moment');
var docStrategy = Private(require('./strategy/doc'));
var searchStrategy = Private(require('./strategy/search'));
var docStrategy = Private(require('components/courier/fetch/strategy/doc'));
var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
var strategies = this.strategies = {
doc: docStrategy,
search: searchStrategy
};
var RequestErrorHandler = Private(require('./_request_error_handler'));
var pendingRequests = Private(require('../_pending_requests'));
var RequestErrorHandler = Private(require('components/courier/fetch/_request_error_handler'));
var pendingRequests = Private(require('components/courier/_pending_requests'));
var notify = new Notifier({
location: 'Courier Fetch'

4
src/kibana/components/courier/looper/doc.js
View file

@ -1,7 +1,7 @@
define(function (require) {
return function DocLooperService(Private) {
var fetch = Private(require('../fetch/fetch'));
var Looper = Private(require('./_looper'));
var fetch = Private(require('components/courier/fetch/fetch'));
var Looper = Private(require('components/courier/looper/_looper'));
/**
* The Looper which will manage the doc fetch interval

4
src/kibana/components/courier/looper/search.js
View file

@ -1,8 +1,8 @@
define(function (require) {
return function SearchLooperService(Private, Promise) {
var errors = require('errors');
var fetch = Private(require('../fetch/fetch'));
var Looper = Private(require('./_looper'));
var fetch = Private(require('components/courier/fetch/fetch'));
var Looper = Private(require('components/courier/looper/_looper'));
// track the currently executing search resquest
var _activeAutoSearch = null;

6
src/kibana/components/courier/saved_object/saved_object.js
View file

@ -4,10 +4,10 @@ define(function (require) {
var angular = require('angular');
var _ = require('lodash');
var DocSource = Private(require('../data_source/doc_source'));
var SearchSource = Private(require('../data_source/search_source'));
var DocSource = Private(require('components/courier/data_source/doc_source'));
var SearchSource = Private(require('components/courier/data_source/search_source'));
var mappingSetup = Private(require('utils/mapping_setup'));
var getRootSearch = Private(require('../_get_root_search'));
var getRootSearch = Private(require('components/courier/_get_root_search'));
function SavedObject(config) {
if (!_.isObject(config)) config = {};

6
src/kibana/components/index_patterns/_field_formats.js
View file

@ -2,7 +2,7 @@
/* markdown
### Formatting a value
To format a response value, you need to get ahold of the field list, which is usually available at `indexPattern.fields` or `indexPattern.fieldsByName`. When the indexPattern is not available, call `courier.getFieldsFor`. Each field object has a `format` property*, which is an object detailed in [_field_formats.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/courier/index_patterns/_field_formats.js).
To format a response value, you need to get ahold of the field list, which is usually available at `indexPattern.fields` or `indexPattern.fieldsByName`. When the indexPattern is not available, call `courier.getFieldsFor`. Each field object has a `format` property*, which is an object detailed in [_field_formats.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js).
Once you have the field that a response value came from, pass the value to `field.format.convert(value)` and a formatted string representation of the field will be returned.
@ -10,9 +10,9 @@ Once you have the field that a response value came from, pass the value to `fiel
### Changing a field's format
Currently only one field format exists, `"string"`, which just [flattens any value down to a string](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/courier/index_patterns/_field_formats.js#L18-L24).
Currently only one field format exists, `"string"`, which just [flattens any value down to a string](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L18-L24).
To change the format for a specific field you can either change the default for a field type modify the [default format mapping here](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/courier/index_patterns/_field_formats.js#L37-L46).
To change the format for a specific field you can either change the default for a field type modify the [default format mapping here](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L37-L46).
To change the format for a specific indexPattern's field, add the field and format name to `indexPattern.customFormats` object property.

10
src/kibana/components/index_patterns/_index_pattern.js
View file

@ -4,12 +4,12 @@ define(function (require) {
var angular = require('angular');
var errors = require('errors');
var mapper = Private(require('./_mapper'));
var fieldFormats = Private(require('./_field_formats'));
var patternCache = Private(require('./_pattern_cache'));
var intervals = Private(require('./_intervals'));
var mapper = Private(require('components/index_patterns/_mapper'));
var fieldFormats = Private(require('components/index_patterns/_field_formats'));
var patternCache = Private(require('components/index_patterns/_pattern_cache'));
var intervals = Private(require('components/index_patterns/_intervals'));
var mappingSetup = Private(require('utils/mapping_setup'));
var DocSource = Private(require('courier/data_source/doc_source'));
var DocSource = Private(require('components/courier/data_source/doc_source'));
var type = 'index-pattern';

6
src/kibana/components/index_patterns/_mapper.js
View file

@ -3,10 +3,10 @@ define(function (require) {
var _ = require('lodash');
var IndexPatternMissingIndices = require('errors').IndexPatternMissingIndices;
var transformMappingIntoFields = Private(require('./_transform_mapping_into_fields'));
var intervals = Private(require('./_intervals'));
var transformMappingIntoFields = Private(require('components/index_patterns/_transform_mapping_into_fields'));
var intervals = Private(require('components/index_patterns/_intervals'));
var LocalCache = Private(require('./_local_cache'));
var LocalCache = Private(require('components/index_patterns/_local_cache'));
function Mapper() {

2
src/kibana/components/index_patterns/_transform_mapping_into_fields.js
View file

@ -2,7 +2,7 @@ define(function (require) {
return function transformMappingIntoFields(Private, configFile, config) {
var _ = require('lodash');
var MappingConflict = require('errors').MappingConflict;
var castMappingType = Private(require('./_cast_mapping_type'));
var castMappingType = Private(require('components/index_patterns/_cast_mapping_type'));
/**
* Convert the ES response into the simple map for fields to

14
src/kibana/components/index_patterns/index_patterns.js
View file

@ -6,8 +6,8 @@ define(function (require) {
var _ = require('lodash');
var errors = require('errors');
var IndexPattern = Private(require('./_index_pattern'));
var patternCache = Private(require('./_pattern_cache'));
var IndexPattern = Private(require('components/index_patterns/_index_pattern'));
var patternCache = Private(require('components/index_patterns/_pattern_cache'));
var notify = new Notifier({ location: 'IndexPatterns Service'});
@ -43,11 +43,11 @@ define(function (require) {
MissingIndices: errors.IndexPatternMissingIndices
};
indexPatterns.ensureSome = Private(require('./_ensure_some'));
indexPatterns.ensureSome = Private(require('components/index_patterns/_ensure_some'));
indexPatterns.cache = patternCache;
indexPatterns.intervals = Private(require('./_intervals'));
indexPatterns.mapper = Private(require('./_mapper'));
indexPatterns.patternToWildcard = Private(require('./_pattern_to_wildcard'));
indexPatterns.fieldFormats = Private(require('./_field_formats'));
indexPatterns.intervals = Private(require('components/index_patterns/_intervals'));
indexPatterns.mapper = Private(require('components/index_patterns/_mapper'));
indexPatterns.patternToWildcard = Private(require('components/index_patterns/_pattern_to_wildcard'));
indexPatterns.fieldFormats = Private(require('components/index_patterns/_field_formats'));
});
});

2
src/kibana/components/notify/_notifier.js
View file

@ -17,7 +17,7 @@ define(function (require) {
return function (vars) {
return (compiled || (compiled = _.template(tmpl)))(vars);
};
}(require('text!./partials/fatal.html')));
}(require('text!components/notify/partials/fatal.html')));
function now() {
if (window.performance && window.performance.now) {

2
src/kibana/components/notify/directives.js
View file

@ -8,7 +8,7 @@ define(function (require) {
list: '=list'
},
replace: true,
template: require('text!./partials/toaster.html')
template: require('text!components/notify/partials/toaster.html')
};
});
});

6
src/kibana/components/notify/notify.js
View file

@ -4,11 +4,11 @@ define(function (require) {
var $ = require('jquery');
var modules = require('modules');
var module = modules.get('kibana/notify');
var errors = require('./_errors');
var Notifier = require('./_notifier');
var errors = require('components/notify/_errors');
var Notifier = require('components/notify/_notifier');
var rootNotifier = new Notifier();
require('./directives');
require('components/notify/directives');
module.factory('createNotifier', function () {
return function (opts) {

10
src/kibana/components/setup/setup.js
View file

@ -2,15 +2,15 @@ define(function (require) {
var _ = require('lodash');
var $ = require('jquery');
require('notify/notify');
require('components/notify/notify');
require('modules').get('kibana/services')
.service('kbnSetup', function (Private, Promise, Notifier, es, configFile) {
// setup steps
var checkForEs = Private(require('./steps/check_for_es'));
var checkEsVersion = Private(require('./steps/check_es_version'));
var checkForKibanaIndex = Private(require('./steps/check_for_kibana_index'));
var createKibanaIndex = Private(require('./steps/create_kibana_index'));
var checkForEs = Private(require('components/setup/steps/check_for_es'));
var checkEsVersion = Private(require('components/setup/steps/check_es_version'));
var checkForKibanaIndex = Private(require('components/setup/steps/check_for_kibana_index'));
var createKibanaIndex = Private(require('components/setup/steps/create_kibana_index'));
var notify = new Notifier({ location: 'Setup' });

2
src/kibana/components/setup/steps/check_es_version.js
View file

@ -4,7 +4,7 @@ define(function (require) {
var notify = new Notifier({ location: 'Setup: Elasticsearch version check' });
var complete = notify.lifecycle('check es version');
var SetupError = Private(require('../_setup_error'));
var SetupError = Private(require('components/setup/_setup_error'));
// core expression for finding a version

2
src/kibana/components/setup/steps/check_for_es.js
View file

@ -1,6 +1,6 @@
define(function (require) {
return function checkForEsFunction(Private, Notifier, es, configFile) {
var SetupError = Private(require('../_setup_error'));
var SetupError = Private(require('components/setup/_setup_error'));
var notify = new Notifier({ location: 'Setup: Elasticsearch check' });
return function checkForES() {

2
src/kibana/components/setup/steps/check_for_kibana_index.js
View file

@ -1,6 +1,6 @@
define(function (require) {
return function CheckForKibanaIndexFn(Private, es, Notifier, configFile) {
var SetupError = Private(require('../_setup_error'));
var SetupError = Private(require('components/setup/_setup_error'));
var notify = new Notifier({ location: 'Setup: Kibana index check' });
return function checkForKibana() {

3
src/kibana/components/setup/steps/create_kibana_index.js
View file

@ -3,8 +3,7 @@ define(function (require) {
return function createKibanaIndex() {
var notify = new Notifier({ location: 'Setup: Kibana Index Creation' });
var complete = notify.lifecycle('kibana index creation');
var SetupError = Private(require('../_setup_error'));
var SetupError = Private(require('components/setup/_setup_error'));
return es.indices.create({
index: configFile.kibanaIndex,

2
src/kibana/components/state_management/app_state.js
View file

@ -1,7 +1,7 @@
define(function (require) {
var module = require('modules').get('kibana/factories');
require('./global_state');
require('components/state_management/global_state');
module.factory('AppState', function (globalState, $route, $location, Promise) {

4
src/kibana/components/state_management/global_state.js
View file

@ -6,10 +6,10 @@ define(function (require) {
var module = require('modules').get('kibana/global_state');
module.service('globalState', function ($rootScope, $route, $injector, Promise) {
module.service('globalState', function (Private, $rootScope, $route, $injector, Promise) {
var globalState = this;
var setupSync = $injector.invoke(require('./_state_sync'));
var setupSync = Private(require('components/state_management/_state_sync'));
// store app related stuff in here
var app = {};

4
src/kibana/components/timepicker/timepicker.js
View file

@ -1,12 +1,12 @@
define(function (require) {
var html = require('text!./timepicker.html');
var html = require('text!components/timepicker/timepicker.html');
var module = require('modules').get('kibana/directives');
var _ = require('lodash');
var datemath = require('utils/datemath');
var moment = require('moment');
require('directives/input_datetime');
require('./quick_ranges');
require('components/timepicker/quick_ranges');
module.directive('kbnTimepicker', function (quickRanges) {

8
src/kibana/controllers/kibana.js
View file

@ -6,9 +6,9 @@ define(function (require) {
var qs = require('utils/query_string');
var rison = require('utils/rison');
require('config/config');
require('courier/courier');
require('notify/notify');
require('components/config/config');
require('components/courier/courier');
require('components/notify/notify');
require('directives/info');
require('directives/spinner');
require('directives/paginate');
@ -156,7 +156,7 @@ define(function (require) {
};
$scope.configure = function () {
$scope.configureTemplateUrl = require('text!../partials/global_config.html');
$scope.configureTemplateUrl = require('text!partials/global_config.html');
};
// expose the notification services list of notifs on the $scope so that the

2
src/kibana/directives/info.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var html = require('text!../partials/info.html');
var html = require('text!partials/info.html');
require('modules')
.get('kibana/directives')

2
src/kibana/directives/paginate.js
View file

@ -99,7 +99,7 @@ define(function (require) {
module.directive('paginateControls', function () {
return {
restrict: 'E',
template: require('text!../partials/paginate_controls.html')
template: require('text!partials/paginate_controls.html')
};
});
});

2
src/kibana/directives/saved_object_finder.js
View file

@ -28,7 +28,7 @@ define(function (require) {
makeUrl: '=?',
onChoose: '=?'
},
template: require('text!../partials/saved_object_finder.html'),
template: require('text!partials/saved_object_finder.html'),
link: function ($scope, $el) {
// the text input element
var $input = $el.find('input[ng-model=filter]');

5
src/kibana/index.js
View file

@ -4,7 +4,6 @@
define(function (require) {
var angular = require('angular');
var $ = require('jquery');
var configFile = require('../config');
var modules = require('modules');
var routes = require('routes');
@ -12,6 +11,8 @@ define(function (require) {
require('angular-route');
require('angular-bindonce');
var configFile = window.kbnConfigFile = require('../config');
var kibana = angular.module('kibana', [
// list external requirements here
'elasticsearch',
@ -19,6 +20,8 @@ define(function (require) {
'ngRoute'
]);
configFile.elasticsearch = configFile.elasticsearch || ('http://' + window.location.hostname + ':9200');
kibana
// This stores the Kibana revision number, @REV@ is replaced by grunt.
.constant('kbnVersion', '@REV@')

12
src/kibana/require.config.js
View file

@ -1,18 +1,11 @@
require.config({
baseUrl: './kibana',
paths: {
// components
setup: './components/setup',
kibana: './index',
config: './components/config',
errors: './components/errors',
notify: './components/notify',
courier: './components/courier',
index_patterns: './components/index_patterns',
state_management: './components/state_management',
// special utils
routes: 'utils/routes',
errors: 'components/errors',
modules: 'utils/modules',
// bower_components
@ -25,7 +18,6 @@ require.config({
'angular-elastic': '../bower_components/angular-elastic/elastic',
ace: '../bower_components/ace-builds/src-noconflict/ace',
async: '../bower_components/async/lib/async',
bootstrap: '../bower_components/bootstrap/dist/js/bootstrap',
css: '../bower_components/require-css/css',
text: '../bower_components/requirejs-text/text',
elasticsearch: '../bower_components/elasticsearch/dist/elasticsearch.angular',
@ -51,7 +43,7 @@ require.config({
'angular-route': ['angular'],
'angular-mocks': ['angular'],
'elasticsearch': ['angular'],
'angular-bootstrap': ['angular', 'bootstrap'],
'angular-bootstrap': ['angular'],
'angular-bindonce': ['angular'],
k4d3: ['jquery', 'lodash'],
'angular-ui-ace': ['angular', 'ace'],

2
src/kibana/utils/routes.js
View file

@ -6,7 +6,7 @@ define(function (require) {
var additions = [];
var otherwise;
require('setup/setup');
require('components/setup/setup');
var NoDefaultIndexPattern = require('errors').NoDefaultIndexPattern;
require('modules').get('kibana/controllers')

2
test/unit/specs/courier/calculate_indices.js
View file

@ -1,5 +1,5 @@
define(function (require) {
var calculateIndices = require('courier/calculate_indices');
var calculateIndices = require('components/courier/calculate_indices');
var moment = require('moment');
return function extendCourierSuite() {

4
test/unit/specs/courier/create_source.js
View file

@ -1,6 +1,6 @@
define(function (require) {
var SearchSource = require('courier/data_source/search_source');
var DocSource = require('courier/data_source/doc_source');
var SearchSource = require('components/courier/data_source/search_source');
var DocSource = require('components/courier/data_source/doc_source');
return function extendCourierSuite() {
inject(function (courier) {

2
test/unit/specs/courier/data_source.js
View file

@ -1,5 +1,5 @@
define(function (require) {
require('courier/courier');
require('components/courier/courier');
return function extendCourierSuite() {
inject(function ($injector) {

2
test/unit/specs/courier/mapper.js
View file

@ -2,7 +2,7 @@ define(function (require) {
var elasticsearch = require('bower_components/elasticsearch/elasticsearch');
var sinon = require('test_utils/auto_release_sinon');
var Mapper = require('courier/mapper');
var Mapper = require('components/courier/mapper');
var fieldMapping = require('fixtures/field_mapping');
var fieldMappingWithDupes = require('fixtures/mapping_with_dupes');
var nextTick = require('utils/next_tick');