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:elastic/kibana into pr/4114

Browse source
This commit is contained in:
Spencer Alger 2015-06-05 11:06:11 -07:00
commit dc0f6bb2b6
12 changed files with 1597 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -1,11 +1,9 @@
language: node_js
node_js:
- '0.10'
install:
- npm install grunt-cli bower
- npm install
script:
- npm test
- '0.12'
install: npm install
script: npm test
sudo: false
cache:
directories:

58
bower.json
View file

@ -21,41 +21,39 @@
],
"dependencies": {
"angular": "1.2.28",
"angular-bindonce": "~0.3.1",
"angular-bootstrap": "~0.10.0",
"angular-elastic": "~2.4.2",
"angular-mocks": "~1.2.14",
"angular-route": "~1.2.14",
"angular-ui-ace": "~0.2.3",
"async": "~0.2.10",
"angular-bindonce": "0.3.3",
"angular-bootstrap": "0.10.0",
"angular-elastic": "2.4.2",
"angular-mocks": "1.2.28",
"angular-route": "1.2.28",
"angular-ui-ace": "0.2.3",
"bluebird": "~2.1.3",
"bootstrap": "~3.3.1",
"d3": "~3.4.8",
"elasticsearch": "~4.1.0",
"Faker": "~1.1.0",
"FileSaver": "*",
"font-awesome": "~4.2.0",
"gridster": "~0.5.0",
"inflection": "~1.3.5",
"jquery": "~2.1.0",
"bootstrap": "3.3.4",
"d3": "3.4.13",
"elasticsearch": "4.1.0",
"Faker": "1.1.0",
"FileSaver": "babc6d9d8f",
"font-awesome": "4.2.0",
"gridster": "0.5.6",
"inflection": "1.3.8",
"jquery": "2.1.4",
"leaflet": "0.7.3",
"Leaflet.heat": "Leaflet/Leaflet.heat#627ede7c11bbe43",
"lesshat": "~3.0.2",
"lodash": "~2.4.1",
"moment": "~2.9.0",
"moment-timezone": "~0.0.3",
"ng-clip": "~0.2.4",
"require-css": "~0.1.2",
"requirejs": "~2.1.10",
"requirejs-text": "~2.0.10",
"lodash-deep": "spenceralger/lodash-deep#compat",
"marked": "~0.3.2",
"numeral": "~1.5.3",
"leaflet-draw": "~0.2.4"
"lesshat": "3.0.2",
"lodash": "2.4.2",
"moment": "2.9.0",
"moment-timezone": "0.0.6",
"ng-clip": "0.2.6",
"require-css": "0.1.8",
"requirejs": "2.1.18",
"requirejs-text": "2.0.14",
"lodash-deep": "spenceralger/lodash-deep#1a7eca8344",
"marked": "0.3.3",
"numeral": "1.5.3",
"leaflet-draw": "0.2.4"
},
"devDependencies": {},
"resolutions": {
"angular-bootstrap": "~0.12",
"elasticsearch": "~4.1.0"
"angular": "1.2.28"
}
}

1461
npm-shrinkwrap.json generated Normal file
View file

File diff suppressed because it is too large Load diff

126
package.json
View file

@ -31,7 +31,6 @@
"scripts": {
"test": "grunt test",
"start": "node ./src/server/bin/kibana.js",
"server": "node ./src/server/bin/kibana.js",
"postinstall": "bower install && grunt licenses --check-validity",
"precommit": "grunt lintStagedFiles"
},
@ -40,73 +39,70 @@
"url": "https://github.com/elastic/kibana.git"
},
"dependencies": {
"ansicolors": "^0.3.2",
"bluebird": "~2.0.7",
"body-parser": "~1.10.1",
"bunyan": "^1.2.3",
"commander": "^2.6.0",
"compression": "^1.3.0",
"cookie-parser": "~1.3.3",
"debug": "~2.1.1",
"elasticsearch": "^3.1.1",
"express": "~4.10.6",
"glob": "^4.3.2",
"http-auth": "^2.2.5",
"jade": "~1.8.2",
"js-yaml": "^3.2.5",
"less-middleware": "1.0.x",
"lodash": "^2.4.1",
"morgan": "~1.5.1",
"request": "^2.40.0",
"requirefrom": "^0.2.0",
"semver": "^4.2.0",
"serve-favicon": "~2.2.0",
"through": "^2.3.6"
"ansicolors": "0.3.2",
"bluebird": "2.0.7",
"body-parser": "1.10.2",
"bunyan": "1.3.6",
"commander": "2.8.1",
"compression": "1.4.4",
"cookie-parser": "1.3.5",
"debug": "2.1.3",
"elasticsearch": "3.1.3",
"express": "4.10.8",
"glob": "4.5.3",
"http-auth": "2.2.8",
"jade": "1.8.2",
"js-yaml": "3.3.1",
"less-middleware": "1.0.4",
"lodash": "2.4.2",
"morgan": "1.5.3",
"request": "2.57.0",
"requirefrom": "0.2.0",
"semver": "4.3.6",
"serve-favicon": "2.2.1",
"through": "2.3.7"
},
"devDependencies": {
"bower-license": "^0.2.6",
"connect": "~2.19.5",
"event-stream": "~3.1.5",
"expect.js": "~0.3.1",
"glob": "~4.1.3",
"grunt": "~0.4.5",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-compress": "~0.9.1",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jade": "~0.10.0",
"grunt-contrib-jshint": "^0.11",
"grunt-contrib-less": "~0.10.0",
"grunt-contrib-requirejs": "~0.4.4",
"grunt-contrib-watch": "~0.5.3",
"grunt-esvm": "~0.3.2",
"grunt-jscs": "git://github.com/spalger/grunt-jscs.git#addFix",
"grunt-mocha": "~0.4.10",
"grunt-replace": "^0.7.9",
"grunt-run": "^0.2.3",
"grunt-s3": "~0.2.0-alpha.3",
"grunt-saucelabs": "~8.3.2",
"grunt-simple-mocha": "^0.4.0",
"html-entities": "^1.1.1",
"http-proxy": "~1.8.1",
"husky": "~0.6.0",
"istanbul": "~0.2.4",
"license-checker": "^3.0.3",
"load-grunt-config": "~0.7.0",
"lodash": "~2.4.1",
"marked": "^0.3.2",
"marked-text-renderer": "^0.1.0",
"mkdirp": "^0.5.0",
"mocha": "^2.2.5",
"mocha-screencast-reporter": "~0.1.4",
"npm": "^2.11.0",
"opn": "~1.0.0",
"bower": "1.4.1",
"bower-license": "0.2.6",
"event-stream": "3.1.7",
"expect.js": "0.3.1",
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-compress": "0.9.1",
"grunt-contrib-copy": "0.5.0",
"grunt-contrib-jade": "0.10.0",
"grunt-contrib-jshint": "0.11.2",
"grunt-contrib-less": "0.10.0",
"grunt-contrib-requirejs": "0.4.4",
"grunt-contrib-watch": "0.5.3",
"grunt-esvm": "0.3.5",
"grunt-jscs": "1.8.0",
"grunt-mocha": "0.4.12",
"grunt-replace": "0.7.9",
"grunt-run": "0.2.4",
"grunt-s3": "0.2.0-alpha.3",
"grunt-simple-mocha": "0.4.0",
"html-entities": "1.1.2",
"http-proxy": "1.8.1",
"husky": "0.6.2",
"istanbul": "0.2.16",
"license-checker": "3.0.3",
"load-grunt-config": "0.7.2",
"marked": "0.3.3",
"marked-text-renderer": "0.1.0",
"mkdirp": "0.5.1",
"mocha": "2.2.5",
"npm": "2.11.0",
"opn": "1.0.2",
"path-browserify": "0.0.0",
"progress": "^1.1.8",
"requirejs": "~2.1.14",
"progress": "1.1.8",
"requirejs": "2.1.18",
"rjs-build-analysis": "0.0.3",
"simple-git": "^0.11.0",
"sinon": "^1.12.2",
"sinon-as-promised": "^2.0.3",
"tar": "^1.0.1"
"simple-git": "0.11.0",
"sinon": "1.14.1",
"sinon-as-promised": "2.0.3",
"tar": "1.0.3"
}
}

6
src/kibana/components/doc_table/components/table_row.js
View file

@ -23,10 +23,11 @@ define(function (require) {
* ```
*/
module.directive('kbnTableRow', function ($compile) {
var noWhiteSpace = require('utils/no_white_space');
var openRowHtml = require('text!components/doc_table/components/table_row/open.html');
var detailsHtml = require('text!components/doc_table/components/table_row/details.html');
var cellTemplate = _.template(require('text!components/doc_table/components/table_row/cell.html'));
var truncateByHeightTemplate = _.template(require('text!partials/truncate_by_height.html'));
var cellTemplate = _.template(noWhiteSpace(require('text!components/doc_table/components/table_row/cell.html')));
var truncateByHeightTemplate = _.template(noWhiteSpace(require('text!partials/truncate_by_height.html')));
return {
restrict: 'A',
@ -106,6 +107,7 @@ define(function (require) {
$scope.columns.forEach(function (column) {
newHtmls.push(cellTemplate({
timefield: false,
sourcefield: (column === '_source'),
formatted: _displayField(row, column, true)
}));
});

14
src/kibana/components/doc_table/components/table_row/cell.html
View file

@ -1,3 +1,13 @@
<td <%= timefield ? 'class="discover-table-timefield" width="1%"' : '' %>>
<%
var attributes = '';
if (timefield) {
attributes='class="discover-table-timefield" width="1%"';
} else if (sourcefield) {
attributes='class="discover-table-sourcefield"';
} else {
attributes='class="discover-table-datafield"';
}
%>
<td <%= attributes %>>
<%= formatted %>
</td>
</td>

4
src/kibana/components/doc_table/doc_table.less
View file

@ -7,6 +7,10 @@ doc-table {
margin: 5px;
.flex(1, 1, 100%);
.discover-table-datafield {
white-space: pre;
}
.loading {
opacity: @loading-opacity;
}

5
src/kibana/components/typeahead/_input.js
View file

@ -16,6 +16,9 @@ define(function (require) {
typeaheadCtrl.setInputModel(model);
// disable browser autocomplete
$el.attr('autocomplete', 'off');
// handle keypresses
$el.on('keydown', function (ev) {
typeaheadCtrl.keypressHandler(ev);
@ -44,4 +47,4 @@ define(function (require) {
}
};
});
});
});

9
src/kibana/plugins/visualize/editor/styles/editor.less
View file

@ -91,8 +91,13 @@
.flex-parent(1, 1, auto);
> div.vis-editor-config {
.flex-parent(1, 1, 1px);
overflow: auto;
@media (min-width: @screen-md-min) {
.flex-parent(1, 1, 1px);
overflow: auto;
}
@media (max-width: @screen-md-min) {
.flex-parent(1, 1, auto);
}
}
> .vis-edit-sidebar-buttons {

39
tasks/config/saucelabs-mocha.js
View file

@ -1,39 +0,0 @@
var config = require('../utils/server-config');
var unitTestUrl = require('util').format('http://localhost:%d/test/unit/?saucelabs=true', config.kibana.port);
var buildId = 'test build';
if (process.env.TRAVIS_BUILD_ID) {
buildId = 'travis build #' + process.env.TRAVIS_BUILD_ID;
}
module.exports = {
unit: {
options: {
username: 'kibana',
key: process.env.SAUCE_ACCESS_KEY,
urls: [ unitTestUrl ],
testname: 'Kibana Browser Tests',
build: buildId,
concurrency: 10,
'max-duration': 60,
maxRetries: 2,
browsers: [
{
browserName: 'chrome',
platform: 'Windows 7'
},
{
browserName: 'safari',
platform: 'OS X 10.9',
},
{
browserName: 'firefox',
platform: 'Windows 7',
},
{
browserName: 'internet explorer',
platform: 'Windows 8'
}
]
}
}
};

35
tasks/test.js
View file

@ -1,23 +1,5 @@
var _ = require('lodash');
module.exports = function (grunt) {
function addTestTask(tasks) {
var testTask = 'mocha:unit';
if (grunt.option('use-sauce') || process.env.TRAVIS) {
if (!process.env.SAUCE_ACCESS_KEY) {
grunt.log.writeln(grunt.log.wordlist([
'>> SAUCE_ACCESS_KEY not set in env, running with Phantom'
], {color: 'yellow'}));
} else {
testTask = 'saucelabs-mocha:unit';
}
}
tasks.push('simplemocha:all', testTask);
return testTask;
}
grunt.registerTask('test', function () {
if (grunt.option('quick')) {
grunt.task.run('quick-test');
@ -30,19 +12,22 @@ module.exports = function (grunt) {
'jscs:source',
'maybe_start_kibana',
'jade',
'less:build'
'less:build',
'simplemocha:all',
'mocha:unit'
];
addTestTask(tasks);
if (process.env.TRAVIS) tasks.unshift('esvm:dev');
grunt.task.run(tasks);
});
grunt.registerTask('quick-test', function () {
var tasks = [
'maybe_start_kibana'
];
addTestTask(tasks);
grunt.task.run(tasks);
grunt.task.run([
'maybe_start_kibana',
'simplemocha:all',
'mocha:unit'
]);
});
grunt.registerTask('coverage', [

26
test/unit/index.html
View file

@ -12,7 +12,6 @@
/* globals mocha */
var COVERAGE = window.COVERAGE = !!(/coverage/i.test(window.location.search));
var SAUCELABS = window.SAUCELABS = !!(/saucelabs/i.test(window.location.search));
var DISABLE_RESIZE_CHECKER = window.DISABLE_RESIZE_CHECKER = true;
function wrap(obj, method, fn) {
@ -54,9 +53,7 @@
sinon: '../../test/utils/sinon',
bluebird: 'bower_components/bluebird/js/browser/bluebird',
angular: 'bower_components/angular-mocks/angular-mocks',
angular_src: 'bower_components/angular/angular',
screencast_reporter_css: '../../node_modules/mocha-screencast-reporter/screencast-reporter',
ScreencastReporter: '../../node_modules/mocha-screencast-reporter/screencast-reporter'
angular_src: 'bower_components/angular/angular'
},
shim: {
angular_src: {
@ -94,16 +91,6 @@
});
}
function setupSaucelabsReporter(done) {
require([
'ScreencastReporter',
'css!screencast_reporter_css'
], function (ScreencastReporter) {
mocha.reporter(ScreencastReporter);
done();
});
}
function runTests() {
require([
'text!specList',
@ -169,15 +156,8 @@
}
if (COVERAGE) {
setupCoverage(runTests);
}
else if (SAUCELABS) {
setupSaucelabsReporter(runTests);
}
else {
runTests();
}
if (COVERAGE) setupCoverage(runTests);
else runTests();
})();</script>
</head>