[Beats CM] Backport refactor(#26636) to 6.x (#26886)

* [BeatsCM] Cleanup and refactor (#26636) * Refactor BeatsCM * update deps * update more deps * update for new EUI definitions * update import * Revert "update deps" This reverts commit 759a145. * use _source_includes * remove _source_includes * work-around due to watcher UI tests * Keep all xpack checks safe because we cant trust its there in tests for some reason * VALIDATION. This commit is to ensure the errors in CI are coming from beats * remove validation that this is a beats CM issue * More try/catch to try and find where this error is * testing another call * revert back to dangerouslyGetActiveInjector * ensure expire always is a number * fix swallowed error * Update x-pack/plugins/beats_management/public/lib/compose/kibana.ts Co-Authored-By: mattapperson <[email protected]> * Update x-pack/plugins/beats_management/public/utils/page_loader.test.ts Co-Authored-By: mattapperson <[email protected]> * Update x-pack/plugins/beats_management/public/utils/page_loader.ts Co-Authored-By: mattapperson <[email protected]> * fix for new webpack import * Fix translation map * fix URL path * fix other link * removing tag from beats via tag details screen now uses container * remove debug text * added comment/readme about routing on the client side * enrolled beat UI now works on overview screen * newly enrolled beat now reloads the beats table * fix TS errors # Conflicts: # x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts # x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts # x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts * fix import for 6.x * fix formatting
elastic · Dec 11, 2018 · 80d9fe5 · 80d9fe5
1 parent ebdba85
commit 80d9fe5
Show file tree

Hide file tree

Showing 121 changed files with 2,804 additions and 2,630 deletions.
diff --git a/x-pack/package.json b/x-pack/package.json
@@ -123,8 +123,8 @@
     "@elastic/numeral": "2.3.2",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/i18n": "1.0.0",
-    "@kbn/ui-framework": "1.0.0",
     "@kbn/interpreter": "1.0.0",
+    "@kbn/ui-framework": "1.0.0",
     "@samverschueren/stream-to-observable": "^0.3.0",
     "@scant/router": "^0.1.0",
     "@slack/client": "^4.8.0",
@@ -179,6 +179,7 @@
     "icalendar": "0.7.1",
     "inline-style": "^2.0.0",
     "intl": "^1.2.5",
+    "io-ts": "^1.4.2",
     "isomorphic-fetch": "2.2.1",
     "joi": "^13.5.2",
     "jquery": "^3.3.1",
@@ -257,6 +258,7 @@
     "typescript-fsa-reducers": "^0.4.5",
     "ui-select": "0.19.4",
     "unbzip2-stream": "1.0.9",
+    "unstated": "^2.1.1",
     "uuid": "3.0.1",
     "venn.js": "0.2.9",
     "xregexp": "3.2.0"

diff --git a/x-pack/plugins/beats_management/common/constants/index.ts b/x-pack/plugins/beats_management/common/constants/index.ts
@@ -7,5 +7,6 @@
 export { PLUGIN } from './plugin';
 export { INDEX_NAMES } from './index_names';
 export { UNIQUENESS_ENFORCING_TYPES, ConfigurationBlockTypes } from './configuration_blocks';
-export const BASE_PATH = '/management/beats_management/';
+export const BASE_PATH = '/management/beats_management';
 export { TABLE_CONFIG } from './table';
+export { REQUIRED_ROLES, LICENSES, REQUIRED_LICENSES } from './security';
diff --git a/x-pack/plugins/beats_management/common/constants/plugin.ts b/x-pack/plugins/beats_management/common/constants/plugin.ts
@@ -7,3 +7,4 @@
 export const PLUGIN = {
   ID: 'beats_management',
 };
+export const CONFIG_PREFIX = 'xpack.beats';
diff --git a/x-pack/plugins/beats_management/common/constants/security.ts b/x-pack/plugins/beats_management/common/constants/security.ts
@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+export const REQUIRED_ROLES = ['beats_admin'];
+export const REQUIRED_LICENSES = ['standard', 'gold', 'trial', 'platinum'];
+export const LICENSES = ['oss', 'standard', 'gold', 'trial', 'platinum'];
+export type LicenseType = 'oss' | 'trial' | 'standard' | 'basic' | 'gold' | 'platinum';
diff --git a/x-pack/plugins/beats_management/index.ts b/x-pack/plugins/beats_management/index.ts
@@ -6,23 +6,24 @@
 import Joi from 'joi';
 import { resolve } from 'path';
 import { PLUGIN } from './common/constants';
+import { CONFIG_PREFIX } from './common/constants/plugin';
 import { initServerWithKibana } from './server/kibana.index';
+import { KibanaLegacyServer } from './server/lib/adapters/framework/adapter_types';
 
 const DEFAULT_ENROLLMENT_TOKENS_TTL_S = 10 * 60; // 10 minutes
 
 export const config = Joi.object({
   enabled: Joi.boolean().default(true),
-  encryptionKey: Joi.string(),
   defaultUserRoles: Joi.array()
     .items(Joi.string())
     .default(['superuser']),
+  encryptionKey: Joi.string().default('xpack_beats_default_encryptionKey'),
   enrollmentTokensTtlInSeconds: Joi.number()
     .integer()
     .min(1)
     .max(10 * 60 * 14) // No more then 2 weeks for security reasons
     .default(DEFAULT_ENROLLMENT_TOKENS_TTL_S),
 }).default();
-export const configPrefix = 'xpack.beats';
 
 export function beats(kibana: any) {
   return new kibana.Plugin({
@@ -33,8 +34,8 @@ export function beats(kibana: any) {
       managementSections: ['plugins/beats_management'],
     },
     config: () => config,
-    configPrefix,
-    init(server: any) {
+    configPrefix: CONFIG_PREFIX,
+    init(server: KibanaLegacyServer) {
       initServerWithKibana(server);
     },
   });

diff --git a/...ent/public/pages/main/enroll_fragment.tsx → ...gement/public/components/enroll_beats.tsx b/...ent/public/pages/main/enroll_fragment.tsx → ...gement/public/components/enroll_beats.tsx
@@ -4,9 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import {
-  // @ts-ignore typings for EuiBasicTable not present in current version
   EuiBasicTable,
-  EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
   EuiLoadingSpinner,
@@ -15,37 +13,43 @@ import {
   EuiSelect,
   EuiTitle,
 } from '@elastic/eui';
-import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { capitalize } from 'lodash';
 import React from 'react';
-import { RouteComponentProps } from 'react-router';
-import { CMBeat } from '../../../common/domain_types';
-import { AppURLState } from '../../app';
-import { URLStateProps, withUrlState } from '../../containers/with_url_state';
-import { FrontendLibs } from '../../lib/lib';
+import { CMBeat } from '../../common/domain_types';
 
-interface BeatsProps extends URLStateProps<AppURLState>, RouteComponentProps<any> {
-  match: any;
-  libs: FrontendLibs;
-  intl: InjectedIntl;
+interface ComponentProps {
+  /** Such as kibanas basePath, for use to generate command */
+  frameworkBasePath?: string;
+  enrollmentToken?: string;
+  getBeatWithToken(token: string): Promise<CMBeat | null>;
+  createEnrollmentToken(): Promise<void>;
+  onBeatEnrolled(enrolledBeat: CMBeat): void;
 }
-export class EnrollBeat extends React.Component<BeatsProps, any> {
+
+interface ComponentState {
+  enrolledBeat: CMBeat | null;
+  hasPolledForBeat: boolean;
+  command: string;
+  beatType: string;
+}
+
+export class EnrollBeat extends React.Component<ComponentProps, ComponentState> {
   private pinging = false;
-  constructor(props: BeatsProps) {
+  constructor(props: ComponentProps) {
     super(props);
 
     this.state = {
       enrolledBeat: null,
+      hasPolledForBeat: false,
       command: 'sudo filebeat',
       beatType: 'filebeat',
     };
   }
-  public pingForBeatWithToken = async (
-    libs: FrontendLibs,
-    token: string
-  ): Promise<CMBeat | void> => {
+  public pingForBeatWithToken = async (token: string): Promise<CMBeat | void> => {
     try {
-      const beats = await libs.beats.getBeatWithToken(token);
+      const beats = await this.props.getBeatWithToken(token);
+
       if (!beats) {
         throw new Error('no beats');
       }
@@ -54,69 +58,34 @@ export class EnrollBeat extends React.Component<BeatsProps, any> {
       if (this.pinging) {
         const timeout = (ms: number) => new Promise(res => setTimeout(res, ms));
         await timeout(5000);
-        return await this.pingForBeatWithToken(libs, token);
+        return await this.pingForBeatWithToken(token);
       }
     }
   };
   public async componentDidMount() {
-    if (!this.props.urlState.enrollmentToken) {
-      const enrollmentToken = await this.props.libs.tokens.createEnrollmentToken();
-      this.props.setUrlState({
-        enrollmentToken,
-      });
+    if (!this.props.enrollmentToken) {
+      await this.props.createEnrollmentToken();
     }
   }
-  public waitForToken = async (token: string) => {
-    if (this.pinging) {
+  public waitForTokenToEnrollBeat = async () => {
+    if (this.pinging || !this.props.enrollmentToken) {
       return;
     }
     this.pinging = true;
-    const enrolledBeat = (await this.pingForBeatWithToken(this.props.libs, token)) as CMBeat;
+    const enrolledBeat = (await this.pingForBeatWithToken(this.props.enrollmentToken)) as CMBeat;
 
     this.setState({
       enrolledBeat,
     });
+    this.props.onBeatEnrolled(enrolledBeat);
     this.pinging = false;
   };
   public render() {
-    if (!this.props.urlState.enrollmentToken) {
+    if (!this.props.enrollmentToken && !this.state.enrolledBeat) {
       return null;
     }
-    if (this.props.urlState.enrollmentToken && !this.state.enrolledBeat) {
-      this.waitForToken(this.props.urlState.enrollmentToken);
-    }
-    const { goTo, intl } = this.props;
-
-    const actions = [];
-
-    switch (this.props.location.pathname) {
-      case '/overview/initial/beats':
-        actions.push({
-          goTo: '/overview/initial/tag',
-          name: intl.formatMessage({
-            id: 'xpack.beatsManagement.enrollBeat.continueButtonLabel',
-            defaultMessage: 'Continue',
-          }),
-        });
-        break;
-      case '/overview/beats/enroll':
-        actions.push({
-          goTo: '/overview/beats/enroll',
-          name: intl.formatMessage({
-            id: 'xpack.beatsManagement.enrollBeat.enrollAnotherBeatButtonLabel',
-            defaultMessage: 'Enroll another Beat',
-          }),
-          newToken: true,
-        });
-        actions.push({
-          goTo: '/overview/beats',
-          name: intl.formatMessage({
-            id: 'xpack.beatsManagement.enrollBeat.doneButtonLabel',
-            defaultMessage: 'Done',
-          }),
-          clearToken: true,
-        });
-        break;
+    if (this.props.enrollmentToken && !this.state.enrolledBeat) {
+      this.waitForTokenToEnrollBeat();
     }
 
     return (
@@ -229,10 +198,7 @@ export class EnrollBeat extends React.Component<BeatsProps, any> {
                       />
                       {`//`}
                       {window.location.host}
-                      {this.props.libs.framework.baseURLPath
-                        ? this.props.libs.framework.baseURLPath
-                        : ''}{' '}
-                      {this.props.urlState.enrollmentToken}
+                      {this.props.frameworkBasePath} {this.props.enrollmentToken}
                     </div>
                   </div>
                   <br />
@@ -309,38 +275,9 @@ export class EnrollBeat extends React.Component<BeatsProps, any> {
             />
             <br />
             <br />
-            {actions.map(action => (
-              <EuiButton
-                key={action.name}
-                size="s"
-                color="primary"
-                style={{ marginLeft: 10 }}
-                onClick={async () => {
-                  if (action.clearToken) {
-                    this.props.setUrlState({ enrollmentToken: '' });
-                  }
-
-                  if (action.newToken) {
-                    const enrollmentToken = await this.props.libs.tokens.createEnrollmentToken();
-
-                    this.props.setUrlState({ enrollmentToken });
-                    return this.setState({
-                      enrolledBeat: null,
-                    });
-                  }
-                  goTo(action.goTo);
-                }}
-              >
-                {action.name}
-              </EuiButton>
-            ))}
           </EuiModalBody>
         )}
       </React.Fragment>
     );
   }
 }
-
-export const EnrollBeatPageUi = withUrlState<BeatsProps>(EnrollBeat);
-
-export const EnrollBeatPage = injectI18n(EnrollBeatPageUi);
diff --git a/.../plugins/beats_management/public/app.d.ts → .../public/components/layouts/background.tsx b/.../plugins/beats_management/public/app.d.ts → .../public/components/layouts/background.tsx
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type FlatObject<T> = { [Key in keyof T]: string };
+import styled from 'styled-components';
 
-export interface AppURLState {
-  beatsKBar?: string;
-  tagsKBar?: string;
-  enrollmentToken?: string;
-  createdTag?: string;
-}
+export const Background = styled.div`
+  flex-grow: 1;
+  height: 100vh;
+  background: #f5f5f5;
+`;
diff --git a/x-pack/plugins/beats_management/public/components/layouts/header.tsx b/x-pack/plugins/beats_management/public/components/layouts/header.tsx
diff --git a/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx b/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx
@@ -11,8 +11,6 @@ import {
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiModal,
-  EuiOverlayMask,
   EuiPage,
   EuiPageBody,
   EuiPageContent,
@@ -21,13 +19,11 @@ import {
 interface LayoutProps {
   title: string;
   actionSection?: React.ReactNode;
-  modalRender?: () => React.ReactNode;
   modalClosePath?: string;
 }
 
 export const NoDataLayout: React.SFC<LayoutProps> = withRouter<any>(
-  ({ actionSection, title, modalRender, modalClosePath, children, history }) => {
-    const modalContent = modalRender && modalRender();
+  ({ actionSection, title, modalClosePath, children, history }) => {
     return (
       <EuiPage>
         <EuiPageBody>
@@ -44,18 +40,6 @@ export const NoDataLayout: React.SFC<LayoutProps> = withRouter<any>(
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiPageBody>
-        {modalContent && (
-          <EuiOverlayMask>
-            <EuiModal
-              onClose={() => {
-                history.push(modalClosePath);
-              }}
-              style={{ width: '640px' }}
-            >
-              {modalContent}
-            </EuiModal>
-          </EuiOverlayMask>
-        )}
       </EuiPage>
     );
   }