Merge branch 'master' of github.com:elasticsearch/kibana into fix/license-spam

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.

src/kibana/components/agg_response/tabify/_response_writer.js

@@ -72,7 +72,7 @@ define(function (require) {
       if (group) {
         table.aggConfig = agg;
         table.key = key;
-        table.title = agg.makeLabel() + ': ' + (table.fieldFormatter()(key));
+        table.title =  (table.fieldFormatter()(key)) + ': ' + agg.makeLabel() ;
       }
 
       // link the parent and child

src/kibana/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
         }
       ]
     });

src/kibana/components/agg_types/controls/field.html

@@ -31,7 +31,7 @@
   <div class="hintbox" ng-if="!indexedFields.length">
     <p>
       <i class="fa fa-danger text-danger"></i>
-      <strong>No Compatible Fields:</strong> The "{{ vis.indexPattern.id }}" index pattern does not any of the following field types: {{ agg.type.params.byName.field.filterFieldTypes | commaList:false }}
+      <strong>No Compatible Fields:</strong> The "{{ vis.indexPattern.id }}" index pattern does not contain any of the following field types: {{ agg.type.params.byName.field.filterFieldTypes | commaList:false }}
     </p>
   </div>
 

src/kibana/components/agg_types/controls/order_agg.html

@@ -15,6 +15,9 @@
       <option value="custom" ng-selected="agg.params.orderBy === 'custom'">
         Custom Metric
       </option>
+       <option value="_term" ng-selected="agg.params.orderBy === '_term'">
+        Term
+      </option>
     </select>
   </div>
   <div ng-show="agg.params.orderAgg" class="vis-editor-agg-order-agg">

src/kibana/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)
       }
     };
   };

src/kibana/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',