Jamie/2523 data lifecycle refactor

components/automate-ui/e2e/deprecated-routes.e2e-spec.ts

@@ -8,7 +8,8 @@ describe('Deprecated routes redirect to the correct new route for backwards comp
   // Note: This is "old path" -> "new path", and the new path will be checked
   // using a regular expression: the string, anchored to the right by '$'.
   [
-    ['/admin/settings',                        '/settings/node-lifecycle'],
+    ['/settings/node-lifecycle',               '/settings/data-lifecycle'],
+    ['/admin/settings',                        '/settings/data-lifecycle'],
     ['/admin/tokens',                          '/settings/tokens'],
     ['/admin/tokens/my-object',                '/settings/tokens/my-object'],
     ['/admin/teams',                           '/settings/teams'],

components/automate-ui/src/app/app-routing.module.ts

@@ -73,7 +73,7 @@ const routes: Routes = [
           component: SettingsLandingComponent
         },
         {
-          path: 'node-lifecycle',
+          path: 'data-lifecycle',
           component: AutomateSettingsComponent
         },
         {
@@ -320,7 +320,12 @@ const routes: Routes = [
   {
     path: 'admin/settings',
     pathMatch: 'full',
-    redirectTo: 'settings/node-lifecycle'
+    redirectTo: 'settings/data-lifecycle'
+  },
+  {
+    path: 'settings/node-lifecycle',
+    pathMatch: 'full',
+    redirectTo: 'settings/data-lifecycle'
   },
   {
     path: 'admin',

components/automate-ui/src/app/components/settings-sidebar/settings-sidebar.component.html

@@ -15,7 +15,7 @@
         icon="vpn_key" iconRotation="90">Node Credentials</chef-sidebar-entry>
     </app-authorized>
     <app-authorized #lifecycle [anyOf]="['/retention/nodes/status', 'get']">
-      <chef-sidebar-entry route="/settings/node-lifecycle" icon="storage">Node Lifecycle</chef-sidebar-entry>
+      <chef-sidebar-entry route="/settings/data-lifecycle" icon="storage">Data Lifecycle</chef-sidebar-entry>
     </app-authorized>
 
     <div class="group" *ngIf="users.visible || teams.visible || tokens.visible">Identity</div>

components/automate-ui/src/app/entities/automate-settings/automate-settings.effects.ts

@@ -1,5 +1,5 @@
 import { map, mergeMap, catchError } from 'rxjs/operators';
-import { forkJoin, of } from 'rxjs';
+import { of } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 
@@ -32,18 +32,8 @@ export class AutomateSettingsEffects {
   @Effect()
   configureSettings$ = this.actions$.pipe(
     ofType(AutomateSettingsActionTypes.CONFIGURE_SETTINGS),
-    mergeMap((action: ConfigureSettings) => {
-      const jobsRequests = [];
-      action.payload.jobs.forEach((job) => {
-        jobsRequests.push(this.requests.configureIngestJob(job));
-      });
-      return forkJoin(jobsRequests).pipe(
-        map((_resp) => new ConfigureSettingsSuccess({})),
-        catchError((error) => of(new ConfigureSettingsFailure(error))));
-    }));
-
-  @Effect()
-  configureSettingsSuccess$ = this.actions$.pipe(
-    ofType(AutomateSettingsActionTypes.CONFIGURE_SETTINGS_SUCCESS),
-    map((_action) => new GetSettings({})));
+    mergeMap((action: ConfigureSettings) => this.requests.configureIngestJobs(action.payload.jobs)),
+    map((_resp) => (new ConfigureSettingsSuccess({}))),
+    catchError((error) => of(new ConfigureSettingsFailure(error))
+    ));
 }

components/automate-ui/src/app/entities/automate-settings/automate-settings.model.ts

@@ -1,73 +1,181 @@
 export class JobSchedulerStatus {
-  running: boolean;
   jobs: IngestJob[];
 
-  constructor(running: boolean, ingestJobs: IngestJob[]) {
-    this.running = running;
+  constructor(ingestJobs: IngestJob[]) {
     this.jobs = ingestJobs;
   }
-
-  getJob(name: string): IngestJob {
-    return this.jobs.find((job: IngestJob) => job.name === name);
-  }
 }
 
 export interface ConfigureSettingsRequest {
   jobs: IngestJob[];
 }
 
 export interface RespJob {
-  running: boolean;
   name: string;
-  every: string;
+  nested_name?: string;
+  disabled: boolean;
+  recurrence: string;
   threshold: string;
-  last_run: Date;
-  next_run: Date;
-  last_elapsed: Date;
-  started_on: Date;
+  purge_policies: any; // TODO needs specific type
+  last_elapsed?: Date;
+  next_due_at?: Date;
+  last_enqueued_at?: Date;
+  last_started_at?: Date;
+  last_ended_at?: Date;
 }
 
 export interface RespJobSchedulerStatus {
-  running: boolean;
-  jobs: RespJob[];
+  infra: {
+    jobs: RespJob[];
+  };
+  compliance: {
+    jobs: RespJob[];
+  };
+  event_feed: {
+    jobs: RespJob[];
+  };
+  services: {
+    jobs: RespJob[];
+  };
 }
 
 // IngestJobs is an enum that defines the list of jobs that the
 // JobScheduler has inside the ingest-service
 export enum IngestJobs {
-  // MissingNodes: Checks when a node hasn't check-in
-  // for a period of time
-  MissingNodes = 'missing_nodes',
+  //  EventFeed
+  EventFeedRemoveData = 'eventFeedRemoveData',
+  EventFeedServerActions = 'eventFeedServerActions',
 
-  // MissingNodesForDeletion: Checks when a node has been missing
-  // for a period of time
+  // Service Groups
+  ServiceGroupNoHealthChecks = 'serviceGroupNoHealthChecks',
+  ServiceGroupRemoveServices = 'serviceGroupRemoveServices',
+
+  // Client Runs
+  ClientRunsRemoveData = 'clientRunsRemoveData',
+  ClientRunsLabelMissing = 'clientRunsLabelMissing',
+  ClientRunsRemoveNodes = 'clientRunsRemoveNodes',
+
+  // Compliance
+  ComplianceRemoveReports = 'complianceRemoveReports',
+  ComplianceRemoveScans = 'complianceRemoveScans'
+}
+
+export enum JobCategories {
+  Infra = 'infra',
+  Compliance = 'compliance',
+  EventFeed = 'event_feed',
+  Services = 'services'
+}
+
+export enum InfraJobName {
+  MissingNodes = 'missing_nodes',
   MissingNodesForDeletion = 'missing_nodes_for_deletion',
+  DeleteNodes = 'delete_nodes',
+  PeriodicPurgeTimeseries = 'periodic_purge_timeseries'
+}
 
-  // DeleteNodes: Removes completely from elasticsearch nodes that
-  // have been marked for deletion
-  DeleteNodes = 'delete_nodes'
+// Actions and ConvergeHistory are nested, but contained inside
+// the InfraJobName of PeriodicPurgeTimeseries
+export enum NestedJobName {
+  ComplianceReports = 'compliance-reports',
+  ComplianceScans = 'compliance-scans',
+  Feed = 'feed',
+  Actions = 'actions',
+  ConvergeHistory = 'converge-history'
 }
 
 export class IngestJob {
-  running: boolean;
+  category: JobCategories;
   name: string;
+  nested_name?: string;
+  recurrence?: string;
   threshold: string;
-  every?: string;
-  lastRun?: Date;
-  nextRun?: Date;
-  lastElapsed?: Date;
-  startedOn?: Date;
+  disabled: boolean;
+  purge_policies?: any; // TODO needs specific type
+  older_than_days?: number;
+  last_elapsed?: Date;
+  next_due_at?: Date;
+  last_enqueued_at?: Date;
+  last_started_at?: Date;
+  last_ended_at?: Date;
 
-  constructor(respJob: RespJob) {
+  constructor(category: JobCategories, respJob: RespJob) {
     if (respJob !== null) {
-      this.running = respJob.running;
+      this.category = category;
       this.name = respJob.name;
-      this.every = respJob.every;
+      this.nested_name = respJob.nested_name;
+      this.disabled = respJob.disabled;
+      this.recurrence = respJob.recurrence;
       this.threshold = respJob.threshold;
-      this.lastRun = new Date(respJob.last_run);
-      this.nextRun = new Date(respJob.next_run);
-      this.lastElapsed = new Date(respJob.last_elapsed);
-      this.startedOn = new Date(respJob.started_on);
+      this.purge_policies = respJob.purge_policies;
+      this.last_elapsed = new Date(respJob.last_elapsed);
+      this.next_due_at = new Date(respJob.next_due_at);
+      this.last_enqueued_at = new Date(respJob.last_enqueued_at);
+      this.last_started_at = new Date(respJob.last_started_at);
+      this.last_ended_at = new Date(respJob.last_ended_at);
     }
   }
 }
+
+export class UnfurledJob {
+  disabled: boolean;
+  policy_name?: string;
+  older_than_days?: number;
+  name?: string;
+  threshold?: string;
+}
+
+// A JobRequestComponent is very flexible so that it may contain
+// contain an older API Job object and a newer API Job Object
+export class JobRequestComponent {
+  disabled?: boolean;
+  name?: string;
+  threshold?: string | number;
+  purge_policies?: {
+    elasticsearch?: UnfurledJob[];
+  };
+}
+
+export interface JobRequestBody {
+  infra: {
+    job_settings: JobRequestComponent[];
+  };
+  compliance: {
+    job_settings: JobRequestComponent[];
+  };
+  event_feed: {
+    job_settings: JobRequestComponent[];
+  };
+  // services has not yet been implemented so we will leave as optional for now
+  services?: {
+    job_settings: JobRequestComponent[];
+  };
+}
+
+export interface SingleDefaultForm {
+  category: JobCategories;
+  name?: string;                  // TODO; make stricter after services implemented
+  nested_name?: NestedJobName;
+  unit: {
+    value: string;
+    disabled: boolean;
+  };
+  threshold: {
+    value: string;
+    disabled: boolean;
+  };
+  disabled: boolean;
+}
+
+export interface DefaultFormData {
+  eventFeedRemoveData: SingleDefaultForm;
+  eventFeedServerActions: SingleDefaultForm;
+  serviceGroupNoHealthChecks: SingleDefaultForm;
+  serviceGroupRemoveServices: SingleDefaultForm;
+  clientRunsRemoveData: SingleDefaultForm;
+  clientRunsLabelMissing: SingleDefaultForm;
+  clientRunsRemoveNodes: SingleDefaultForm;
+  complianceRemoveReports: SingleDefaultForm;
+  complianceRemoveScans: SingleDefaultForm;
+}
+