From f430f22e5dc3b6e6e37e65819aec1a7d00c66206 Mon Sep 17 00:00:00 2001 From: simitt Date: Mon, 14 Dec 2020 13:38:22 +0100 Subject: [PATCH 1/4] [Fleet] Add APM traces index names to Fleet enroll role fixes #85761 --- .../plugins/fleet/server/services/api_keys/index.ts | 11 ++++++++++- x-pack/plugins/fleet/server/services/setup.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 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 index 2e0ccdbcfdca6..d6284166ec9a4 100644 --- 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,16 @@ export async function generateOutputApiKey( cluster: ['monitor'], index: [ { - names: ['logs-*', 'metrics-*', 'events-*', '.ds-logs-*', '.ds-metrics-*', '.ds-events-*'], + names: [ + 'logs-*', + 'metrics-*', + 'events-*', + 'traces-*', + '.ds-logs-*', + '.ds-metrics-*', + '.ds-events-*', + '.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 index ffdaaecd9eb04..8ac0d111844c9 100644 --- a/x-pack/plugins/fleet/server/services/setup.ts +++ b/x-pack/plugins/fleet/server/services/setup.ts @@ -139,7 +139,16 @@ export async function setupFleet( cluster: ['monitor', 'manage_api_key'], indices: [ { - names: ['logs-*', 'metrics-*', 'events-*', '.ds-logs-*', '.ds-metrics-*', '.ds-events-*'], + names: [ + 'logs-*', + 'metrics-*', + 'events-*', + 'traces-*', + '.ds-logs-*', + '.ds-metrics-*', + '.ds-events-*', + '.ds-traces', + ], privileges: ['write', 'create_index', 'indices:admin/auto_create'], }, ], From 650375475e39cb594fe28f929e35203af5379afb Mon Sep 17 00:00:00 2001 From: simitt Date: Mon, 14 Dec 2020 17:43:25 +0100 Subject: [PATCH 2/4] Remove obsolete `events` from permissions --- .../plugins/fleet/server/services/api_keys/index.ts | 11 +---------- x-pack/plugins/fleet/server/services/setup.ts | 11 +---------- 2 files changed, 2 insertions(+), 20 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 index d6284166ec9a4..4dc398c1c0c35 100644 --- a/x-pack/plugins/fleet/server/services/api_keys/index.ts +++ b/x-pack/plugins/fleet/server/services/api_keys/index.ts @@ -24,16 +24,7 @@ export async function generateOutputApiKey( cluster: ['monitor'], index: [ { - names: [ - 'logs-*', - 'metrics-*', - 'events-*', - 'traces-*', - '.ds-logs-*', - '.ds-metrics-*', - '.ds-events-*', - '.ds-traces-*', - ], + 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 index 8ac0d111844c9..97032f4848e52 100644 --- a/x-pack/plugins/fleet/server/services/setup.ts +++ b/x-pack/plugins/fleet/server/services/setup.ts @@ -139,16 +139,7 @@ export async function setupFleet( cluster: ['monitor', 'manage_api_key'], indices: [ { - names: [ - 'logs-*', - 'metrics-*', - 'events-*', - 'traces-*', - '.ds-logs-*', - '.ds-metrics-*', - '.ds-events-*', - '.ds-traces', - ], + names: ['logs-*', 'metrics-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces'], privileges: ['write', 'create_index', 'indices:admin/auto_create'], }, ], From 29fb200d9edc63a343bd3e9767bc09e8275ec6f8 Mon Sep 17 00:00:00 2001 From: simitt Date: Mon, 14 Dec 2020 17:46:52 +0100 Subject: [PATCH 3/4] fix test --- x-pack/test/fleet_api_integration/apis/agents_setup.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/test/fleet_api_integration/apis/agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agents_setup.ts index 4da1335da9a6c..85e533a569c87 100644 --- 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, From fdb4e8c8cbd4386f38cabb24b0a06f74b8ec9cf7 Mon Sep 17 00:00:00 2001 From: simitt Date: Mon, 14 Dec 2020 20:07:14 +0100 Subject: [PATCH 4/4] fix typo --- x-pack/plugins/fleet/server/services/setup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts index 97032f4848e52..a3df7bc3dcdc4 100644 --- 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-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces'], + names: ['logs-*', 'metrics-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces-*'], privileges: ['write', 'create_index', 'indices:admin/auto_create'], }, ],