[aggConfig] allow mutliple metrics to be written in the DSL

src/kibana/components/vis/_agg_configs.js

@@ -48,14 +48,17 @@ define(function (require) {
       var nestedMetric;
 
       if (this.vis.isHierarchical()) {
-        // collect the metric agg that we will copy under each bucket agg
-        var nestedMetricConfig = _.first(this.vis.aggs.bySchemaGroup.metrics);
-        if (nestedMetricConfig.type.name !== 'count') {
-          nestedMetric = {
-            config: nestedMetricConfig,
-            dsl: nestedMetricConfig.toDsl()
+        // collect all metrics, and filter out the ones that we won't be copying
+        var nestedMetrics = _(this.vis.aggs.bySchemaGroup.metrics)
+        .filter(function (agg) {
+          return agg.type.name !== 'count';
+        })
+        .map(function (agg) {
+          return {
+            config: agg,
+            dsl: agg.toDsl()
           };
-        }
+        });
       }
 
       this.getSorted()
@@ -84,8 +87,10 @@ define(function (require) {
           subAggs = dsl.aggs || (dsl.aggs = {});
         }
 
-        if (subAggs && nestedMetric) {
-          subAggs[nestedMetric.config.id] = nestedMetric.dsl;
+        if (subAggs && nestedMetrics) {
+          nestedMetrics.forEach(function (agg) {
+            subAggs[agg.config.id] = agg.dsl;
+          });
         }
       });