Merge branch 'master' into feature/ingest

src/plugins/kbn_vislib_vis_types/public/tile_map.js

@@ -5,6 +5,7 @@ import VisSchemasProvider from 'ui/vis/schemas';
 import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json';
 import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
 import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html';
+
 export default function TileMapVisType(Private, getAppState, courier, config) {
   const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
   const Schemas = Private(VisSchemasProvider);
@@ -120,6 +121,8 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
         group: 'buckets',
         name: 'split',
         title: 'Split Chart',
+        deprecate: true,
+        deprecateMessage: 'The Split Chart feature for Tile Maps has been deprecated.',
         min: 0,
         max: 1
       }

src/plugins/kibana/public/dashboard/index.html

@@ -1,5 +1,5 @@
 <div dashboard-app class="app-container dashboard-container">
-  <navbar name="dashboard-options" class="kibana-nav-options">
+  <navbar name="dashboard" class="kibana-nav-options">
     <div class="kibana-nav-info">
       <span ng-show="dash.id" class="kibana-nav-info-title">
         <span ng-bind="::dash.title"></span>
@@ -51,8 +51,8 @@
         ng-click="configTemplate.toggle('options');">
         <span>Options</span>
       </button>
-      <div class="chrome-actions"kbn-chrome-append-nav-controls></div>
     </div>
+    <div class="chrome-actions" kbn-chrome-append-nav-controls></div>
   </navbar>
   <config config-template="configTemplate" config-object="opts"></config>
 

src/plugins/kibana/public/discover/index.html

@@ -1,5 +1,5 @@
 <div ng-controller="discover" class="app-container">
-  <navbar name="discover-options" class="kibana-nav-options">
+  <navbar name="discover" class="kibana-nav-options">
     <div class="kibana-nav-info">
       <span ng-show="opts.savedSearch.id" class="kibana-nav-info-title">
         <span ng-bind="::opts.savedSearch.title"></span>
@@ -39,8 +39,8 @@
         ng-click="configTemplate.toggle('share');">
         <span>Share</span>
       </button>
-    <div class="chrome-actions" kbn-chrome-append-nav-controls></div>
     </div>
+    <div class="chrome-actions" kbn-chrome-append-nav-controls></div>
   </navbar>
   <config
     config-template="configTemplate"

src/plugins/kibana/public/visualize/editor/agg_add.html

@@ -2,6 +2,7 @@
   <label>Select {{ groupName }} type</label>
   <ul class="form-group list-group list-group-menu">
     <li
+      ng-hide="schema.deprecate"
       ng-repeat="schema in availableSchema"
       ng-click="add.submit(schema)"
       class="list-group-item list-group-menu-item">
@@ -18,10 +19,10 @@
   class="vis-editor-agg-wide-btn">
 
   <div ng-if="!add.form">
-    <div class="btn btn-sm btn-primary" ng-if="groupName !== 'buckets' || !stats.count">
+    <div class="btn btn-sm btn-primary" ng-if="groupName !== 'buckets' || !stats.count && !stats.deprecate">
       Add {{ groupName }}
     </div>
-    <div class="btn btn-sm btn-primary" ng-if="groupName === 'buckets' && stats.count > 0">
+    <div class="btn btn-sm btn-primary" ng-if="groupName === 'buckets' && stats.count > 0 && !stats.deprecate">
       Add sub-{{ groupName }}
     </div>
   </div>

src/plugins/kibana/public/visualize/editor/agg_group.js

@@ -33,6 +33,7 @@ uiModules
         $scope.schemas.forEach(function (schema) {
           stats.min += schema.min;
           stats.max += schema.max;
+          stats.deprecate = schema.deprecate;
         });
 
         $scope.availableSchema = $scope.schemas.filter(function (schema) {

src/plugins/kibana/public/visualize/editor/agg_params.html

@@ -10,4 +10,13 @@
     style="display: none;">
 </div>
 
-<!-- schema editors get added down here: aggSelect.html, agg_types/controls/*.html -->
+<div ng-if="agg.schema.deprecate" class="form-group">
+  <p ng-show="agg.schema.deprecateMessage" class="vis-editor-agg-error">
+    {{ agg.schema.deprecateMessage }}
+  </p>
+  <p ng-show="!agg.schema.deprecateMessage" class="vis-editor-agg-error">
+    "{{ agg.schema.title }}" has been deprecated.
+  </p>
+</div>
+
+<!-- schema editors get added down here: aggSelect.html, agg_types/controls/*.html -->

src/plugins/kibana/public/visualize/editor/editor.html

@@ -1,5 +1,5 @@
 <div ng-controller="VisEditor" class="app-container vis-editor vis-type-{{ vis.type.name }}">
-  <navbar name="visualize-options" class="kibana-nav-options" ng-if="chrome.getVisible()">
+  <navbar name="visualize" class="kibana-nav-options" ng-if="chrome.getVisible()">
     <div class="vis-editor-info">
       <span ng-show="savedVis.id" class="vis-editor-info-title">
         <span ng-bind="::savedVis.title"></span>
@@ -46,8 +46,8 @@
         aria-label="Refresh">
         <span>Refresh</span>
       </button>
-      <div class="chrome-actions"kbn-chrome-append-nav-controls></div>
     </div>
+    <div class="chrome-actions" kbn-chrome-append-nav-controls></div>
   </navbar>
   <config
     ng-if="chrome.getVisible()"

src/ui/public/vis/schemas.js

@@ -30,7 +30,8 @@ export default function VisTypeSchemasFactory(Private) {
         title: schema.name,
         aggFilter: '*',
         editor: false,
-        params: []
+        params: [],
+        deprecate: false
       });
 
       // convert the params into a params registry

tasks/jenkins.js

@@ -16,6 +16,7 @@ module.exports = function (grunt) {
     grunt.option('os-packages', true);
 
     grunt.task.run(compact([
+      'rejectRejFiles',
       'test',
       process.env.JOB_NAME === 'kibana_core' ? 'build' : null
     ]));

tasks/reject_rej_files.js

@@ -0,0 +1,30 @@
+import { startsWith } from 'lodash';
+
+// Fails if any .rej files are found
+// .rej files are an artifact from a failed git-apply or a jasper backport
+
+// This check is intentionally performed on the files in the repo rather than
+// on the files that are to be committed.
+
+export default grunt => {
+  grunt.registerTask('rejectRejFiles', 'Reject any git-apply .rej files', () => {
+    const ignoredTopLevelDirs = [
+      'esvm',
+      'installedPlugins',
+      'node_modules',
+      'optimize'
+    ];
+
+    const matchBase = true;
+    const filter = file => (
+      ignoredTopLevelDirs.every(dir => !startsWith(file, dir))
+    );
+
+    const files = grunt.file.expand({ filter, matchBase }, '*.rej');
+    if (files.length > 0) {
+      const err = `.rej files are not allowed:\n${files.join('\n')}`;
+      grunt.log.error(err);
+      return false;
+    }
+  });
+};

test/support/pages/discover_page.js

@@ -28,7 +28,7 @@ define(function (require) {
 
     getTimespanText: function getTimespanText() {
       return thisTime
-      .findByCssSelector('.kibana-nav-actions .navbar-timepicker-time-desc pretty-duration')
+      .findByCssSelector('.kibana-nav-options .navbar-timepicker-time-desc pretty-duration')
       .getVisibleText();
     },