[Ingest Manager] Rename settings.monitoring to agent.monitoring (#…

…71467) * Rename settings.monitoring to agent.monitoring; simplify default file name for downloaded agent yaml * Fix test
elastic · Jul 13, 2020 · 7282597 · 7282597
1 parent ec43d45
commit 7282597
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
@@ -12,7 +12,7 @@ const CONFIG_KEYS_ORDER = [
   'revision',
   'type',
   'outputs',
-  'settings',
+  'agent',
   'inputs',
   'enabled',
   'use_output',

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
@@ -62,7 +62,7 @@ export interface FullAgentConfig {
   };
   inputs: FullAgentConfigInput[];
   revision?: number;
-  settings?: {
+  agent?: {
     monitoring: {
       use_output?: string;
       enabled: boolean;

diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -283,7 +283,7 @@ export const downloadFullAgentConfig: RequestHandler<
       const body = configToYaml(fullAgentConfig);
       const headers: ResponseHeaders = {
         'content-type': 'text/x-yaml',
-        'content-disposition': `attachment; filename="elastic-agent-config-${fullAgentConfig.id}.yml"`,
+        'content-disposition': `attachment; filename="elastic-agent.yml"`,
       };
       return response.ok({
         body,

diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
@@ -61,7 +61,7 @@ describe('agent config', () => {
         },
         inputs: [],
         revision: 1,
-        settings: {
+        agent: {
           monitoring: {
             enabled: false,
             logs: false,
@@ -90,7 +90,7 @@ describe('agent config', () => {
         },
         inputs: [],
         revision: 1,
-        settings: {
+        agent: {
           monitoring: {
             use_output: 'default',
             enabled: true,
@@ -120,7 +120,7 @@ describe('agent config', () => {
         },
         inputs: [],
         revision: 1,
-        settings: {
+        agent: {
           monitoring: {
             use_output: 'default',
             enabled: true,

diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -417,7 +417,7 @@ class AgentConfigService {
       revision: config.revision,
       ...(config.monitoring_enabled && config.monitoring_enabled.length > 0
         ? {
-            settings: {
+            agent: {
               monitoring: {
                 use_output: defaultOutput.name,
                 enabled: true,
@@ -427,7 +427,7 @@ class AgentConfigService {
             },
           }
         : {
-            settings: {
+            agent: {
               monitoring: { enabled: false, logs: false, metrics: false },
             },
           }),

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -195,7 +195,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             },
           },
           revision: 3,
-          settings: {
+          agent: {
             monitoring: {
               enabled: false,
               logs: false,