Add revision to full agent config output

elastic · Mar 10, 2020 · b68e0ab · b68e0ab
1 parent fb7d5cf
commit b68e0ab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
@@ -15,7 +15,6 @@ export const storedDatasourceToAgentDatasource = (
     namespace,
     enabled,
     use_output: DEFAULT_OUTPUT.name, // TODO: hardcoded to default output for now
-    package: undefined,
     inputs: inputs
       .filter(input => input.enabled)
       .map(input => ({
@@ -46,8 +45,6 @@ export const storedDatasourceToAgentDatasource = (
       name: pkg.name,
       version: pkg.version,
     };
-  } else {
-    delete fullDatasource.package;
   }
 
   return fullDatasource;

diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -57,4 +57,5 @@ export interface FullAgentConfig {
     };
   };
   datasources: FullAgentConfigDatasource[];
+  revision?: number;
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -304,6 +304,7 @@ class AgentConfigService {
       datasources: (config.datasources as Datasource[]).map(ds =>
         storedDatasourceToAgentDatasource(ds)
       ),
+      revision: config.revision,
     };
 
     return agentConfig;
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,4 +57,5 @@ export interface FullAgentConfig { @@
         };
       };
       datasources: FullAgentConfigDatasource[];
+      revision?: number;
     }