Beats/update

src/ui/public/flyout/flyout_session.tsx

@@ -85,6 +85,7 @@ class FlyoutSession extends EventEmitter {
 export function openFlyout(
   flyoutChildren: React.ReactNode,
   flyoutProps: {
+    closeButtonAriaLabel?: string;
     onClose?: () => void;
     'data-test-subj'?: string;
   } = {}

src/ui/public/inspector/inspector.tsx

@@ -69,6 +69,7 @@ function open(adapters: Adapters, options: InspectorOptions = {}): InspectorSess
 
   return openFlyout(<InspectorPanel views={views} adapters={adapters} title={options.title} />, {
     'data-test-subj': 'inspectorPanel',
+    closeButtonAriaLabel: 'Close Inspector',
   });
 }
 

x-pack/plugins/beats_management/common/domain_types.ts

@@ -13,6 +13,7 @@ export interface ConfigurationBlock {
 export interface CMBeat {
   id: string;
   enrollment_token: string;
+  active: boolean;
   access_token: string;
   verified_on?: string;
   type: string;

x-pack/plugins/beats_management/public/components/table/controls.tsx

@@ -30,6 +30,7 @@ export function ControlBar(props: ControlBarProps) {
     selectionCount,
     showAssignmentOptions,
   } = props;
+
   const filters = controlDefinitions.filters.length === 0 ? null : controlDefinitions.filters;
   return selectionCount !== 0 && showAssignmentOptions ? (
     <AssignmentOptions

x-pack/plugins/beats_management/public/components/table/table.tsx

@@ -43,6 +43,7 @@ export class Table extends React.Component<BeatsTableProps, BeatsTableState> {
   }
 
   public render() {
+
     const {
       actionHandler,
       assignmentOptions,

x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx

@@ -9,6 +9,7 @@ import { EuiBadge, EuiFlexGroup, EuiIcon, EuiLink } from '@elastic/eui';
 import { flatten, uniq } from 'lodash';
 import moment from 'moment';
 import React from 'react';
+
 import { TABLE_CONFIG } from '../../../common/constants';
 import { BeatTag, CMPopulatedBeat, ConfigurationBlock } from '../../../common/domain_types';
 

x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts

@@ -8,6 +8,7 @@ import { CMBeat } from '../../../../common/domain_types';
 
 export interface CMBeatsAdapter {
   get(id: string): Promise<CMBeat | null>;
+  update(id: string, beatData: Partial<CMBeat>): Promise<boolean>;
   getAll(): Promise<CMBeat[]>;
   removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise<BeatsRemovalReturn[]>;
   assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise<CMAssignmentReturn[]>;

x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts

@@ -25,6 +25,17 @@ export class MemoryBeatsAdapter implements CMBeatsAdapter {
     return this.beatsDB.find(beat => beat.id === id) || null;
   }
 
+  public async update(id: string, beatData: Partial<CMBeat>): Promise<boolean> {
+    const index = this.beatsDB.findIndex(beat => beat.id === id);
+
+    if (index === -1) {
+      return false;
+    }
+
+    this.beatsDB[index] = { ...this.beatsDB[index], ...beatData };
+    return true;
+  }
+
   public async getAll() {
     return this.beatsDB.map<CMBeat>((beat: any) => omit(beat, ['access_token']));
   }
@@ -35,6 +46,12 @@ export class MemoryBeatsAdapter implements CMBeatsAdapter {
     const beatIds = removals.map(r => r.beatId);
 
     const response = this.beatsDB.filter(beat => beatIds.includes(beat.id)).map(beat => {
+      const tagData = removals.find(r => r.beatId === beat.id);
+      if (tagData) {
+        if (beat.tags) {
+          beat.tags = beat.tags.filter(tag => tag !== tagData.tag);
+        }
+      }
       const removalsForBeat = removals.filter(r => r.beatId === beat.id);
       if (removalsForBeat.length) {
         removalsForBeat.forEach((assignment: BeatsTagAssignment) => {

x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts

@@ -28,6 +28,11 @@ export class RestBeatsAdapter implements CMBeatsAdapter {
     return (await this.REST.get<{ beats: CMBeat[] }>('/api/beats/agents')).beats;
   }
 
+  public async update(id: string, beatData: Partial<CMBeat>): Promise<boolean> {
+    await this.REST.put<{ success: true }>(`/api/beats/agent/${id}`, beatData);
+    return true;
+  }
+
   public async removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise<BeatsRemovalReturn[]> {
     return (await this.REST.post<{ removals: BeatsRemovalReturn[] }>(
       `/api/beats/agents_tags/removals`,

x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts

@@ -17,7 +17,6 @@ import {
 
 export class KibanaFrameworkAdapter implements FrameworkAdapter {
   public appState: object;
-  public kbnVersion?: string;
 
   private management: any;
   private adapterService: KibanaAdapterServiceProvider;

x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts

@@ -9,11 +9,7 @@ import { RestAPIAdapter } from './adapter_types';
 let globalAPI: AxiosInstance;
 
 export class AxiosRestAPIAdapter implements RestAPIAdapter {
-  constructor(
-    private readonly kbnVersion: string,
-    private readonly xsrfToken: string,
-    private readonly basePath: string
-  ) {}
+  constructor(private readonly xsrfToken: string, private readonly basePath: string) {}
 
   public async get<ResponseData>(url: string): Promise<ResponseData> {
     return await this.REST.get(url).then(resp => resp.data);
@@ -48,7 +44,7 @@ export class AxiosRestAPIAdapter implements RestAPIAdapter {
         Accept: 'application/json',
         credentials: 'same-origin',
         'Content-Type': 'application/json',
-        'kbn-version': this.kbnVersion,
+        'kbn-version': this.xsrfToken,
         'kbn-xsrf': this.xsrfToken,
       },
     });

x-pack/plugins/beats_management/public/lib/compose/kibana.ts

@@ -22,8 +22,7 @@ import { RestTokensAdapter } from '../adapters/tokens/rest_tokens_adapter';
 import { FrontendDomainLibs, FrontendLibs } from '../lib';
 
 export function compose(): FrontendLibs {
-  const kbnVersion = (window as any).__KBN__.version;
-  const api = new AxiosRestAPIAdapter(kbnVersion, chrome.getXsrfToken(), chrome.getBasePath());
+  const api = new AxiosRestAPIAdapter(chrome.getXsrfToken(), chrome.getBasePath());
 
   const tags = new RestTagsAdapter(api);
   const tokens = new RestTokensAdapter(api);

x-pack/plugins/beats_management/public/pages/main/beats.tsx

@@ -79,10 +79,16 @@ export class BeatsPage extends React.PureComponent<BeatsPageProps, BeatsPageStat
     this.loadBeats();
   };
 
-  // TODO: call delete endpoint
   private deleteSelected = async () => {
-    // const selected = this.getSelectedBeats();
-    // await this.props.libs.beats.delete(selected);
+    const selected = this.getSelectedBeats();
+    for (const beat of selected) {
+      await this.props.libs.beats.update(beat.id, { active: false });
+    }
+    // because the compile code above has a very minor race condition, we wait,
+    // the max race condition time is really 10ms but doing 100 to be safe
+    setTimeout(async () => {
+      await this.loadBeats();
+    }, 100);
   };
 
   private async loadBeats() {
@@ -110,7 +116,7 @@ export class BeatsPage extends React.PureComponent<BeatsPageProps, BeatsPageStat
         <EuiFlexItem key={tag.id}>
           <EuiBadge
             color={tag.color}
-            iconType={hasMatches ? 'cross' : null}
+            iconType={hasMatches ? 'cross' : undefined}
             onClick={
               hasMatches
                 ? () => this.removeTagsFromBeats(selectedBeats, tag)
@@ -143,7 +149,7 @@ export class BeatsPage extends React.PureComponent<BeatsPageProps, BeatsPageStat
     this.loadBeats();
   };
 
-  private getSelectedBeats = () => {
+  private getSelectedBeats = (): CMPopulatedBeat[] => {
     return this.state.tableRef.current.state.selection;
   };
 }

x-pack/plugins/beats_management/public/pages/main/tags.tsx

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+
 // @ts-ignore EuiToolTip has no typings in current version
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiToolTip } from '@elastic/eui';
 import React from 'react';

x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts

@@ -8,8 +8,8 @@ import { CMBeat } from '../../../../common/domain_types';
 import { FrameworkUser } from '../framework/adapter_types';
 
 export interface CMBeatsAdapter {
-  insert(beat: CMBeat): Promise<void>;
-  update(beat: CMBeat): Promise<void>;
+  insert(user: FrameworkUser, beat: CMBeat): Promise<void>;
+  update(user: FrameworkUser, beat: CMBeat): Promise<void>;
   get(user: FrameworkUser, id: string): Promise<CMBeat | null>;
   getAll(user: FrameworkUser): Promise<CMBeat[]>;
   getWithIds(user: FrameworkUser, beatIds: string[]): Promise<CMBeat[]>;

x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts

@@ -8,17 +8,15 @@ import { flatten, get as _get, omit } from 'lodash';
 import { INDEX_NAMES } from '../../../../common/constants';
 import { CMBeat } from '../../../../common/domain_types';
 import { DatabaseAdapter } from '../database/adapter_types';
-import { BackendFrameworkAdapter } from '../framework/adapter_types';
+
 import { FrameworkUser } from '../framework/adapter_types';
 import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types';
 
 export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
   private database: DatabaseAdapter;
-  private framework: BackendFrameworkAdapter;
 
-  constructor(database: DatabaseAdapter, framework: BackendFrameworkAdapter) {
+  constructor(database: DatabaseAdapter) {
     this.database = database;
-    this.framework = framework;
   }
 
   public async get(user: FrameworkUser, id: string) {
@@ -37,13 +35,13 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     return _get<CMBeat>(response, '_source.beat');
   }
 
-  public async insert(beat: CMBeat) {
+  public async insert(user: FrameworkUser, beat: CMBeat) {
     const body = {
       beat,
       type: 'beat',
     };
 
-    await this.database.create(this.framework.internalUser, {
+    await this.database.index(user, {
       body,
       id: `beat:${beat.id}`,
       index: INDEX_NAMES.BEATS,
@@ -52,7 +50,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     });
   }
 
-  public async update(beat: CMBeat) {
+  public async update(user: FrameworkUser, beat: CMBeat) {
     const body = {
       beat,
       type: 'beat',
@@ -65,7 +63,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
       refresh: 'wait_for',
       type: '_doc',
     };
-    await this.database.index(this.framework.internalUser, params);
+    await this.database.index(user, params);
   }
 
   public async getWithIds(user: FrameworkUser, beatIds: string[]) {
@@ -115,11 +113,12 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     const params = {
       index: INDEX_NAMES.BEATS,
       q: 'type:beat',
+      size: 10000,
       type: '_doc',
     };
     const response = await this.database.search(user, params);
-
     const beats = _get<any>(response, 'hits.hits', []);
+
     return beats.map((beat: any) => omit(beat._source.beat, ['access_token']));
   }
 
@@ -129,16 +128,15 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
   ): Promise<BeatsTagAssignment[]> {
     const body = flatten(
       removals.map(({ beatId, tag }) => {
-        const script =
-          '' +
-          'def beat = ctx._source.beat; ' +
-          'if (beat.tags != null) { ' +
-          '  beat.tags.removeAll([params.tag]); ' +
-          '}';
+        const script = `
+          def beat = ctx._source.beat;
+          if (beat.tags != null) {
+            beat.tags.removeAll([params.tag]);
+          }`;
 
         return [
           { update: { _id: `beat:${beatId}` } },
-          { script: { source: script, params: { tag } } },
+          { script: { source: script.replace('          ', ''), params: { tag } } },
         ];
       })
     );
@@ -162,19 +160,18 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
   ): Promise<BeatsTagAssignment[]> {
     const body = flatten(
       assignments.map(({ beatId, tag }) => {
-        const script =
-          '' +
-          'def beat = ctx._source.beat; ' +
-          'if (beat.tags == null) { ' +
-          '  beat.tags = []; ' +
-          '} ' +
-          'if (!beat.tags.contains(params.tag)) { ' +
-          '  beat.tags.add(params.tag); ' +
-          '}';
+        const script = `
+          def beat = ctx._source.beat;
+          if (beat.tags == null) {
+            beat.tags = [];
+          }
+          if (!beat.tags.contains(params.tag)) {
+            beat.tags.add(params.tag);
+          }`;
 
         return [
           { update: { _id: `beat:${beatId}` } },
-          { script: { source: script, params: { tag } } },
+          { script: { source: script.replace('          ', ''), params: { tag } } },
         ];
       })
     );

x-pack/plugins/beats_management/server/lib/adapters/beats/memory_beats_adapter.ts

@@ -21,11 +21,11 @@ export class MemoryBeatsAdapter implements CMBeatsAdapter {
     return this.beatsDB.find(beat => beat.id === id) || null;
   }
 
-  public async insert(beat: CMBeat) {
+  public async insert(user: FrameworkUser, beat: CMBeat) {
     this.beatsDB.push(beat);
   }
 
-  public async update(beat: CMBeat) {
+  public async update(user: FrameworkUser, beat: CMBeat) {
     const beatIndex = this.beatsDB.findIndex(b => b.id === beat.id);
 
     this.beatsDB[beatIndex] = {

x-pack/plugins/beats_management/server/lib/compose/kibana.ts

@@ -25,9 +25,10 @@ export function compose(server: any): CMServerLibs {
   const tokens = new CMTokensDomain(new ElasticsearchTokensAdapter(database, framework), {
     framework,
   });
-  const beats = new CMBeatsDomain(new ElasticsearchBeatsAdapter(database, framework), {
+  const beats = new CMBeatsDomain(new ElasticsearchBeatsAdapter(database), {
     tags,
     tokens,
+    framework,
   });
 
   const domainLibs: CMDomainLibs = {

x-pack/plugins/beats_management/server/lib/compose/testing.ts

@@ -36,6 +36,7 @@ export function compose({
   const beats = new CMBeatsDomain(new MemoryBeatsAdapter(beatsDB), {
     tags,
     tokens,
+    framework,
   });
 
   const domainLibs: CMDomainLibs = {