From 34348522ca60eff582876589cc09af8e2a502d0c Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 14 Feb 2022 12:43:35 -0500
Subject: [PATCH] [Fleet] Fix invalid permission entry if the elastic agent
 package is not installed (#125447) (#125529)

(cherry picked from commit d383bda82ebcbc6c96e5353f7a15673c71c2b2ab)

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
---
 .../agent_policies/monitoring_permissions.test.ts        | 9 +++++++++
 .../services/agent_policies/monitoring_permissions.ts    | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
index 3d928bed0f66..097cbd551fad 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
@@ -43,6 +43,15 @@ describe('getMonitoringPermissions', () => {
       );
       expect(permissions).toMatchSnapshot();
     });
+
+    it('should an empty valid permission entry if neither metrics and logs are enabled', async () => {
+      const permissions = await getMonitoringPermissions(
+        savedObjectsClientMock.create(),
+        { logs: false, metrics: false },
+        'testnamespace123'
+      );
+      expect(permissions).toEqual({ _elastic_agent_monitoring: { indices: [] } });
+    });
   });
 
   describe('With elastic agent package installed', () => {
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
index 3533d829e134..7e897d62c8be 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
@@ -30,6 +30,14 @@ function buildDefault(enabled: { logs: boolean; metrics: boolean }, namespace: s
     );
   }
 
+  if (names.length === 0) {
+    return {
+      _elastic_agent_monitoring: {
+        indices: [],
+      },
+    };
+  }
+
   return {
     _elastic_agent_monitoring: {
       indices: [