Merge branch 'master' into fix/elastic#1962

stormpython · Feb 5, 2015 · 80cc4f8 · 80cc4f8
2 parents 63717da + ed6d88a
commit 80cc4f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/kibana/plugins/vis_types/vislib/pie.js b/src/kibana/plugins/vis_types/vislib/pie.js
@@ -27,7 +27,7 @@ define(function (require) {
           title: 'Slice Size',
           min: 1,
           max: 1,
-          aggFilter: ['sum', 'count'],
+          aggFilter: ['sum', 'count', 'cardinality'],
           defaults: [
             { schema: 'metric', type: 'count' }
           ]

diff --git a/src/kibana/plugins/vis_types/vislib/tile_map.js b/src/kibana/plugins/vis_types/vislib/tile_map.js
@@ -26,6 +26,7 @@ define(function (require) {
           title: 'Value',
           min: 1,
           max: 1,
+          aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'],
           defaults: [
             { schema: 'metric', type: 'count' }
           ]