[Fleet] add leading dot to hidden indices (#86277)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: John Schulz <github.com@jfsiii.org>
elastic · Jan 4, 2021 · 5e5a410 · 5e5a410
1 parent 4c3c2ac
commit 5e5a410
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 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,16 @@ export async function generateOutputApiKey(
       cluster: ['monitor'],
       index: [
         {
-          names: ['logs-*', 'metrics-*', 'traces-*', '.ds-logs-*', '.ds-metrics-*', '.ds-traces-*'],
+          names: [
+            'logs-*',
+            'metrics-*',
+            'traces-*',
+            '.ds-logs-*',
+            '.ds-metrics-*',
+            '.ds-traces-*',
+            '.logs-endpoint.diagnostic.collection-*',
+            '.ds-.logs-endpoint.diagnostic.collection-*',
+          ],
           privileges: ['write', 'create_index', 'indices:admin/auto_create'],
         },
       ],

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
@@ -20,3 +20,18 @@ test('getBaseName', () => {
   const name = getRegistryDataStreamAssetBaseName(dataStream);
   expect(name).toStrictEqual('logs-nginx.access');
 });
+
+test('getBaseName for hidden index', () => {
+  const dataStream: RegistryDataStream = {
+    dataset: 'nginx.access',
+    title: 'Nginx Acess Logs',
+    release: 'beta',
+    type: 'logs',
+    ingest_pipeline: 'default',
+    package: 'nginx',
+    path: 'access',
+    hidden: true,
+  };
+  const name = getRegistryDataStreamAssetBaseName(dataStream);
+  expect(name).toStrictEqual('.logs-nginx.access');
+});
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.ts
@@ -11,5 +11,6 @@ import { RegistryDataStream } from '../../../types';
  * {type}-{dataset}
  */
 export function getRegistryDataStreamAssetBaseName(dataStream: RegistryDataStream): string {
-  return `${dataStream.type}-${dataStream.dataset}`;
+  const baseName = `${dataStream.type}-${dataStream.dataset}`;
+  return dataStream.hidden ? `.${baseName}` : baseName;
 }
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
@@ -137,7 +137,16 @@ 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-*',
+            '.logs-endpoint.diagnostic.collection-*',
+            '.ds-.logs-endpoint.diagnostic.collection-*',
+          ],
           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
@@ -66,6 +66,8 @@ export default function (providerContext: FtrProviderContext) {
               '.ds-logs-*',
               '.ds-metrics-*',
               '.ds-traces-*',
+              '.logs-endpoint.diagnostic.collection-*',
+              '.ds-.logs-endpoint.diagnostic.collection-*',
             ],
             privileges: ['write', 'create_index', 'indices:admin/auto_create'],
             allow_restricted_indices: false,