diff --git a/docs/getting-started.asciidoc b/docs/getting-started.asciidoc index 431896682d918..2a17c53e11479 100644 --- a/docs/getting-started.asciidoc +++ b/docs/getting-started.asciidoc @@ -283,7 +283,7 @@ A green oval with the filter definition displays right under the query box: image::images/tutorial-visualize-map-3.png[] Hover on the filter to display the controls to toggle, pin, invert, or delete the filter. Save this chart with the name -_Bar Example_. +_Map Example_. Finally, we're going to define a sample Markdown widget to display on our dashboard. Click on *New Visualization*, then *Markdown widget*, to display a very simple Markdown entry field: @@ -323,4 +323,4 @@ clicking the *Share* button to display HTML embedding code as well as a direct l === Wrapping Up Now that you've handled the basic aspects of Kibana's functionality, you're ready to explore Kibana in further detail. -Take a look at the rest of the documentation for more details! \ No newline at end of file +Take a look at the rest of the documentation for more details! diff --git a/docs/whats-new.asciidoc b/docs/whats-new.asciidoc index b209ffbf37c2d..2f6d3823bb7e4 100644 --- a/docs/whats-new.asciidoc +++ b/docs/whats-new.asciidoc @@ -9,8 +9,7 @@ the Visualize tab to Discover to a Dashboard. * {k4pull}2731[Pull Request 2731]: Field formatting options now supported in Settings. * {k4pull}3154[Pull Request 3154]: New chart: Bubble chart, derived from the basic line chart. -* {k4pull}3212[Pull Request 3212]: You can now install Kibana on Linux with a package manager such as `yum` or -`apt-get`. +* {k4pull}3212[Pull Request 3212]: You can now install Kibana on Linux with a package manager such as `apt-get`. * {k4pull}3271[Pull Request 3271] and {k4pull}3262[3262]: New aggregations: IPv4 and Date range aggregations enable you to specify buckets for these qualities. * {k4pull}3290[Pull Request 3290]: You can select a time interval for the Discover display of time series data. diff --git a/package.json b/package.json index 95ec3b66a6bd9..ac1897c14084d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "husky": "^0.8.1", "istanbul": "^0.3.15", "jade": "^1.8.2", - "license-checker": "3.0.3", + "license-checker": "^3.1.0", "libesvm": "^1.0.1", "load-grunt-config": "^0.7.0", "marked": "^0.3.3", diff --git a/src/ui/components/agg_types/buckets/terms.js b/src/ui/components/agg_types/buckets/terms.js index d40664e3fa135..237a0ddd6ab42 100644 --- a/src/ui/components/agg_types/buckets/terms.js +++ b/src/ui/components/agg_types/buckets/terms.js @@ -28,7 +28,7 @@ define(function (require) { title: 'Terms', makeLabel: function (agg) { var params = agg.params; - return params.order.display + ' ' + params.size + ' ' + params.field.displayName; + return params.field.displayName + ': ' + params.order.display; }, createFilter: createFilter, params: [ @@ -53,21 +53,6 @@ define(function (require) { name: 'size', default: 5 }, - { - name: 'order', - type: 'optioned', - default: 'desc', - editor: require('text!components/agg_types/controls/order_and_size.html'), - options: [ - { display: 'Top', val: 'desc' }, - { display: 'Bottom', val: 'asc' } - ], - write: _.noop // prevent default write, it's handled by orderAgg - }, - { - name: 'orderBy', - write: _.noop // prevent default write, it's handled by orderAgg - }, { name: 'orderAgg', type: AggConfig, @@ -122,6 +107,12 @@ define(function (require) { // we aren't creating a custom aggConfig if (!orderBy || orderBy !== 'custom') { params.orderAgg = null; + + if (orderBy === '_term') { + params.orderBy = '_term'; + return; + } + // ensure that orderBy is set to a valid agg if (!_.find($scope.responseValueAggs, { id: orderBy })) { params.orderBy = null; @@ -146,7 +137,12 @@ define(function (require) { output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type; } - if (!orderAgg || orderAgg.type.name === 'count') { + if (!orderAgg) { + order[agg.params.orderBy || '_count'] = dir; + return; + } + + if (orderAgg.type.name === 'count') { order._count = dir; return; } @@ -159,6 +155,21 @@ define(function (require) { output.subAggs = (output.subAggs || []).concat(orderAgg); order[orderAggId] = dir; } + }, + { + name: 'order', + type: 'optioned', + default: 'desc', + editor: require('text!components/agg_types/controls/order_and_size.html'), + options: [ + { display: 'Descending', val: 'desc' }, + { display: 'Ascending', val: 'asc' } + ], + write: _.noop // prevent default write, it's handled by orderAgg + }, + { + name: 'orderBy', + write: _.noop // prevent default write, it's handled by orderAgg } ] }); diff --git a/src/ui/components/agg_types/controls/field.html b/src/ui/components/agg_types/controls/field.html index 248e16adbf0d0..48cb9e23addcc 100644 --- a/src/ui/components/agg_types/controls/field.html +++ b/src/ui/components/agg_types/controls/field.html @@ -31,7 +31,7 @@

- No Compatible Fields: The "{{ vis.indexPattern.id }}" index pattern does not any of the following field types: {{ agg.type.params.byName.field.filterFieldTypes | commaList:false }} + No Compatible Fields: The "{{ vis.indexPattern.id }}" index pattern does not contain any of the following field types: {{ agg.type.params.byName.field.filterFieldTypes | commaList:false }}

diff --git a/src/ui/components/agg_types/controls/order_agg.html b/src/ui/components/agg_types/controls/order_agg.html index 16c4e6a50f2df..2b44fe77fbd74 100644 --- a/src/ui/components/agg_types/controls/order_agg.html +++ b/src/ui/components/agg_types/controls/order_agg.html @@ -15,6 +15,9 @@ +
diff --git a/src/ui/components/config/defaults.js b/src/ui/components/config/defaults.js index 7ca0b686ed19a..819c4cf7a0e9b 100644 --- a/src/ui/components/config/defaults.js +++ b/src/ui/components/config/defaults.js @@ -128,6 +128,14 @@ define(function () { 'format:currency:defaultPattern': { type: 'string', value: '($0,0.[00])' + }, + 'timepicker:timeDefaults': { + type: 'json', + value: JSON.stringify({ + from: 'now-15m', + to: 'now', + mode: 'quick' + }, null, 2) } }; }; diff --git a/src/ui/components/timefilter/timefilter.js b/src/ui/components/timefilter/timefilter.js index 7414b6fa38f6e..a03575650158a 100644 --- a/src/ui/components/timefilter/timefilter.js +++ b/src/ui/components/timefilter/timefilter.js @@ -1,7 +1,7 @@ define(function (require) { require('modules') .get('kibana') - .service('timefilter', function (Private, globalState, $rootScope) { + .service('timefilter', function (Private, globalState, $rootScope, config) { var _ = require('lodash'); var angular = require('angular'); @@ -27,11 +27,7 @@ self.enabled = false; - var timeDefaults = { - from: 'now-15m', - to: 'now', - mode: 'quick' - }; + var timeDefaults = config.get('timepicker:timeDefaults'); var refreshIntervalDefaults = { display: 'Off', diff --git a/tasks/config/licenses.js b/tasks/config/licenses.js index de23a78e84853..66939cc045b6a 100644 --- a/tasks/config/licenses.js +++ b/tasks/config/licenses.js @@ -34,7 +34,8 @@ module.exports = function (grunt) { 'FileSaver@undefined': ['MIT'], 'cycle@1.0.3': ['Public-Domain'], 'pkginfo@0.2.3': ['MIT'], - 'uglify-js@2.2.5': ['BSD'] + 'uglify-js@2.2.5': ['BSD'], + 'amdefine@0.1.1': ['BSD-3-Clause', 'MIT'] } } }; diff --git a/tasks/licenses.js b/tasks/licenses.js index 96455923e7c85..034e057148cc3 100644 --- a/tasks/licenses.js +++ b/tasks/licenses.js @@ -37,11 +37,12 @@ module.exports = function (grunt) { var invalidLicenses = _.filter(licenseStats, function (pkg) { return !pkg.valid;}); if (grunt.option('only-invalid')) { - console.log(invalidLicenses); + grunt.log.debug(JSON.stringify(invalidLicenses, null, 2)); } else { - console.log(licenseStats); + grunt.log.debug(JSON.stringify(licenseStats, null, 2)); } + if (invalidLicenses.length) { grunt.fail.warn('Non-confirming licenses: ' + _.pluck(invalidLicenses, 'name').join(', ') + '. Use --only-invalid for details.', invalidLicenses.length);