[Fleet] Pass policy namespace to agent monitoring settings (elastic#1…

…00500) * Pass agent policy namespace to agent monitoring settings * Adjust copy
ecezalp · May 26, 2021 · 6fa4d6f · 6fa4d6f
1 parent 30fa586
commit 6fa4d6f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -91,6 +91,7 @@ export interface FullAgentPolicy {
   revision?: number;
   agent?: {
     monitoring: {
+      namespace?: string;
       use_output?: string;
       enabled: boolean;
       metrics: boolean;

diff --git a/...ns/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx b/...ns/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
@@ -223,7 +223,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
         description={
           <FormattedMessage
             id="xpack.fleet.agentPolicyForm.monitoringDescription"
-            defaultMessage="Collect data about your agents for debugging and tracking performance."
+            defaultMessage="Collect data about your agents for debugging and tracking performance. Monitoring data will be written to the default namespace specified above."
           />
         }
       >

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
@@ -185,6 +185,7 @@ describe('agent policy', () => {
 
     it('should return a policy with monitoring if monitoring is enabled for logs', async () => {
       const soClient = getSavedObjectMock({
+        namespace: 'default',
         revision: 1,
         monitoring_enabled: ['logs'],
       });
@@ -207,6 +208,7 @@ describe('agent policy', () => {
         },
         agent: {
           monitoring: {
+            namespace: 'default',
             use_output: 'default',
             enabled: true,
             logs: true,
@@ -218,6 +220,7 @@ describe('agent policy', () => {
 
     it('should return a policy with monitoring if monitoring is enabled for metrics', async () => {
       const soClient = getSavedObjectMock({
+        namespace: 'default',
         revision: 1,
         monitoring_enabled: ['metrics'],
       });
@@ -240,6 +243,7 @@ describe('agent policy', () => {
         },
         agent: {
           monitoring: {
+            namespace: 'default',
             use_output: 'default',
             enabled: true,
             logs: false,

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -730,6 +730,7 @@ class AgentPolicyService {
         ? {
             agent: {
               monitoring: {
+                namespace: agentPolicy.namespace,
                 use_output: defaultOutput.name,
                 enabled: true,
                 logs: agentPolicy.monitoring_enabled.includes(dataTypes.Logs),