merge 7.x code

Author: alisonelizabeth

x-pack/plugins/upgrade_assistant/common/types.ts

@@ -94,13 +94,12 @@ export type ReindexSavedObject = SavedObject<ReindexOperation>;
 
 export enum ReindexWarning {
   // 6.0 -> 7.0 warnings, now unused
-  allField = 0,
-  booleanFields = 1,
+  allField,
+  booleanFields,
 
   // 7.0 -> 8.0 warnings
   apmReindex,
-
-  // 8.0 -> 9.0 warnings
+  customTypeName,
 }
 
 export enum IndexGroup {
@@ -185,6 +184,7 @@ export interface EnrichedDeprecationInfo extends DeprecationInfo {
   index?: string;
   node?: string;
   reindex?: boolean;
+  needsDefaultFields?: boolean;
   /**
    * Indicate what blockers have been detected for calling reindex
    * against this index.

x-pack/plugins/upgrade_assistant/kibana.json

@@ -4,6 +4,6 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "upgrade_assistant"],
-  "requiredPlugins": ["management", "licensing", "features"],
+  "requiredPlugins": ["management", "licensing", "apmOss", "features"],
   "optionalPlugins": ["cloud", "usageCollection"]
 }

x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx

@@ -18,7 +18,7 @@ import { OverviewTab } from './tabs/overview';
 const promisesToResolve = () => new Promise((resolve) => setTimeout(resolve, 0));
 
 const mockHttp = httpServiceMock.createSetupContract();
-const mockKibanaVersion = new SemVer('8.0.0');
+const mockKibanaVersion = new SemVer('7.0.0');
 
 jest.mock('../app_context', () => {
   return {

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap

@@ -22,7 +22,7 @@ const defaultProps = {
   setSelectedTabIndex: jest.fn(),
 };
 
-const mockKibanaVersion = new SemVer('8.0.0');
+const mockKibanaVersion = new SemVer('7.0.0');
 
 jest.mock('../../../app_context', () => {
   return {

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx

@@ -17,13 +17,16 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { FixDefaultFieldsButton } from './default_fields/button';
 import { ReindexButton } from './reindex';
 import { AppContext } from '../../../../app_context';
 import { EnrichedDeprecationInfo } from '../../../../../../common/types';
 
 interface DeprecationCellProps {
   items?: Array<{ title?: string; body: string }>;
-  reindexIndexName?: string;
+  indexName?: string;
+  reindex?: boolean;
+  needsDefaultFields?: boolean;
   docUrl?: string;
   headline?: string;
   healthColor?: string;
@@ -37,7 +40,9 @@ interface DeprecationCellProps {
 export const DeprecationCell: FunctionComponent<DeprecationCellProps> = ({
   headline,
   healthColor,
-  reindexIndexName,
+  indexName,
+  reindex,
+  needsDefaultFields,
   docUrl,
   items = [],
   children,
@@ -80,20 +85,28 @@ export const DeprecationCell: FunctionComponent<DeprecationCellProps> = ({
         ))}
       </EuiFlexItem>
 
-      {reindexIndexName && (
+      {reindex && (
         <EuiFlexItem grow={false}>
           <AppContext.Consumer>
             {({ http, docLinks }) => (
               <ReindexButton
                 docLinks={docLinks}
                 reindexBlocker={reindexBlocker}
-                indexName={reindexIndexName}
+                indexName={indexName!}
                 http={http}
               />
             )}
           </AppContext.Consumer>
         </EuiFlexItem>
       )}
+
+      {needsDefaultFields && (
+        <EuiFlexItem grow={false}>
+          <AppContext.Consumer>
+            {({ http }) => <FixDefaultFieldsButton indexName={indexName!} http={http} />}
+          </AppContext.Consumer>
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
 
     <EuiSpacer size="s" />

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx

@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { ReactNode } from 'react';
+import { HttpSetup } from 'src/core/public';
+
+import { EuiButton } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { LoadingState } from '../../../../types';
+
+/**
+ * Field types used by Metricbeat to generate the default_field setting.
+ * Matches Beats code here:
+ * https://github.com/elastic/beats/blob/eee127cb59b56f2ed7c7e317398c3f79c4158216/libbeat/template/processor.go#L104
+ */
+const BEAT_DEFAULT_FIELD_TYPES: ReadonlySet<string> = new Set(['keyword', 'text', 'ip']);
+const BEAT_OTHER_DEFAULT_FIELDS: ReadonlySet<string> = new Set(['fields.*']);
+
+interface FixDefaultFieldsButtonProps {
+  http: HttpSetup;
+  indexName: string;
+}
+
+interface FixDefaultFieldsButtonState {
+  fixLoadingState?: LoadingState;
+}
+
+/**
+ * Renders a button if given index is a valid Metricbeat index to add a default_field setting.
+ */
+export class FixDefaultFieldsButton extends React.Component<
+  FixDefaultFieldsButtonProps,
+  FixDefaultFieldsButtonState
+> {
+  constructor(props: FixDefaultFieldsButtonProps) {
+    super(props);
+    this.state = {};
+  }
+
+  public render() {
+    const { fixLoadingState } = this.state;
+
+    if (!this.isBeatsIndex()) {
+      return null;
+    }
+
+    const buttonProps: any = { size: 's', onClick: this.fixBeatsIndex };
+    let buttonContent: ReactNode;
+
+    switch (fixLoadingState) {
+      case LoadingState.Loading:
+        buttonProps.disabled = true;
+        buttonProps.isLoading = true;
+        buttonContent = (
+          <FormattedMessage
+            id="xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixingLabel"
+            defaultMessage="Fixing…"
+          />
+        );
+        break;
+      case LoadingState.Success:
+        buttonProps.iconSide = 'left';
+        buttonProps.iconType = 'check';
+        buttonProps.disabled = true;
+        buttonContent = (
+          <FormattedMessage
+            id="xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixedLabel"
+            defaultMessage="Fixed"
+          />
+        );
+        break;
+      case LoadingState.Error:
+        buttonProps.color = 'danger';
+        buttonProps.iconSide = 'left';
+        buttonProps.iconType = 'cross';
+        buttonContent = (
+          <FormattedMessage
+            id="xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.failedLabel"
+            defaultMessage="Failed"
+          />
+        );
+        break;
+      default:
+        buttonContent = (
+          <FormattedMessage
+            id="xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.reindexLabel"
+            defaultMessage="Fix"
+          />
+        );
+    }
+
+    return <EuiButton {...buttonProps}>{buttonContent}</EuiButton>;
+  }
+
+  private isBeatsIndex = () => {
+    const { indexName } = this.props;
+    return indexName.startsWith('metricbeat-') || indexName.startsWith('filebeat-');
+  };
+
+  private fixBeatsIndex = async () => {
+    if (!this.isBeatsIndex()) {
+      return;
+    }
+
+    this.setState({
+      fixLoadingState: LoadingState.Loading,
+    });
+
+    try {
+      await this.props.http.post(
+        `/api/upgrade_assistant/add_query_default_field/${this.props.indexName}`,
+        {
+          body: JSON.stringify({
+            fieldTypes: [...BEAT_DEFAULT_FIELD_TYPES],
+            otherFields: [...BEAT_OTHER_DEFAULT_FIELDS],
+          }),
+        }
+      );
+
+      this.setState({
+        fixLoadingState: LoadingState.Success,
+      });
+    } catch (e) {
+      this.setState({
+        fixLoadingState: LoadingState.Error,
+      });
+    }
+  };
+}

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/default_fields/button.tsx

@@ -10,6 +10,7 @@ import React from 'react';
 
 import { EuiBasicTable } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { FixDefaultFieldsButton } from './default_fields/button';
 import { ReindexButton } from './reindex';
 import { AppContext } from '../../../../app_context';
 import { EnrichedDeprecationInfo } from '../../../../../../common/types';
@@ -19,6 +20,7 @@ const PAGE_SIZES = [10, 25, 50, 100, 250, 500, 1000];
 export interface IndexDeprecationDetails {
   index: string;
   reindex: boolean;
+  needsDefaultFields: boolean;
   blockerForReindexing?: EnrichedDeprecationInfo['blockerForReindexing'];
   details?: string;
 }
@@ -145,28 +147,38 @@ export class IndexDeprecationTable extends React.Component<
     // NOTE: this naive implementation assumes all indices in the table are
     // should show the reindex button. This should work for known usecases.
     const { indices } = this.props;
-    if (!indices.find((i) => i.reindex === true)) {
+    const showReindexButton = indices.find((i) => i.reindex === true);
+    const showNeedsDefaultFieldsButton = indices.find((i) => i.needsDefaultFields === true);
+    if (!showReindexButton && !showNeedsDefaultFieldsButton) {
       return null;
     }
 
     return {
       actions: [
         {
           render(indexDep: IndexDeprecationDetails) {
-            return (
-              <AppContext.Consumer>
-                {({ http, docLinks }) => {
-                  return (
-                    <ReindexButton
-                      docLinks={docLinks}
-                      reindexBlocker={indexDep.blockerForReindexing}
-                      indexName={indexDep.index!}
-                      http={http}
-                    />
-                  );
-                }}
-              </AppContext.Consumer>
-            );
+            if (showReindexButton) {
+              return (
+                <AppContext.Consumer>
+                  {({ http, docLinks }) => {
+                    return (
+                      <ReindexButton
+                        docLinks={docLinks}
+                        reindexBlocker={indexDep.blockerForReindexing}
+                        indexName={indexDep.index!}
+                        http={http}
+                      />
+                    );
+                  }}
+                </AppContext.Consumer>
+              );
+            } else {
+              return (
+                <AppContext.Consumer>
+                  {({ http }) => <FixDefaultFieldsButton indexName={indexDep.index!} http={http} />}
+                </AppContext.Consumer>
+              );
+            }
           },
         },
       ],

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx

@@ -75,12 +75,14 @@ describe('DeprecationList', () => {
                 "blockerForReindexing": undefined,
                 "details": undefined,
                 "index": "0",
+                "needsDefaultFields": false,
                 "reindex": false,
               },
               Object {
                 "blockerForReindexing": undefined,
                 "details": undefined,
                 "index": "1",
+                "needsDefaultFields": false,
                 "reindex": false,
               },
             ]

x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/list.test.tsx

@@ -35,7 +35,9 @@ const MessageDeprecation: FunctionComponent<{ deprecation: EnrichedDeprecationIn
       reindexBlocker={deprecation.blockerForReindexing}
       headline={deprecation.message}
       healthColor={COLOR_MAP[deprecation.level]}
-      reindexIndexName={deprecation.reindex ? deprecation.index! : undefined}
+      indexName={deprecation.index}
+      reindex={deprecation.reindex}
+      needsDefaultFields={deprecation.needsDefaultFields}
       docUrl={deprecation.url}
       items={items}
     />
@@ -96,6 +98,7 @@ export const DeprecationList: FunctionComponent<{
       index: dep.index!,
       details: dep.details,
       reindex: dep.reindex === true,
+      needsDefaultFields: dep.needsDefaultFields === true,
       blockerForReindexing: dep.blockerForReindexing,
     }));
     return <IndexDeprecation indices={indices} deprecation={deprecations[0]} />;