[Infra UI] Make queries more robust against missing indices (#38976)

This fixes several queries that failed when indices didn't exist and were not specified using a wildcard at the same time.
elastic · Jun 17, 2019 · 5b9c231 · 5b9c231
1 parent 2228863
commit 5b9c231
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/x-pack/plugins/infra/server/lib/adapters/metadata/elasticsearch_metadata_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/metadata/elasticsearch_metadata_adapter.ts
@@ -28,6 +28,8 @@ export class ElasticsearchMetadataAdapter implements InfraMetadataAdapter {
   ): Promise<InfraMetricsAdapterResponse> {
     const idFieldName = getIdFieldName(sourceConfiguration, nodeType);
     const metricQuery = {
+      allowNoIndices: true,
+      ignoreUnavailable: true,
       index: sourceConfiguration.metricAlias,
       body: {
         query: {
@@ -80,6 +82,8 @@ export class ElasticsearchMetadataAdapter implements InfraMetadataAdapter {
   ): Promise<InfraMetricsAdapterResponse> {
     const idFieldName = getIdFieldName(sourceConfiguration, nodeType);
     const logQuery = {
+      allowNoIndices: true,
+      ignoreUnavailable: true,
       index: sourceConfiguration.logAlias,
       body: {
         query: {

diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/lib/check_valid_node.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/lib/check_valid_node.ts
@@ -13,6 +13,8 @@ export const checkValidNode = async (
   id: string
 ): Promise<boolean> => {
   const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
     index: indexPattern,
     terminateAfter: 1,
     body: {

diff --git a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/get_groupings.ts b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/get_groupings.ts
@@ -32,6 +32,8 @@ export const getGroupings = async (
   }
   const limit = options.limit || 9;
   const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
     index: options.indexPattern,
     body: {
       size: 0,