Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,14 @@ export const TELEMETRY_INDEX_SETTINGS_EVENT: EventTypeOpts<IndicesSettings> = {
type: 'keyword',
_meta: { description: 'The name of the index.' },
},
index_mode: {
type: 'keyword',
_meta: { optional: true, description: 'Index mode.' },
},
source_mode: {
type: 'keyword',
_meta: { optional: true, description: 'Source mode.' },
},
default_pipeline: {
type: 'keyword',
_meta: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ export interface IndicesSettings {

export interface IndexSettings {
index_name: string;
index_mode?: string;
default_pipeline?: string;
final_pipeline?: string;
source_mode?: string;
}

export interface Index {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1344,8 +1344,10 @@ export class TelemetryReceiver implements ITelemetryReceiver {
index: '*',
expand_wildcards: ['open', 'hidden'],
filter_path: [
'*.settings.index.final_pipeline',
'*.mappings._source.mode',
'*.settings.index.default_pipeline',
'*.settings.index.final_pipeline',
'*.settings.index.mode',
'*.settings.index.provided_name',
],
};
Expand All @@ -1358,6 +1360,8 @@ export class TelemetryReceiver implements ITelemetryReceiver {
index_name: index,
default_pipeline: value.settings?.index?.default_pipeline,
final_pipeline: value.settings?.index?.final_pipeline,
index_mode: value.settings?.index?.mode,
source_mode: value.mappings?._source?.mode,
} as IndexSettings;
})
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import { Client } from '@elastic/elasticsearch';
import type { IndicesPutIndexTemplateRequest } from '@elastic/elasticsearch/lib/api/types';

const INGEST_PIPELINE_PREFIX = 'testing-ingest-pipeline';
const DS_PREFIX = 'testing-datastream';
Expand All @@ -28,41 +29,44 @@ export const randomDatastream = async (
): Promise<string> => {
const name = `${DS_PREFIX}-${Date.now()}`;

let settings = {};
const indexTemplateBody: IndicesPutIndexTemplateRequest = {
name: DS_PREFIX,
index_patterns: [`${DS_PREFIX}-*`],
data_stream: {},
template: {
settings: {
index: {
mode: 'standard',
mapping: {},
},
},
},
};

if (opts.policyName) {
settings = {
...settings,
'index.lifecycle.name': opts.policyName,
if (opts.policyName && indexTemplateBody.template?.settings !== undefined) {
indexTemplateBody.template.settings.index = {
...indexTemplateBody.template.settings.index,
lifecycle: {
name: opts.policyName,
},
};
}

if (opts.defaultPipeline) {
settings = {
...settings,
'index.default_pipeline': opts.defaultPipeline,
if (opts.defaultPipeline && indexTemplateBody.template?.settings !== undefined) {
indexTemplateBody.template.settings.index = {
...indexTemplateBody.template.settings.index,
default_pipeline: opts.defaultPipeline,
};
}

if (opts.finalPipeline) {
settings = {
...settings,
'index.final_pipeline': opts.finalPipeline,
if (opts.finalPipeline && indexTemplateBody.template?.settings !== undefined) {
indexTemplateBody.template.settings.index = {
...indexTemplateBody.template.settings.index,
final_pipeline: opts.finalPipeline,
};
}

const indexTemplateBody = {
index_patterns: [`${DS_PREFIX}-*`],
data_stream: {},
template: {
settings,
},
};

await es.indices.putIndexTemplate({
name: DS_PREFIX,
body: indexTemplateBody,
});
await es.indices.putIndexTemplate(indexTemplateBody);

await es.indices.createDataStream({ name });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,16 @@ export default ({ getService }: FtrProviderContext) => {
expect(events.filter((v) => v.final_pipeline === finalPipeline)).toHaveLength(NUM_INDICES);
});

it('should publish index mode as part of index settings', async () => {
const events = await launchTaskAndWaitForEvents({
eventTypes: [TELEMETRY_INDEX_SETTINGS_EVENT],
index: dsName,
});

expect(events.length).toEqual(NUM_INDICES);
expect(events.filter((v) => v.index_mode !== undefined)).toHaveLength(NUM_INDICES);
});

it('should publish index templates', async () => {
const events = await launchTaskAndWaitForEvents({
eventTypes: [TELEMETRY_INDEX_TEMPLATES_EVENT],
Expand Down