Skip to content

Commit 06993c4

Browse files
kevinlognnamdifrankiekibanamachine
authored
[Fleet] Installation of hidden field (#85703)
Co-authored-by: nnamdifrankie <franklin.ejoh@elastic.co> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent d909a96 commit 06993c4

File tree

4 files changed

+41
-4
lines changed

4 files changed

+41
-4
lines changed

x-pack/plugins/fleet/common/types/models/epm.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ export type ElasticsearchAssetTypeToParts = Record<
207207

208208
export interface RegistryDataStream {
209209
type: string;
210+
hidden?: boolean;
210211
dataset: string;
211212
title: string;
212213
release: string;
@@ -319,7 +320,7 @@ export interface IndexTemplate {
319320
mappings: any;
320321
aliases: object;
321322
};
322-
data_stream: object;
323+
data_stream: { hidden?: boolean };
323324
composed_of: string[];
324325
_meta: object;
325326
}

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ export async function installTemplate({
314314
pipelineName,
315315
packageName,
316316
composedOfTemplates,
317+
hidden: dataStream.hidden,
317318
});
318319

319320
// TODO: Check return values for errors

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,31 @@ test('adds empty composed_of correctly', () => {
6060
expect(template.composed_of).toStrictEqual(composedOfTemplates);
6161
});
6262

63+
test('adds hidden field correctly', () => {
64+
const templateWithHiddenName = 'logs-nginx-access-abcd';
65+
66+
const templateWithHidden = getTemplate({
67+
type: 'logs',
68+
templateName: templateWithHiddenName,
69+
packageName: 'nginx',
70+
mappings: { properties: {} },
71+
composedOfTemplates: [],
72+
hidden: true,
73+
});
74+
expect(templateWithHidden.data_stream.hidden).toEqual(true);
75+
76+
const templateWithoutHiddenName = 'logs-nginx-access-efgh';
77+
78+
const templateWithoutHidden = getTemplate({
79+
type: 'logs',
80+
templateName: templateWithoutHiddenName,
81+
packageName: 'nginx',
82+
mappings: { properties: {} },
83+
composedOfTemplates: [],
84+
});
85+
expect(templateWithoutHidden.data_stream.hidden).toEqual(undefined);
86+
});
87+
6388
test('tests loading base.yml', () => {
6489
const ymlPath = path.join(__dirname, '../../fields/tests/base.yml');
6590
const fieldsYML = readFileSync(ymlPath, 'utf-8');

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,24 @@ export function getTemplate({
4545
pipelineName,
4646
packageName,
4747
composedOfTemplates,
48+
hidden,
4849
}: {
4950
type: string;
5051
templateName: string;
5152
mappings: IndexTemplateMappings;
5253
pipelineName?: string | undefined;
5354
packageName: string;
5455
composedOfTemplates: string[];
56+
hidden?: boolean;
5557
}): IndexTemplate {
56-
const template = getBaseTemplate(type, templateName, mappings, packageName, composedOfTemplates);
58+
const template = getBaseTemplate(
59+
type,
60+
templateName,
61+
mappings,
62+
packageName,
63+
composedOfTemplates,
64+
hidden
65+
);
5766
if (pipelineName) {
5867
template.template.settings.index.default_pipeline = pipelineName;
5968
}
@@ -253,7 +262,8 @@ function getBaseTemplate(
253262
templateName: string,
254263
mappings: IndexTemplateMappings,
255264
packageName: string,
256-
composedOfTemplates: string[]
265+
composedOfTemplates: string[],
266+
hidden?: boolean
257267
): IndexTemplate {
258268
// Meta information to identify Ingest Manager's managed templates and indices
259269
const _meta = {
@@ -324,7 +334,7 @@ function getBaseTemplate(
324334
// To be filled with the aliases that we need
325335
aliases: {},
326336
},
327-
data_stream: {},
337+
data_stream: { hidden },
328338
composed_of: composedOfTemplates,
329339
_meta,
330340
};

0 commit comments

Comments
 (0)