[Fleet] Change permissions for Fleet enroll role (#85802) (#85916)

* Add APM traces index names to Fleet enroll role * Removes fleet permissions for `events-*` as they became obsolete fixes #85761
elastic · Dec 15, 2020 · d0c88d5 · d0c88d5
1 parent 689cb12
commit d0c88d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/x-pack/plugins/fleet/server/services/api_keys/index.ts b/x-pack/plugins/fleet/server/services/api_keys/index.ts
@@ -24,7 +24,7 @@ export async function generateOutputApiKey(
       cluster: ['monitor'],
       index: [
         {
-          names: ['logs-*', 'metrics-*', 'events-*', '.ds-logs-*', '.ds-metrics-*', '.ds-events-*'],
+          names: ['logs-*', 'metrics-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces-*'],
           privileges: ['write', 'create_index', 'indices:admin/auto_create'],
         },
       ],

diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
@@ -139,7 +139,7 @@ export async function setupFleet(
       cluster: ['monitor', 'manage_api_key'],
       indices: [
         {
-          names: ['logs-*', 'metrics-*', 'events-*', '.ds-logs-*', '.ds-metrics-*', '.ds-events-*'],
+          names: ['logs-*', 'metrics-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces-*'],
           privileges: ['write', 'create_index', 'indices:admin/auto_create'],
         },
       ],

diff --git a/x-pack/test/fleet_api_integration/apis/agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agents_setup.ts
@@ -62,10 +62,10 @@ export default function (providerContext: FtrProviderContext) {
             names: [
               'logs-*',
               'metrics-*',
-              'events-*',
+              'traces-*',
               '.ds-logs-*',
               '.ds-metrics-*',
-              '.ds-events-*',
+              '.ds-traces-*',
             ],
             privileges: ['write', 'create_index', 'indices:admin/auto_create'],
             allow_restricted_indices: false,