Move default cluster permissions out of getPackagePermissions

elastic · Apr 14, 2021 · fb90525 · fb90525
1 parent b6b1337
commit fb90525
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -286,8 +286,8 @@ export interface RegistryDataStreamPermissions {
 }
 
 export interface PackagePermissions {
-  cluster: string[];
-  indices: Array<{ names: string[]; privileges: string[] }>;
+  cluster?: string[];
+  indices?: Array<{ names: string[]; privileges: string[] }>;
 }
 
 export type RegistryVarType = 'integer' | 'bool' | 'password' | 'text' | 'yaml' | 'string';

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -779,6 +779,9 @@ class AgentPolicyService {
           )
         )
       );
+      permissions._elastic_agent_checks = {
+        cluster: DEFAULT_PERMISSIONS.cluster,
+      };
     } else {
       permissions = {
         _fallback: DEFAULT_PERMISSIONS,

diff --git a/x-pack/plugins/fleet/server/services/epm/packages/permissions.ts b/x-pack/plugins/fleet/server/services/epm/packages/permissions.ts
@@ -26,8 +26,6 @@ export async function getPackagePermissions(
   const indices: PackagePermissions['indices'] = pkg.data_streams!.map((ds) => {
     if (ds.permissions?.cluster) {
       ds.permissions.cluster.forEach((p) => clusterPermissions.add(p));
-    } else {
-      clusterPermissions.add('monitor');
     }
 
     let index = `${ds.type}-${ds.dataset}-${namespace}`;
@@ -45,7 +43,7 @@ export async function getPackagePermissions(
   });
 
   return {
-    cluster: Array.from(clusterPermissions),
+    cluster: clusterPermissions.size > 0 ? Array.from(clusterPermissions) : undefined,
     indices,
   };
 }