maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: John Schulz <github.com@jfsiii.org>
This commit is contained in:
Kevin Logan 2021-01-04 10:50:54 -05:00 committed by GitHub
parent 4c3c2ac156
commit 5e5a410204
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x-pack/plugins/fleet/server/services/api_keys/index.ts
View file

@ -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'],
},
],

15
x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
View file

@ -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');
});

3
x-pack/plugins/fleet/server/services/epm/elasticsearch/index.ts
View file

@ -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;
}

11
x-pack/plugins/fleet/server/services/setup.ts
View file

@ -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'],
},
],

2
x-pack/test/fleet_api_integration/apis/agents_setup.ts
View file

@ -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,