Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fleet] Installation of hidden field #85703

Merged
merged 12 commits into from
Dec 14, 2020
Merged

[Fleet] Installation of hidden field #85703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6e31537
add hidden datastream and ilm policy
nnamdifrankie Dec 9, 2020
128db0f
add files
nnamdifrankie Dec 10, 2020
21b498e
fix tests, some types
kevinlog Dec 11, 2020
204d903
Merge branch 'master' of github.com:kevinlog/kibana into add-installa…
kevinlog Dec 11, 2020
e1b3f5c
fix type
kevinlog Dec 11, 2020
f6433aa
unskip tests
kevinlog Dec 11, 2020
3ff0246
isolate hidden field change
kevinlog Dec 11, 2020
bef91a9
add unit test
kevinlog Dec 11, 2020
93248e6
fix types
kevinlog Dec 11, 2020
b2b8691
fix test
kevinlog Dec 11, 2020
14d8ff8
Merge branch 'master' into installation-hidden-field
kibanamachine Dec 14, 2020
6d1ca5e
drop extraneous code in hidden field in func signatures
kevinlog Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion x-pack/plugins/fleet/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ export type ElasticsearchAssetTypeToParts = Record<

export interface RegistryDataStream {
type: string;
hidden?: boolean;
dataset: string;
title: string;
release: string;
Expand Down Expand Up @@ -319,7 +320,7 @@ export interface IndexTemplate {
mappings: any;
aliases: object;
};
data_stream: object;
data_stream: { hidden?: boolean };
composed_of: string[];
_meta: object;
}
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ export async function installTemplate({
pipelineName,
packageName,
composedOfTemplates,
hidden: dataStream.hidden,
});

// TODO: Check return values for errors
Expand Down
25 changes: 25 additions & 0 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,31 @@ test('adds empty composed_of correctly', () => {
expect(template.composed_of).toStrictEqual(composedOfTemplates);
});

test('adds hidden field correctly', () => {
const templateWithHiddenName = 'logs-nginx-access-abcd';

const templateWithHidden = getTemplate({
type: 'logs',
templateName: templateWithHiddenName,
packageName: 'nginx',
mappings: { properties: {} },
composedOfTemplates: [],
hidden: true,
});
expect(templateWithHidden.data_stream.hidden).toEqual(true);

const templateWithoutHiddenName = 'logs-nginx-access-efgh';

const templateWithoutHidden = getTemplate({
type: 'logs',
templateName: templateWithoutHiddenName,
packageName: 'nginx',
mappings: { properties: {} },
composedOfTemplates: [],
});
expect(templateWithoutHidden.data_stream.hidden).toEqual(undefined);
});

test('tests loading base.yml', () => {
const ymlPath = path.join(__dirname, '../../fields/tests/base.yml');
const fieldsYML = readFileSync(ymlPath, 'utf-8');
Expand Down
16 changes: 13 additions & 3 deletions x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,24 @@ export function getTemplate({
pipelineName,
packageName,
composedOfTemplates,
hidden,
}: {
type: string;
templateName: string;
mappings: IndexTemplateMappings;
pipelineName?: string | undefined;
packageName: string;
composedOfTemplates: string[];
hidden?: boolean;
}): IndexTemplate {
const template = getBaseTemplate(type, templateName, mappings, packageName, composedOfTemplates);
const template = getBaseTemplate(
type,
templateName,
mappings,
packageName,
composedOfTemplates,
hidden
);
if (pipelineName) {
template.template.settings.index.default_pipeline = pipelineName;
}
Expand Down Expand Up @@ -253,7 +262,8 @@ function getBaseTemplate(
templateName: string,
mappings: IndexTemplateMappings,
packageName: string,
composedOfTemplates: string[]
composedOfTemplates: string[],
hidden?: boolean
): IndexTemplate {
// Meta information to identify Ingest Manager's managed templates and indices
const _meta = {
Expand Down Expand Up @@ -324,7 +334,7 @@ function getBaseTemplate(
// To be filled with the aliases that we need
aliases: {},
},
data_stream: {},
data_stream: { hidden },
composed_of: composedOfTemplates,
_meta,
};
Expand Down