From b10540f06f80854b45172d00e9f149a7b66355eb Mon Sep 17 00:00:00 2001 From: Chris Roberson Date: Mon, 4 Feb 2019 14:11:46 -0500 Subject: [PATCH] [Monitoring] Add default search fields for each table (#29748) * Add default search fields for each table * Remove custom schema * We don't need it here * Add ccr tables * Fix tests --- .../monitoring/public/components/alerts/alerts.js | 3 +++ .../public/components/apm/instances/instances.js | 3 +++ .../public/components/beats/listing/listing.js | 3 +++ .../public/components/cluster/listing/listing.js | 3 +++ .../elasticsearch/ccr/__snapshots__/ccr.test.js.snap | 9 ++++++++- .../public/components/elasticsearch/ccr/ccr.js | 6 ++++++ .../public/components/elasticsearch/indices/indices.js | 3 +++ .../public/components/elasticsearch/nodes/nodes.js | 3 +++ .../elasticsearch/shard_activity/shard_activity.js | 3 +++ .../public/components/logstash/listing/listing.js | 3 +++ .../logstash/pipeline_listing/pipeline_listing.js | 3 +++ .../directives/elasticsearch/ml_job_listing/index.js | 3 +++ .../monitoring/public/views/kibana/instances/index.js | 3 +++ 13 files changed, 47 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/monitoring/public/components/alerts/alerts.js b/x-pack/plugins/monitoring/public/components/alerts/alerts.js index 765aa6fc3e55..089314d08388 100644 --- a/x-pack/plugins/monitoring/public/components/alerts/alerts.js +++ b/x-pack/plugins/monitoring/public/components/alerts/alerts.js @@ -162,6 +162,9 @@ const AlertsUI = ({ alerts, angular, sorting, pagination, onTableChange, intl }) }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['message', 'category'] + }} /> ); }; diff --git a/x-pack/plugins/monitoring/public/components/apm/instances/instances.js b/x-pack/plugins/monitoring/public/components/apm/instances/instances.js index 52652230dcac..f43e896d89ce 100644 --- a/x-pack/plugins/monitoring/public/components/apm/instances/instances.js +++ b/x-pack/plugins/monitoring/public/components/apm/instances/instances.js @@ -130,6 +130,9 @@ export function ApmServerInstancesUI({ apms, intl }) { ] }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js index bc66c6074c30..54a6d3f4dd2a 100644 --- a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js +++ b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js @@ -126,6 +126,9 @@ class ListingUI extends PureComponent { ] }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name', 'type'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js index 4cebf48a01a1..911df086c4d3 100644 --- a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js +++ b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js @@ -455,6 +455,9 @@ export class Listing extends Component { }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['cluster_name'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap index fa62763f2fba..5551cf8e905c 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap @@ -50,7 +50,14 @@ exports[`Ccr that it renders normally 1`] = ` }, ] } - executeQueryOptions={Object {}} + executeQueryOptions={ + Object { + "defaultFields": Array [ + "index", + "follows", + ], + } + } itemId="id" itemIdToExpandedRowMap={Object {}} items={ diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js index 3ddbe31bcd37..33cc77482458 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js @@ -140,6 +140,9 @@ class CcrUI extends Component { ) } ]} + executeQueryOptions={{ + defaultFields: ['shardId'] + }} sorting={true} pagination={pagination} /> @@ -239,6 +242,9 @@ class CcrUI extends Component { ]} items={items} pagination={pagination} + executeQueryOptions={{ + defaultFields: ['index', 'follows'] + }} sorting={sorting} itemId="id" itemIdToExpandedRowMap={this.state.itemIdToExpandedRowMap} diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/indices/indices.js b/x-pack/plugins/monitoring/public/components/elasticsearch/indices/indices.js index fd878f1b4d02..8c25ffab8d0a 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/indices/indices.js +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/indices/indices.js @@ -182,6 +182,9 @@ const ElasticsearchIndicesUI = ({ }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js index 99dfa0be64d4..755d35358e37 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js @@ -229,6 +229,9 @@ function ElasticsearchNodesUI({ clusterStatus, nodes, showCgroupMetricsElasticse }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js index c12b1ed59921..06daffdbc173 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js @@ -155,6 +155,9 @@ class ShardActivityUI extends React.Component { search={false} pagination={pagination} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} /> ); diff --git a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js index 73ab862b4f0e..a050743aaf24 100644 --- a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js +++ b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js @@ -152,6 +152,9 @@ class ListingUI extends PureComponent { }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} /> diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js index 8bb69f6a9ef4..9a2d12925e83 100644 --- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js +++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js @@ -176,6 +176,9 @@ class PipelineListingUI extends Component { }, }} onTableChange={onTableChange} + executeQueryOptions={{ + defaultFields: ['id'] + }} /> diff --git a/x-pack/plugins/monitoring/public/directives/elasticsearch/ml_job_listing/index.js b/x-pack/plugins/monitoring/public/directives/elasticsearch/ml_job_listing/index.js index b7d6987163b5..284257e7144b 100644 --- a/x-pack/plugins/monitoring/public/directives/elasticsearch/ml_job_listing/index.js +++ b/x-pack/plugins/monitoring/public/directives/elasticsearch/ml_job_listing/index.js @@ -161,6 +161,9 @@ uiModule.directive('monitoringMlListing', kbnUrl => { }, }} onTableChange={scope.onTableChange} + executeQueryOptions={{ + defaultFields: ['job_id'] + }} /> diff --git a/x-pack/plugins/monitoring/public/views/kibana/instances/index.js b/x-pack/plugins/monitoring/public/views/kibana/instances/index.js index d33fd00680a4..bcdd5059ca77 100644 --- a/x-pack/plugins/monitoring/public/views/kibana/instances/index.js +++ b/x-pack/plugins/monitoring/public/views/kibana/instances/index.js @@ -169,6 +169,9 @@ uiRoutes.when('/kibana/instances', { }, }} onTableChange={this.onTableChange} + executeQueryOptions={{ + defaultFields: ['name'] + }} />