From 5719ea85db25babcb36dbc0a1d8c8e8004b77511 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Thu, 21 Nov 2013 22:36:43 +0100 Subject: [PATCH] Hiding hidden indices by default (option to show). --- panels/stats_table/editor.html | 8 ++++++- panels/stats_table/module.js | 41 ++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/panels/stats_table/editor.html b/panels/stats_table/editor.html index 1126010375fd..a7db33f7b1d6 100644 --- a/panels/stats_table/editor.html +++ b/panels/stats_table/editor.html @@ -10,11 +10,17 @@ -
+
+
+
+ + +
+
diff --git a/panels/stats_table/module.js b/panels/stats_table/module.js index 500c2d8e7720..260532982373 100644 --- a/panels/stats_table/module.js +++ b/panels/stats_table/module.js @@ -18,7 +18,7 @@ define([ modals: [], editorTabs: [], status: "Experimental", - description: "An overview of cluster health, by node." + description: "A stats table for nodes or nodes" }; // Set and populate defaults @@ -41,7 +41,8 @@ define([ defaults: { display_field: "node.name", persistent_field: "node.transport_address", - metrics: [ 'process.cpu.percent', 'os.load_average.1m', 'os.mem.used_percent', 'fs.data.available_in_bytes' ] + metrics: [ 'process.cpu.percent', 'os.load_average.1m', 'os.mem.used_percent', 'fs.data.available_in_bytes' ], + show_hidden: true }, availableMetrics: [ { @@ -88,7 +89,8 @@ define([ defaults: { display_field: null, persistent_field: 'index', - metrics: [ 'primaries.docs.count', 'primaries.indexing.index_total', 'total.search.query_total', 'total.merges.current' ] + metrics: [ 'primaries.docs.count', 'primaries.indexing.index_total', 'total.search.query_total', 'total.merges.current' ], + show_hidden: false }, availableMetrics: [ { @@ -142,10 +144,14 @@ define([ return m; }; + _.defaults($scope.panel, $scope.modeInfo[$scope.panel.mode].defaults); + + $scope.panel.metrics = _.map($scope.panel.metrics, function (m) { return metricDefaults(m); }); + $scope.$watch('panel.mode', function (m) { if (_.isUndefined(m)) { return; @@ -158,6 +164,10 @@ define([ _.throttle($scope.get_rows(), 500); }); + $scope.$watch('panel.show_hidden', function () { + _.throttle($scope.get_rows(), 500); + }); + $scope.init = function () { $scope.warnLevels = {}; $scope.rows = []; @@ -178,19 +188,24 @@ define([ var request, filter, - results; + results, + facet; filter = filterSrv.getBoolFilter(filterSrv.ids); filter.must($scope.get_mode_filter()); request = $scope.ejs.Request().indices(dashboard.indices).size(0).searchType("count"); - request.facet( - $scope.ejs.TermsFacet('terms') - .field($scope.panel.persistent_field) - .size(9999999) - .order('term') - .facetFilter(filter) - ); + facet = $scope.ejs.TermsFacet('terms') + .field($scope.panel.persistent_field) + .size(9999999) + .order('term') + .facetFilter(filter); + + if (!$scope.panel.show_hidden) { + facet.regex("[^.].*"); + } + + request.facet(facet); results = request.doSearch(); @@ -370,7 +385,9 @@ define([ }; $scope.get_sort_value = function (row) { - if ($scope.panel.sort[0] === '__name__') return row.display_name; + if ($scope.panel.sort[0] === '__name__') { + return row.display_name; + } return $scope.data[row.id + '_' + $scope.panel.sort[0]].mean; };