[Infra UI] Add cloud metrics and cloud/host info to metadata endpoint

x-pack/legacy/plugins/infra/common/graphql/types.ts

@@ -28,8 +28,6 @@ export interface InfraSource {
   configuration: InfraSourceConfiguration;
   /** The status of the source */
   status: InfraSourceStatus;
-  /** A hierarchy of metadata entries by node */
-  metadataByNode: InfraNodeMetadata;
   /** A consecutive span of log entries surrounding a point in time */
   logEntriesAround: InfraLogEntryInterval;
   /** A consecutive span of log entries within an interval */
@@ -132,20 +130,6 @@ export interface InfraIndexField {
   /** Whether the field's values can be aggregated */
   aggregatable: boolean;
 }
-/** One metadata entry for a node. */
-export interface InfraNodeMetadata {
-  id: string;
-
-  name: string;
-
-  features: InfraNodeFeature[];
-}
-
-export interface InfraNodeFeature {
-  name: string;
-
-  source: string;
-}
 /** A consecutive sequence of log entries */
 export interface InfraLogEntryInterval {
   /** The key corresponding to the start of the interval covered by the entries */
@@ -424,11 +408,6 @@ export interface SourceQueryArgs {
   /** The id of the source */
   id: string;
 }
-export interface MetadataByNodeInfraSourceArgs {
-  nodeId: string;
-
-  nodeType: InfraNodeType;
-}
 export interface LogEntriesAroundInfraSourceArgs {
   /** The sort key that corresponds to the point in time */
   key: InfraTimeKeyInput;
@@ -722,44 +701,6 @@ export namespace LogSummary {
   };
 }
 
-export namespace MetadataQuery {
-  export type Variables = {
-    sourceId: string;
-    nodeId: string;
-    nodeType: InfraNodeType;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    metadataByNode: MetadataByNode;
-  };
-
-  export type MetadataByNode = {
-    __typename?: 'InfraNodeMetadata';
-
-    name: string;
-
-    features: Features[];
-  };
-
-  export type Features = {
-    __typename?: 'InfraNodeFeature';
-
-    name: string;
-
-    source: string;
-  };
-}
-
 export namespace MetricsQuery {
   export type Variables = {
     sourceId: string;

x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts

@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { InfraNodeType } from '../graphql/types';
+import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
+
+export interface InfraMetadataRequest {
+  nodeId: string;
+  nodeType: InfraNodeType;
+  sourceId: string;
+}
+export type InfraMetadataWrappedRequest = InfraWrappableRequest<InfraMetadataRequest>;
+
+export interface InfraMetadata {
+  name: string;
+  features: InfraMetadataFeature[];
+  info?: InfraMetadataInfo | null;
+}
+
+export interface InfraMetadataFeature {
+  name: string;
+  source: string;
+}
+
+export interface InfraMetadataInfo {
+  cloud?: InfraMetadataCloud | null;
+  host?: InfraMetadataHost | null;
+}
+
+export interface InfraMetadataCloud {
+  instance?: InfraMetadataInstance | null;
+  provider?: string | null;
+  availability_zone?: string | null;
+  project?: InfraMetadataProject | null;
+  machine?: InfraMetadataMachine | null;
+}
+
+export interface InfraMetadataInstance {
+  id?: string | null;
+  name?: string | null;
+}
+
+export interface InfraMetadataProject {
+  id?: string | null;
+}
+
+export interface InfraMetadataMachine {
+  interface?: string | null;
+}
+
+export interface InfraMetadataHost {
+  name?: string | null;
+  os?: InfraMetadataOS | null;
+  architecture?: string | null;
+  containerized?: boolean | null;
+}
+
+export interface InfraMetadataOS {
+  codename?: string | null;
+  family?: string | null;
+  kernel?: string | null;
+  name?: string | null;
+  platform?: string | null;
+  version?: string | null;
+}

x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx

@@ -7,10 +7,10 @@
 import { EuiButton, EuiComboBox, EuiForm, EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React from 'react';
-import { InfraIndexField } from '../../../server/graphql/types';
+import { FieldType } from 'ui/index_patterns';
 interface Props {
   onSubmit: (field: string) => void;
-  fields: InfraIndexField[];
+  fields: FieldType[];
   intl: InjectedIntl;
 }
 

x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx

@@ -15,7 +15,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React from 'react';
-import { InfraIndexField, InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
+import { FieldType } from 'ui/index_patterns';
+import { InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
 import { InfraGroupByOptions } from '../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
 import { fieldToName } from './lib/field_to_display_name';
@@ -26,7 +27,7 @@ interface Props {
   groupBy: InfraSnapshotGroupbyInput[];
   onChange: (groupBy: InfraSnapshotGroupbyInput[]) => void;
   onChangeCustomOptions: (options: InfraGroupByOptions[]) => void;
-  fields: InfraIndexField[];
+  fields: FieldType[];
   intl: InjectedIntl;
   customOptions: InfraGroupByOptions[];
 }

x-pack/legacy/plugins/infra/public/containers/metadata/lib/get_filtered_layouts.ts

@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { InfraMetadataFeature } from '../../../../common/http_api/metadata_api';
+import { InfraMetricLayout } from '../../../pages/metrics/layouts/types';
+
+export const getFilteredLayouts = (
+  layouts: InfraMetricLayout[],
+  metadata: Array<InfraMetadataFeature | null> | undefined
+): InfraMetricLayout[] => {
+  if (!metadata) {
+    return layouts;
+  }
+
+  const metricMetadata: Array<string | null> = metadata
+    .filter(data => data && data.source === 'metrics')
+    .map(data => data && data.name);
+
+  // After filtering out sections that can't be displayed, a layout may end up empty and can be removed.
+  const filteredLayouts = layouts
+    .map(layout => getFilteredLayout(layout, metricMetadata))
+    .filter(layout => layout.sections.length > 0);
+  return filteredLayouts;
+};
+
+export const getFilteredLayout = (
+  layout: InfraMetricLayout,
+  metricMetadata: Array<string | null>
+): InfraMetricLayout => {
+  // A section is only displayed if at least one of its requirements is met
+  // All others are filtered out.
+  const filteredSections = layout.sections.filter(
+    section => _.intersection(section.requires, metricMetadata).length > 0
+  );
+  return { ...layout, sections: filteredSections };
+};

x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts

@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect } from 'react';
+import { InfraNodeType } from '../../graphql/types';
+import { InfraMetricLayout } from '../../pages/metrics/layouts/types';
+import { InfraMetadata } from '../../../common/http_api/metadata_api';
+import { getFilteredLayouts } from './lib/get_filtered_layouts';
+import { useHTTPRequest } from '../../hooks/use_http_request';
+
+export function useMetadata(
+  nodeId: string,
+  nodeType: InfraNodeType,
+  layouts: InfraMetricLayout[],
+  sourceId: string
+) {
+  const { error, loading, response, makeRequest } = useHTTPRequest<InfraMetadata>(
+    '/api/infra/metadata',
+    'POST',
+    JSON.stringify({
+      nodeId,
+      nodeType,
+      sourceId,
+    })
+  );
+
+  useEffect(() => {
+    (async () => {
+      await makeRequest();
+    })();
+  }, [makeRequest]);
+
+  return {
+    name: (response && response.name) || '',
+    filteredLayouts: (response && getFilteredLayouts(layouts, response.features)) || [],
+    error: (error && error.message) || null,
+    loading,
+  };
+}