Merge remote-tracking branch 'upstream/master' into feature/3270/statusPage

2015-06-25 08:47:44 -04:00 · 2015-06-25 08:47:44 -04:00 · 270cd5c659
parent ee53512d83 de6a29fdad
commit 270cd5c659
77 changed files with 136 additions and 139 deletions
--- a/src/kibana/components/agg_response/geo_json/rowsToFeatures.js
+++ b/src/kibana/components/agg_response/geo_json/rowsToFeatures.js
@ -1,6 +1,6 @@
 define(function (require) {
  var decodeGeoHash = require('utils/decode_geo_hash');
-  var AggConfigResult = require('components/vis/_agg_config_result');
+  var AggConfigResult = require('components/vis/AggConfigResult');
  var _ = require('lodash');

  function getAcr(val) {
--- a/src/kibana/components/agg_response/hierarchical/_transform_aggregation.js
+++ b/src/kibana/components/agg_response/hierarchical/_transform_aggregation.js
@ -2,7 +2,7 @@ define(function (require) {
  var _ = require('lodash');
  var extractBuckets = require('components/agg_response/hierarchical/_extract_buckets');
  return function transformAggregationProvider(Private) {
-    var AggConfigResult = require('components/vis/_agg_config_result');
+    var AggConfigResult = require('components/vis/AggConfigResult');
    return function transformAggregation(agg, metric, aggData, parent) {
      return _.map(extractBuckets(aggData), function (bucket) {
        var aggConfigResult = new AggConfigResult(
--- a/src/kibana/components/agg_response/hierarchical/build_hierarchical_data.js
+++ b/src/kibana/components/agg_response/hierarchical/build_hierarchical_data.js
@ -7,7 +7,7 @@ define(function (require) {
    var arrayToLinkedList = require('components/agg_response/hierarchical/_array_to_linked_list');
    var tooltipFormatter = Private(require('components/agg_response/hierarchical/_hierarchical_tooltip_formatter'));

-    var AggConfigResult = require('components/vis/_agg_config_result');
+    var AggConfigResult = require('components/vis/AggConfigResult');

    var notify = new Notifier({
      location: 'Pie chart response converter'
--- a/src/kibana/components/agg_response/point_series/_fake_x_aspect.js
+++ b/src/kibana/components/agg_response/point_series/_fake_x_aspect.js
@ -1,6 +1,6 @@
 define(function (require) {
  return function PointSeriesFakeXAxis(Private) {
-    var AggConfig = Private(require('components/vis/_agg_config'));
+    var AggConfig = Private(require('components/vis/AggConfig'));
    var AggType = Private(require('components/agg_types/_agg_type'));

    var allAgg = new AggType({
--- a/src/kibana/components/agg_response/tabify/_get_columns.js
+++ b/src/kibana/components/agg_response/tabify/_get_columns.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function GetColumnsProvider(Private) {
    var _ = require('lodash');
-    var AggConfig = Private(require('components/vis/_agg_config'));
+    var AggConfig = Private(require('components/vis/AggConfig'));

    return function getColumns(vis, minimal) {
      var aggs = vis.aggs.getResponseAggs();
--- a/src/kibana/components/agg_response/tabify/_response_writer.js
+++ b/src/kibana/components/agg_response/tabify/_response_writer.js
@ -5,7 +5,7 @@ define(function (require) {
    var TableGroup = Private(require('components/agg_response/tabify/_table_group'));
    var getColumns = Private(require('components/agg_response/tabify/_get_columns'));

-    var AggConfigResult = require('components/vis/_agg_config_result');
+    var AggConfigResult = require('components/vis/AggConfigResult');

    _.class(SplitAcr).inherits(AggConfigResult);
    function SplitAcr(agg, parent, key) {
@ -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
--- a/src/kibana/components/agg_response/tabify/tabify.js
+++ b/src/kibana/components/agg_response/tabify/tabify.js
@ -2,7 +2,7 @@ define(function (require) {
  return function tabifyAggResponseProvider(Private, Notifier) {
    var _ = require('lodash');

-    var AggConfig = Private(require('components/vis/_agg_config'));
+    var AggConfig = Private(require('components/vis/AggConfig'));
    var TabbedAggResponseWriter = Private(require('components/agg_response/tabify/_response_writer'));
    var Buckets = Private(require('components/agg_response/tabify/_buckets'));
    var notify = new Notifier({ location: 'agg_response/tabify'});
--- a/src/kibana/components/agg_types/buckets/create_filter/date_range.js
+++ b/src/kibana/components/agg_types/buckets/create_filter/date_range.js
@ -10,6 +10,7 @@ define(function (require) {
      var filter = {};
      if (range.from) filter.gte = +range.from;
      if (range.to) filter.lt = +range.to;
+      if (range.to && range.from) filter.format = 'epoch_millis';

      return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
    };
--- a/src/kibana/components/agg_types/buckets/date_histogram.js
+++ b/src/kibana/components/agg_types/buckets/date_histogram.js
@ -93,8 +93,7 @@ define(function (require) {
            var interval = agg.buckets.getInterval();
            output.bucketInterval = interval;
            output.params.interval = interval.expression;
-            output.params.pre_zone = tzOffset;
-            output.params.pre_zone_adjust_large_interval = true;
+            output.params.time_zone = tzOffset;

            var scaleMetrics = interval.scaled && interval.scale < 1;
            if (scaleMetrics) {
--- a/src/kibana/components/agg_types/buckets/terms.js
+++ b/src/kibana/components/agg_types/buckets/terms.js
@ -3,8 +3,8 @@ define(function (require) {
    var _ = require('lodash');
    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
    var bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
-    var AggConfig = Private(require('components/vis/_agg_config'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var AggConfig = Private(require('components/vis/AggConfig'));
+    var Schemas = Private(require('components/vis/Schemas'));
    var createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));

    var orderAggSchema = (new Schemas([
--- a/src/kibana/components/courier/data_source/search_source.js
+++ b/src/kibana/components/courier/data_source/search_source.js
@ -170,11 +170,20 @@ define(function (require) {
        return;
      case 'source':
        key = '_source';
-        /* fall through */
+        addToBody();
+        break;
      case 'sort':
        val = normalizeSortRequest(val, this.get('index'));
-        /* fall through */
+        addToBody();
+        break;
      default:
+        addToBody();
+      }
+
+      /**
+       * Add the key and val to the body of the resuest
+       */
+      function addToBody() {
        state.body = state.body || {};
        // ignore if we already have a value
        if (state.body[key] == null) {
--- a/src/kibana/components/template_vis_type/TemplateRenderbot.js
+++ b/src/kibana/components/template_vis_type/TemplateRenderbot.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function TemplateRenderbotFactory(Private, $compile, $rootScope) {
    var _ = require('lodash');
-    var Renderbot = Private(require('plugins/vis_types/_renderbot'));
+    var Renderbot = Private(require('components/vis/Renderbot'));

    _.class(TemplateRenderbot).inherits(Renderbot);
    function TemplateRenderbot(vis, $el) {
--- a/src/kibana/components/template_vis_type/TemplateVisType.js
+++ b/src/kibana/components/template_vis_type/TemplateVisType.js
@ -1,8 +1,8 @@
 define(function (require) {
  return function TemplateVisTypeFactory(Private) {
    var _ = require('lodash');
-    var VisType = Private(require('plugins/vis_types/_vis_type'));
-    var TemplateRenderbot = Private(require('plugins/vis_types/template/_template_renderbot'));
+    var VisType = Private(require('components/vis/VisType'));
+    var TemplateRenderbot = Private(require('components/template_vis_type/TemplateRenderbot'));

    _.class(TemplateVisType).inherits(VisType);
    function TemplateVisType(opts) {
--- a/src/kibana/components/timefilter/timefilter.js
+++ b/src/kibana/components/timefilter/timefilter.js
@ -83,7 +83,8 @@
        filter = {range : {}};
        filter.range[timefield.name] = {
          gte: bounds.min.valueOf(),
-          lte: bounds.max.valueOf()
+          lte: bounds.max.valueOf(),
+          format: 'epoch_millis'
        };
      }

--- a/src/kibana/components/vis/_agg_config.js
+++ b/src/kibana/components/vis/_agg_config.js
--- a/src/kibana/components/vis/_agg_config_result.js
+++ b/src/kibana/components/vis/_agg_config_result.js
--- a/src/kibana/components/vis/_agg_configs.js
+++ b/src/kibana/components/vis/_agg_configs.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function AggConfigsFactory(Private) {
    var _ = require('lodash');
-    var AggConfig = Private(require('components/vis/_agg_config'));
+    var AggConfig = Private(require('components/vis/AggConfig'));
    var IndexedArray = require('utils/indexed_array/index');

    AggConfig.aggTypes = Private(require('components/agg_types/index'));
--- a/src/kibana/plugins/vis_types/_renderbot.js
+++ b/src/kibana/plugins/vis_types/_renderbot.js
--- a/src/kibana/plugins/vis_types/_schemas.js
+++ b/src/kibana/plugins/vis_types/_schemas.js
@ -18,9 +18,9 @@ define(function (require) {
              default: true
            }
          ];
-          schema.editor = require('text!plugins/vis_types/controls/rows_or_columns.html');
+          schema.editor = require('text!plugins/kbn_vislib_vis_types/controls/rows_or_columns.html');
        } else if (schema.name === 'radius') {
-          schema.editor = require('text!plugins/vis_types/controls/radius_ratio_option.html');
+          schema.editor = require('text!plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html');
        }

        _.defaults(schema, {
--- a/src/kibana/plugins/vis_types/_vis_type.js
+++ b/src/kibana/plugins/vis_types/_vis_type.js
@ -1,6 +1,6 @@
 define(function (require) {
  return function VisTypeFactory(Private) {
-    var VisTypeSchemas = Private(require('plugins/vis_types/_schemas'));
+    var VisTypeSchemas = Private(require('components/vis/Schemas'));

    function VisType(opts) {
      opts = opts || {};
--- a/src/kibana/components/vis/vis.js
+++ b/src/kibana/components/vis/vis.js
@ -3,7 +3,7 @@ define(function (require) {
    var _ = require('lodash');
    var aggTypes = Private(require('components/agg_types/index'));
    var visTypes = Private(require('registry/vis_types'));
-    var AggConfigs = Private(require('components/vis/_agg_configs'));
+    var AggConfigs = Private(require('components/vis/AggConfigs'));

    var notify = new Notifier({
      location: 'Vis'
--- a/src/kibana/components/vislib_vis_type/VislibRenderbot.js
+++ b/src/kibana/components/vislib_vis_type/VislibRenderbot.js
@ -1,8 +1,8 @@
 define(function (require) {
  return function VislibRenderbotFactory(Private, vislib) {
    var _ = require('lodash');
-    var Renderbot = Private(require('plugins/vis_types/_renderbot'));
-    var buildChartData = Private(require('plugins/vis_types/vislib/_build_chart_data'));
+    var Renderbot = Private(require('components/vis/Renderbot'));
+    var buildChartData = Private(require('components/vislib_vis_type/buildChartData'));

    _.class(VislibRenderbot).inherits(Renderbot);
    function VislibRenderbot(vis, $el) {
--- a/src/kibana/plugins/vis_types/vislib/_vislib_vis_type.js
+++ b/src/kibana/plugins/vis_types/vislib/_vislib_vis_type.js
@ -2,15 +2,14 @@ define(function (require) {
  return function VislibVisTypeFactory(Private) {
    var _ = require('lodash');

-    var VisTypeSchemas = Private(require('plugins/vis_types/_schemas'));
-    var VisType = Private(require('plugins/vis_types/_vis_type'));
+    var VisTypeSchemas = Private(require('components/vis/Schemas'));
+    var VisType = Private(require('components/vis/VisType'));
    var pointSeries = Private(require('components/agg_response/point_series/point_series'));
-    var VislibRenderbot = Private(require('plugins/vis_types/vislib/_vislib_renderbot'));
+    var VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));

-    require('plugins/vis_types/controls/vislib_basic_options');
-    require('plugins/vis_types/controls/point_series_options');
-    require('plugins/vis_types/controls/line_interpolation_option');
-    require('plugins/vis_types/controls/point_series_options');
+    require('plugins/kbn_vislib_vis_types/controls/vislib_basic_options');
+    require('plugins/kbn_vislib_vis_types/controls/point_series_options');
+    require('plugins/kbn_vislib_vis_types/controls/line_interpolation_option');

    _.class(VislibVisType).inherits(VisType);
    function VislibVisType(opts) {
--- a/src/kibana/plugins/vis_types/vislib/_build_chart_data.js
+++ b/src/kibana/plugins/vis_types/vislib/_build_chart_data.js
--- a/src/kibana/directives/rows.js
+++ b/src/kibana/directives/rows.js
@ -2,7 +2,7 @@ define(function (require) {
  var $ = require('jquery');
  var _ = require('lodash');
  var module = require('modules').get('kibana');
-  var AggConfigResult = require('components/vis/_agg_config_result');
+  var AggConfigResult = require('components/vis/AggConfigResult');

  module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) {
    var filterBarClickHandler = Private(require('components/filter_bar/filter_bar_click_handler'));
--- a/src/kibana/index.js
+++ b/src/kibana/index.js
@ -34,7 +34,7 @@ define(function (require) {
    // Use this for cache busting partials
    .constant('cacheBust', window.KIBANA_COMMIT_SHA)
    // The minimum Elasticsearch version required to run Kibana
-    .constant('minimumElasticsearchVersion', '1.4.4')
+    .constant('minimumElasticsearchVersion', '2.0.0')
    // When we need to identify the current session of the app, ef shard preference
    .constant('sessionId', Date.now())
    // attach the route manager's known routes
--- a/src/kibana/plugins/kbn_vislib_vis_types/area.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/area.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('plugins/vis_types/vislib/_vislib_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    return new VislibVisType({
      name: 'area',
@ -28,7 +28,7 @@ define(function (require) {
        },
        scales: ['linear', 'log', 'square root'],
        modes: ['stacked', 'overlap', 'percentage', 'wiggle', 'silhouette'],
-        editor: require('text!plugins/vis_types/vislib/editors/area.html')
+        editor: require('text!plugins/kbn_vislib_vis_types/editors/area.html')
      },
      schemas: new Schemas([
        {
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.js
@ -6,7 +6,7 @@ define(function (require) {
  module.directive('lineInterpolationOption', function ($parse, $compile) {
    return {
      restrict: 'E',
-      template: require('text!plugins/vis_types/controls/line_interpolation_option.html'),
+      template: require('text!plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html'),
      replace: true
    };
  });
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.js
@ -7,7 +7,7 @@ define(function (require) {
  module.directive('pointSeriesOptions', function ($parse, $compile) {
    return {
      restrict: 'E',
-      template: require('text!plugins/vis_types/controls/point_series_options.html'),
+      template: require('text!plugins/kbn_vislib_vis_types/controls/point_series_options.html'),
      replace: true
    };
  });
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/rows_or_columns.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/rows_or_columns.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.js
@ -6,7 +6,7 @@ define(function (require) {
  module.directive('vislibBasicOptions', function ($parse, $compile) {
    return {
      restrict: 'E',
-      template: require('text!plugins/vis_types/controls/vislib_basic_options.html'),
+      template: require('text!plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html'),
      replace: true
    };
  });
--- a/src/kibana/plugins/kbn_vislib_vis_types/editors/area.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/editors/area.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/editors/histogram.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/editors/histogram.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/editors/line.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/editors/line.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/editors/pie.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/editors/pie.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/editors/tile_map.html
+++ b/src/kibana/plugins/kbn_vislib_vis_types/editors/tile_map.html
--- a/src/kibana/plugins/kbn_vislib_vis_types/histogram.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/histogram.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('plugins/vis_types/vislib/_vislib_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    return new VislibVisType({
      name: 'histogram',
@ -24,7 +24,7 @@ define(function (require) {
        },
        scales: ['linear', 'log', 'square root'],
        modes: ['stacked', 'percentage', 'grouped'],
-        editor: require('text!plugins/vis_types/vislib/editors/histogram.html')
+        editor: require('text!plugins/kbn_vislib_vis_types/editors/histogram.html')
      },
      schemas: new Schemas([
        {
--- a/src/kibana/plugins/kbn_vislib_vis_types/index.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/index.js
@ -0,0 +1,8 @@
+define(function (require) {
+  var visTypes = require('registry/vis_types');
+  visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/area'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap'));
+});
--- a/src/kibana/plugins/kbn_vislib_vis_types/line.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/line.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('plugins/vis_types/vislib/_vislib_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    return new VislibVisType({
      name: 'line',
@ -27,7 +27,7 @@ define(function (require) {
          yAxis: {}
        },
        scales: ['linear', 'log', 'square root'],
-        editor: require('text!plugins/vis_types/vislib/editors/line.html')
+        editor: require('text!plugins/kbn_vislib_vis_types/editors/line.html')
      },
      schemas: new Schemas([
        {
--- a/src/kibana/plugins/kbn_vislib_vis_types/pie.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/pie.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('plugins/vis_types/vislib/_vislib_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    return new VislibVisType({
      name: 'pie',
@ -16,7 +16,7 @@ define(function (require) {
          addLegend: true,
          isDonut: false
        },
-        editor: require('text!plugins/vis_types/vislib/editors/pie.html')
+        editor: require('text!plugins/kbn_vislib_vis_types/editors/pie.html')
      },
      responseConverter: false,
      hierarchicalData: true,
--- a/src/kibana/plugins/kbn_vislib_vis_types/tileMap.js
+++ b/src/kibana/plugins/kbn_vislib_vis_types/tileMap.js
@ -1,7 +1,7 @@
 define(function (require) {
  return function TileMapVisType(Private, getAppState, courier, config) {
-    var VislibVisType = Private(require('plugins/vis_types/vislib/_vislib_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));
    var geoJsonConverter = Private(require('components/agg_response/geo_json/geo_json'));
    var _ = require('lodash');
    var supports = require('utils/supports');
@ -25,7 +25,7 @@ define(function (require) {
        },
        mapTypes: ['Scaled Circle Markers', 'Shaded Circle Markers', 'Shaded Geohash Grid', 'Heatmap'],
        canDesaturate: !!supports.cssFilters,
-        editor: require('text!plugins/vis_types/vislib/editors/tile_map.html')
+        editor: require('text!plugins/kbn_vislib_vis_types/editors/tile_map.html')
      },
      listeners: {
        rectangle: function (event) {
--- a/src/kibana/plugins/markdown_vis/markdown_vis.js
+++ b/src/kibana/plugins/markdown_vis/markdown_vis.js
@ -6,7 +6,7 @@ define(function (require) {
  require('plugins/markdown_vis/markdown_vis_controller');

  return function (Private) {
-    var TemplateVisType = Private(require('plugins/vis_types/template/template_vis_type'));
+    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));

    // return the visType object, which kibana will use to display and configure new
    // Vis object of this type.
@ -22,4 +22,4 @@ define(function (require) {
      requiresSearch: false
    });
  };
-});
+});
--- a/src/kibana/plugins/metric_vis/metric_vis.js
+++ b/src/kibana/plugins/metric_vis/metric_vis.js
@ -6,8 +6,8 @@ define(function (require) {
  require('plugins/metric_vis/metric_vis_controller');

  return function (Private) {
-    var TemplateVisType = Private(require('plugins/vis_types/template/template_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    // return the visType object, which kibana will use to display and configure new
    // Vis object of this type.
@ -37,4 +37,4 @@ define(function (require) {
      ])
    });
  };
-});
+});
--- a/src/kibana/plugins/table_vis/table_vis.js
+++ b/src/kibana/plugins/table_vis/table_vis.js
@ -14,8 +14,8 @@ define(function (require) {

  // define the TableVisType
  return function TableVisTypeProvider(Private) {
-    var TemplateVisType = Private(require('plugins/vis_types/template/template_vis_type'));
-    var Schemas = Private(require('plugins/vis_types/_schemas'));
+    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));
+    var Schemas = Private(require('components/vis/Schemas'));

    // define the TableVisController which is used in the template
    // by angular's ng-controller directive
@ -63,4 +63,4 @@ define(function (require) {
      ])
    });
  };
-});
+});
--- a/src/kibana/plugins/vis_types/index.js
+++ b/src/kibana/plugins/vis_types/index.js
@ -1,8 +0,0 @@
-define(function (require) {
-  var visTypes = require('registry/vis_types');
-  visTypes.register(require('plugins/vis_types/vislib/histogram'));
-  visTypes.register(require('plugins/vis_types/vislib/line'));
-  visTypes.register(require('plugins/vis_types/vislib/pie'));
-  visTypes.register(require('plugins/vis_types/vislib/area'));
-  visTypes.register(require('plugins/vis_types/vislib/tile_map'));
-});
--- a/src/kibana/plugins/visualize/editor/agg_add.js
+++ b/src/kibana/plugins/visualize/editor/agg_add.js
@ -2,7 +2,7 @@ define(function (require) {
  require('modules')
  .get('kibana')
  .directive('visEditorAggAdd', function (Private) {
-    var AggConfig = Private(require('components/vis/_agg_config'));
+    var AggConfig = Private(require('components/vis/AggConfig'));

    return {
      restrict: 'E',
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@ -7,10 +7,8 @@ module.exports = function (grunt) {
  return {
    options: {
      directory: directory,
-      version: '1.4.4',
-      plugins: [
-        'elasticsearch/marvel/latest'
-      ],
+      branch: 'master',
+      fresh: true,
      config: {
        path: {
          data: dataDir
--- a/test/unit/specs/components/agg_response/hierarchical/build_hierarchical_data.js
+++ b/test/unit/specs/components/agg_response/hierarchical/build_hierarchical_data.js
@ -18,7 +18,7 @@ define(function (require) {
      sinon.stub(Notifier.prototype, 'error');

      Vis = Private(require('components/vis/vis'));
-      AggConfigs = Private(require('components/vis/_agg_configs'));
+      AggConfigs = Private(require('components/vis/AggConfigs'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
      buildHierarchicalData = Private(require('components/agg_response/hierarchical/build_hierarchical_data'));
    }));
--- a/test/unit/specs/components/agg_response/hierarchical/create_raw_data.js
+++ b/test/unit/specs/components/agg_response/hierarchical/create_raw_data.js
@ -16,7 +16,7 @@ define(function (require) {

      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfigs = Private(require('components/vis/_agg_configs'));
+        AggConfigs = Private(require('components/vis/AggConfigs'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
      }));

--- a/test/unit/specs/components/agg_response/point_series/_fake_x_aspect.js
+++ b/test/unit/specs/components/agg_response/point_series/_fake_x_aspect.js
@ -10,7 +10,7 @@ define(function (require) {
    beforeEach(module('kibana'));
    beforeEach(inject(function (Private) {
      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      AggType = Private(require('components/agg_types/_agg_type'));
      indexPattern = Private(require('components/vis/vis'));
      makeFakeXAspect = Private(require('components/agg_response/point_series/_fake_x_aspect'));
--- a/test/unit/specs/components/agg_response/point_series/_get_aspects.js
+++ b/test/unit/specs/components/agg_response/point_series/_get_aspects.js
@ -13,7 +13,7 @@ define(function (require) {
    beforeEach(inject(function (Private) {
      Vis = Private(require('components/vis/vis'));
      Table = Private(require('components/agg_response/point_series/_add_to_siri'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      getAspects = Private(require('components/agg_response/point_series/_get_aspects'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
    }));
--- a/test/unit/specs/components/agg_response/point_series/_main.js
+++ b/test/unit/specs/components/agg_response/point_series/_main.js
@ -4,7 +4,7 @@ define(function (require) {

    var _ = require('lodash');
    var moment = require('moment');
-    var AggConfigResult = require('components/vis/_agg_config_result');
+    var AggConfigResult = require('components/vis/AggConfigResult');

    var pointSeriesChartDataFromTable;
    var indexPattern;
--- a/test/unit/specs/components/agg_types/_agg_type.js
+++ b/test/unit/specs/components/agg_types/_agg_type.js
@ -20,7 +20,7 @@ define(function (require) {
      Vis = Private(require('components/vis/vis'));
      fieldFormat = Private(require('registry/field_formats'));
      AggType = Private(require('components/agg_types/_agg_type'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
    }));

--- a/test/unit/specs/components/agg_types/_bucket_count_between.js
+++ b/test/unit/specs/components/agg_types/_bucket_count_between.js
@ -20,7 +20,7 @@ define(function (require) {
      Vis = Private(require('components/vis/vis'));
      visTypes = Private(require('registry/vis_types'));
      aggTypes = Private(require('components/agg_types/index'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
    }));

--- a/test/unit/specs/components/agg_types/buckets/create_filter/date_range.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/date_range.js
@ -10,7 +10,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/date_range'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/create_filter/filters.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/filters.js
@ -10,7 +10,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/filters'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/create_filter/histogram.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/histogram.js
@ -11,7 +11,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/histogram'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/create_filter/ip_range.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/ip_range.js
@ -9,7 +9,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/ip_range'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/create_filter/range.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/range.js
@ -9,7 +9,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/range'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/create_filter/terms.js
+++ b/test/unit/specs/components/agg_types/buckets/create_filter/terms.js
@ -9,7 +9,7 @@ define(function (require) {
      beforeEach(module('kibana'));
      beforeEach(inject(function (Private) {
        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/_agg_config'));
+        AggConfig = Private(require('components/vis/AggConfig'));
        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
        createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
      }));
--- a/test/unit/specs/components/agg_types/buckets/date_histogram/_params.js
+++ b/test/unit/specs/components/agg_types/buckets/date_histogram/_params.js
@ -19,7 +19,7 @@ define(function (require) {

      timeField = indexPattern.timeFieldName;
      aggTypes = Private(require('components/agg_types/index'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));

      paramWriter = new AggParamWriter({ aggType: 'date_histogram' });
      writeInterval = function (interval) {
--- a/test/unit/specs/components/agg_types/param_types/_calculate_interval.js
+++ b/test/unit/specs/components/agg_types/param_types/_calculate_interval.js
@ -10,7 +10,7 @@ define(function (require) {
    beforeEach(module('kibana'));
    beforeEach(inject(function (Private) {
      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
      calculateInterval = Private(require('components/agg_types/param_types/_calculate_interval'));
    }));
--- a/test/unit/specs/components/vis/_agg_config.js
+++ b/test/unit/specs/components/vis/_agg_config.js
@ -12,7 +12,7 @@ define(function (require) {
    beforeEach(inject(function (Private) {
      Vis = Private(require('components/vis/vis'));
      AggType = Private(require('components/agg_types/_agg_type'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
      fieldFormat = Private(require('registry/field_formats'));
    }));
--- a/test/unit/specs/components/vis/_agg_config_result.js
+++ b/test/unit/specs/components/vis/_agg_config_result.js
@ -1,8 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var AggConfigResult = require('components/vis/_agg_config_result');
-
-  describe('AggConfigResult', function () {
+  return ['AggConfigResult', function () {
+    var _ = require('lodash');
+    var AggConfigResult = require('components/vis/AggConfigResult');

    var AggConfig;
    var indexPattern;
@ -11,7 +10,7 @@ define(function (require) {
    beforeEach(module('kibana'));
    beforeEach(inject(function (Private) {
      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/_agg_config'));
+      AggConfig = Private(require('components/vis/AggConfig'));
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
    }));

@ -104,5 +103,5 @@ define(function (require) {
        });
      });
    });
-  });
+  }];
 });
--- a/test/unit/specs/components/vis/_agg_configs.js
+++ b/test/unit/specs/components/vis/_agg_configs.js
@ -14,7 +14,7 @@ define(function (require) {
    beforeEach(module('kibana'));
    beforeEach(inject(function (Private) {
      // replace the AggConfig module with a spy
-      var RealAggConfigPM = require('components/vis/_agg_config');
+      var RealAggConfigPM = require('components/vis/AggConfig');
      AggConfig = Private(RealAggConfigPM);
      var spy = sinon.spy(AggConfig);
      Object.defineProperty(spy, 'aggTypes', {
@ -26,11 +26,11 @@ define(function (require) {

      // load main deps
      Vis = Private(require('components/vis/vis'));
-      SpiedAggConfig = Private(require('components/vis/_agg_config'));
-      AggConfigs = Private(require('components/vis/_agg_configs'));
+      SpiedAggConfig = Private(require('components/vis/AggConfig'));
+      AggConfigs = Private(require('components/vis/AggConfigs'));
      IndexedArray = require('utils/indexed_array/index');
      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      Schemas = Private(require('plugins/vis_types/_schemas'));
+      Schemas = Private(require('components/vis/Schemas'));
    }));

    it('extends IndexedArray', function () {
--- a/test/unit/specs/plugins/vis_types/_renderbot.js
+++ b/test/unit/specs/plugins/vis_types/_renderbot.js
@ -1,14 +1,12 @@
 define(function (require) {
-  var Renderbot;
+  return ['renderbot', function () {
+    var Renderbot;

-  return ['renderbot', exportWrapper];
-
-  function exportWrapper() {
    function init() {
      module('kibana');

      inject(function (Private) {
-        Renderbot = Private(require('plugins/vis_types/_renderbot'));
+        Renderbot = Private(require('components/vis/Renderbot'));
      });
    }

@ -35,5 +33,5 @@ define(function (require) {
        expect(renderbot.destroy).to.throwError();
      });
    });
-  }
-});
+  }];
+});
--- a/test/unit/specs/components/vis/_Vis.js
+++ b/test/unit/specs/components/vis/_Vis.js
@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  return ['Vis Class', function () {

-  var indexPattern;
-  var Vis;
-  var visTypes;
+    var _ = require('lodash');

-  describe('Vis Class', function () {
+    var indexPattern;
+    var Vis;
+    var visTypes;

    var vis;
    var stateFixture = {
@ -103,5 +103,5 @@ define(function (require) {
      });
    });

-  });
+  }];
 });
--- a/test/unit/specs/components/vis/index.js
+++ b/test/unit/specs/components/vis/index.js
@ -1,6 +1,8 @@
 define(function (require) {
  describe('Vis Component', function () {
-    describe(require('specs/components/vis/_agg_config'));
-    describe(require('specs/components/vis/_agg_configs'));
+    describe(require('specs/components/vis/_AggConfig'));
+    describe(require('specs/components/vis/_AggConfigResult'));
+    describe(require('specs/components/vis/_AggConfigs'));
+    describe(require('specs/components/vis/_Vis'));
  });
 });
--- a/test/unit/specs/components/vislib_vis_type/_VislibRenderbot.js
+++ b/test/unit/specs/components/vislib_vis_type/_VislibRenderbot.js
@ -1,11 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  return ['renderbot', exportWrapper];
-
-  function exportWrapper() {
+  return ['renderbot', function exportWrapper() {
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var sinon = require('test_utils/auto_release_sinon');
    var vislib;
    var Vis;
    var Renderbot;
@ -21,8 +18,8 @@ define(function (require) {
      inject(function ($injector, Private, _vislib_) {
        vislib = _vislib_;
        Vis = Private(require('components/vislib/vis'));
-        Renderbot = Private(require('plugins/vis_types/_renderbot'));
-        VislibRenderbot = Private(require('plugins/vis_types/vislib/_vislib_renderbot'));
+        Renderbot = Private(require('components/vis/Renderbot'));
+        VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));
        normalizeChartData = Private(require('components/agg_response/index'));
      });
    }
@ -167,5 +164,5 @@ define(function (require) {
        expect(spy.callCount).to.be(1);
      });
    });
-  }
-});
+  }];
+});
--- a/test/unit/specs/components/vislib_vis_type/_buildChartData.js
+++ b/test/unit/specs/components/vislib_vis_type/_buildChartData.js
@ -14,8 +14,8 @@ define(function (require) {
      Table = Private(require('components/agg_response/tabify/_table'));
      TableGroup = Private(require('components/agg_response/tabify/_table_group'));
      aggResponse = Private(require('components/agg_response/index'));
-      VislibRenderbot = Private(require('plugins/vis_types/vislib/_vislib_renderbot'));
-      buildChartData = Private(require('plugins/vis_types/vislib/_build_chart_data'));
+      VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));
+      buildChartData = Private(require('components/vislib_vis_type/buildChartData'));
    }));

    describe('for hierarchical vis', function () {
--- a/test/unit/specs/components/vislib_vis_type/index.js
+++ b/test/unit/specs/components/vislib_vis_type/index.js
@ -0,0 +1,6 @@
+define(function (require) {
+  describe('Vis Type', function () {
+    describe(require('specs/components/vislib_vis_type/_VislibRenderbot'));
+    describe(require('specs/components/vislib_vis_type/_buildChartData'));
+  });
+});
--- a/test/unit/specs/plugins/vis_types/index.js
+++ b/test/unit/specs/plugins/vis_types/index.js
@ -1,6 +0,0 @@
-define(function (require) {
-  describe('Vis Type', function () {
-    describe(require('specs/plugins/vis_types/_renderbot'));
-    describe(require('specs/plugins/vis_types/vislib/_index'));
-  });
-});
--- a/test/unit/specs/plugins/vis_types/vislib/_index.js
+++ b/test/unit/specs/plugins/vis_types/vislib/_index.js
@ -1,6 +0,0 @@
-define(function (require) {
-  return ['Vislib', function () {
-    describe(require('specs/plugins/vis_types/vislib/_renderbot'));
-    describe(require('specs/plugins/vis_types/vislib/_build_chart_data'));
-  }];
-});