[Monitoring] Add default search fields for each table (elastic#29748) (…

…elastic#29981) * Add default search fields for each table * Remove custom schema * We don't need it here * Add ccr tables * Fix tests
chrisronline · Feb 4, 2019 · 58a9738 · 58a9738
1 parent b13074d
commit 58a9738
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 1 deletion.
diff --git 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
@@ -130,6 +130,9 @@ export function ApmServerInstancesUI({ apms, intl }) {
               ]
             }}
             onTableChange={onTableChange}
+            executeQueryOptions={{
+              defaultFields: ['name']
+            }}
           />
         </EuiPageContent>
       </EuiPageBody>

diff --git 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']
+              }}
             />
           </EuiPageContent>
         </EuiPageBody>

diff --git 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']
+              }}
             />
           </EuiPageContent>
         </EuiPageBody>

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
@@ -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
@@ -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
@@ -179,6 +179,9 @@ const ElasticsearchIndicesUI = ({
               },
             }}
             onTableChange={onTableChange}
+            executeQueryOptions={{
+              defaultFields: ['name']
+            }}
           />
         </EuiPageContent>
       </EuiPageBody>

diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
@@ -226,6 +226,9 @@ function ElasticsearchNodesUI({ clusterStatus, nodes, showCgroupMetricsElasticse
               },
             }}
             onTableChange={onTableChange}
+            executeQueryOptions={{
+              defaultFields: ['name']
+            }}
           />
         </EuiPageContent>
       </EuiPageBody>

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
@@ -155,6 +155,9 @@ class ShardActivityUI extends React.Component {
           search={false}
           pagination={pagination}
           onTableChange={onTableChange}
+          executeQueryOptions={{
+            defaultFields: ['name']
+          }}
         />
       </Fragment>
     );

diff --git a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
@@ -150,6 +150,9 @@ class ListingUI extends PureComponent {
                 },
               }}
               onTableChange={onTableChange}
+              executeQueryOptions={{
+                defaultFields: ['name']
+              }}
             />
           </EuiPageContent>
         </EuiPageBody>

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
@@ -174,6 +174,9 @@ class PipelineListingUI extends Component {
                 },
               }}
               onTableChange={onTableChange}
+              executeQueryOptions={{
+                defaultFields: ['id']
+              }}
             />
           </EuiPageContent>
         </EuiPageBody>

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
@@ -156,6 +156,9 @@ uiModule.directive('monitoringMlListing', kbnUrl => {
                       },
                     }}
                     onTableChange={scope.onTableChange}
+                    executeQueryOptions={{
+                      defaultFields: ['job_id']
+                    }}
                   />
                 </EuiPageContent>
               </EuiPageBody>

diff --git a/x-pack/plugins/monitoring/public/views/kibana/instances/index.js b/x-pack/plugins/monitoring/public/views/kibana/instances/index.js
@@ -167,6 +167,9 @@ uiRoutes.when('/kibana/instances', {
                       },
                     }}
                     onTableChange={this.onTableChange}
+                    executeQueryOptions={{
+                      defaultFields: ['name']
+                    }}
                   />
 
                 </EuiPageContent>
-Original file line number
+Diff line change
@@ Expand Up @@
             },
           }}
           onTableChange={onTableChange}
+          executeQueryOptions={{
+            defaultFields: ['message', 'category']
+          }}
         />
       );
     };
@@ Expand Down @@