[Ingest] Add additional attributes to the Datasources Saved Object

x-pack/plugins/endpoint/common/generate_data.ts

@@ -504,10 +504,15 @@ export class EndpointDocGenerator {
    * Generates an Ingest `datasource` that includes the Endpoint Policy data
    */
   public generatePolicyDatasource(): PolicyData {
+    const created = new Date(Date.now() - 8.64e7).toISOString(); // 24h ago
     return {
       id: this.seededUUIDv4(),
       name: 'Endpoint Policy',
       description: 'Policy to protect the worlds data',
+      created_on: created,
+      created_by: 'elastic',
+      updated_on: new Date().toISOString(),
+      updated_by: 'elastic',
       config_id: this.seededUUIDv4(),
       enabled: true,
       output_id: '',

x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts

@@ -28,6 +28,10 @@ describe('policy details: ', () => {
           id: '',
           name: '',
           description: '',
+          created_on: '',
+          created_by: '',
+          updated_on: '',
+          updated_by: '',
           config_id: '',
           enabled: true,
           output_id: '',

x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts

@@ -11,6 +11,10 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
     id: 'some-uuid',
     name: 'mock-datasource',
     description: '',
+    created_on: '',
+    created_by: '',
+    updated_on: '',
+    updated_by: '',
     config_id: '',
     enabled: true,
     output_id: '',

x-pack/plugins/ingest_manager/common/types/models/datasource.ts

@@ -58,4 +58,8 @@ export interface Datasource extends Omit<NewDatasource, 'inputs'> {
   id: string;
   inputs: DatasourceInput[];
   revision: number;
+  updated_on: string;
+  updated_by: string;
+  created_on: string;
+  created_by: string;
 }

x-pack/plugins/ingest_manager/server/saved_objects.ts → x-pack/plugins/ingest_manager/server/saved_objects/index.ts

@@ -5,7 +5,7 @@
  */
 
 import { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
+import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
   AGENT_CONFIG_SAVED_OBJECT_TYPE,
@@ -16,7 +16,8 @@ import {
   AGENT_ACTION_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJET_TYPE,
-} from './constants';
+} from '../constants';
+import { migrateDatasourcesToV790 } from './migrations/datasources_v790';
 
 /*
  * Saved object types and mappings
@@ -218,8 +219,15 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
           },
         },
         revision: { type: 'integer' },
+        updated_on: { type: 'keyword' },
+        updated_by: { type: 'keyword' },
+        created_on: { type: 'keyword' },
+        created_by: { type: 'keyword' },
       },
     },
+    migrations: {
+      '7.9.0': migrateDatasourcesToV790,
+    },
   },
   [PACKAGES_SAVED_OBJECT_TYPE]: {
     name: PACKAGES_SAVED_OBJECT_TYPE,

x-pack/plugins/ingest_manager/server/saved_objects/migrations/datasources_v790.ts

@@ -0,0 +1,29 @@
+/*
+ * 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 { SavedObjectMigrationFn } from 'kibana/server';
+import { cloneDeep } from 'lodash';
+import { Datasource } from '../../types/models';
+
+type Pre790Datasource = Exclude<
+  Datasource,
+  'created_on' | 'created_by' | 'updated_on' | 'updated_by'
+>;
+
+export const migrateDatasourcesToV790: SavedObjectMigrationFn<
+  Pre790Datasource,
+  Datasource
+> = doc => {
+  const updatedDatasource = cloneDeep(doc);
+  const defDate = new Date().toISOString();
+
+  updatedDatasource.attributes.created_by = 'system';
+  updatedDatasource.attributes.created_on = updatedDatasource?.updated_at ?? defDate;
+  updatedDatasource.attributes.updated_by = 'system';
+  updatedDatasource.attributes.updated_on = updatedDatasource?.updated_at ?? defDate;
+
+  return updatedDatasource;
+};

x-pack/plugins/ingest_manager/server/services/datasource.ts

@@ -31,11 +31,16 @@ class DatasourceService {
     datasource: NewDatasource,
     options?: { id?: string; user?: AuthenticatedUser }
   ): Promise<Datasource> {
+    const isoDate = new Date().toISOString();
     const newSo = await soClient.create<Omit<Datasource, 'id'>>(
       SAVED_OBJECT_TYPE,
       {
         ...datasource,
         revision: 1,
+        created_on: isoDate,
+        created_by: options?.user?.username ?? 'system',
+        updated_on: isoDate,
+        updated_by: options?.user?.username ?? 'system',
       },
       options
     );
@@ -134,6 +139,8 @@ class DatasourceService {
     await soClient.update<Datasource>(SAVED_OBJECT_TYPE, id, {
       ...datasource,
       revision: oldDatasource.revision + 1,
+      updated_on: new Date().toISOString(),
+      updated_by: options?.user?.username ?? 'system',
     });
 
     // Bump revision of associated agent config