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

Add ".reindexed-v8-" prefix to the valid prefixes list #204819

Merged
merged 9 commits into from
Jan 7, 2025
Merged

Add ".reindexed-v8-" prefix to the valid prefixes list #204819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5fa7dec
wip
ymao1 Dec 18, 2024
cd64d02
Add "-" suffix to reindex prefixes
ersin-erdal Dec 18, 2024
eeeed32
Merge branch 'main' of github.com:elastic/kibana into reindexed-alerts
ymao1 Jan 2, 2025
dae22c8
Merge branch 'reindexed-alerts' of github.com:ymao1/kibana into reind…
ymao1 Jan 2, 2025
e6ae446
Fix unit tests
ersin-erdal Jan 2, 2025
68613ee
fix functional test
ersin-erdal Jan 3, 2025
437627a
Merge branch 'main' into reindexed-alerts
ersin-erdal Jan 3, 2025
001325c
Merge branch 'main' into reindexed-alerts
ersin-erdal Jan 6, 2025
54d7781
Merge branch 'main' into reindexed-alerts
ersin-erdal Jan 7, 2025
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
51 changes: 38 additions & 13 deletions x-pack/platform/plugins/shared/alerting/server/alerts_service/alerts_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ const getIndexTemplatePutBody = (opts?: GetIndexTemplatePutBodyOpts) => {

const indexPatterns = useDataStream
? [`.alerts-${context ? context : 'test'}.alerts-${namespace}`]
: [`.internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`];
: [
`.internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`,
`.reindexed-v8-internal.alerts-${context ? context : 'test'}.alerts-${namespace}-*`,
];
return {
name: `.alerts-${context ? context : 'test'}.alerts-${namespace}-index-template`,
body: {
Expand Down Expand Up @@ -564,7 +567,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
index: '.internal.alerts-test.alerts-default-*',
index: [
'.internal.alerts-test.alerts-default-*',
`.reindexed-v8-internal.alerts-test.alerts-default-*`,
],
name: '.alerts-test.alerts-*',
});
}
Expand Down Expand Up @@ -627,7 +633,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
index: '.internal.alerts-test.alerts-default-*',
index: [
'.internal.alerts-test.alerts-default-*',
`.reindexed-v8-internal.alerts-test.alerts-default-*`,
],
name: '.alerts-test.alerts-*',
});
}
Expand Down Expand Up @@ -686,7 +695,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
index: '.internal.alerts-test.alerts-default-*',
index: [
'.internal.alerts-test.alerts-default-*',
`.reindexed-v8-internal.alerts-test.alerts-default-*`,
],
name: '.alerts-test.alerts-*',
});
}
Expand Down Expand Up @@ -728,7 +740,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenNthCalledWith(1, {
index: '.internal.alerts-test.alerts-default-*',
index: [
'.internal.alerts-test.alerts-default-*',
`.reindexed-v8-internal.alerts-test.alerts-default-*`,
],
name: '.alerts-test.alerts-*',
});
}
Expand Down Expand Up @@ -792,7 +807,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenNthCalledWith(2, {
index: '.internal.alerts-test.alerts-another-namespace-*',
index: [
'.internal.alerts-test.alerts-another-namespace-*',
'.reindexed-v8-internal.alerts-test.alerts-another-namespace-*',
],
name: '.alerts-test.alerts-*',
});
}
Expand Down Expand Up @@ -826,7 +844,10 @@ describe('Alerts Service', () => {
})
);
expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
index: '.internal.alerts-test.alerts-default-*',
index: [
'.internal.alerts-test.alerts-default-*',
'.reindexed-v8-internal.alerts-test.alerts-default-*',
],
name: '.alerts-test.alerts-*',
});
expect(clusterClient.indices.putSettings).toHaveBeenCalledTimes(2);
Expand Down Expand Up @@ -871,11 +892,12 @@ describe('Alerts Service', () => {
const template = {
name: `.alerts-empty.alerts-default-index-template`,
body: {
index_patterns: [
useDataStreamForAlerts
? `.alerts-empty.alerts-default`
: `.internal.alerts-empty.alerts-default-*`,
],
index_patterns: useDataStreamForAlerts
? [`.alerts-empty.alerts-default`]
: [
`.internal.alerts-empty.alerts-default-*`,
`.reindexed-v8-internal.alerts-empty.alerts-default-*`,
],
composed_of: ['.alerts-framework-mappings'],
...(useDataStreamForAlerts ? { data_stream: { hidden: true } } : {}),
priority: 7,
Expand Down Expand Up @@ -931,7 +953,10 @@ describe('Alerts Service', () => {
},
});
expect(clusterClient.indices.getAlias).toHaveBeenCalledWith({
index: '.internal.alerts-empty.alerts-default-*',
index: [
'.internal.alerts-empty.alerts-default-*',
'.reindexed-v8-internal.alerts-empty.alerts-default-*',
],
name: '.alerts-empty.alerts-*',
});
}
Expand Down
10 changes: 6 additions & 4 deletions ...form/plugins/shared/alerting/server/alerts_service/lib/create_or_update_index_template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ export const getIndexTemplate = ({
namespace,
};

const dataStreamFields = dataStreamAdapter.getIndexTemplateFields(
indexPatterns.alias,
indexPatterns.pattern
);
const patterns: string[] = [indexPatterns.pattern];
if (indexPatterns.reindexedPattern) {
patterns.push(indexPatterns.reindexedPattern);
}

const dataStreamFields = dataStreamAdapter.getIndexTemplateFields(indexPatterns.alias, patterns);

const indexLifecycle = {
name: ilmPolicyName,
Expand Down
17 changes: 11 additions & 6 deletions x-pack/platform/plugins/shared/alerting/server/alerts_service/lib/data_stream_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { retryTransientEsErrors } from './retry_transient_es_errors';

export interface DataStreamAdapter {
isUsingDataStreams(): boolean;
getIndexTemplateFields(alias: string, pattern: string): IndexTemplateFields;
getIndexTemplateFields(alias: string, patterns: string[]): IndexTemplateFields;
createStream(opts: CreateConcreteWriteIndexOpts): Promise<void>;
}

Expand Down Expand Up @@ -48,7 +48,7 @@ class DataStreamImplementation implements DataStreamAdapter {
return true;
}

getIndexTemplateFields(alias: string, pattern: string): IndexTemplateFields {
getIndexTemplateFields(alias: string, patterns: string[]): IndexTemplateFields {
return {
data_stream: { hidden: true },
index_patterns: [alias],
Expand All @@ -66,9 +66,9 @@ class AliasImplementation implements DataStreamAdapter {
return false;
}

getIndexTemplateFields(alias: string, pattern: string): IndexTemplateFields {
getIndexTemplateFields(alias: string, patterns: string[]): IndexTemplateFields {
return {
index_patterns: [pattern],
index_patterns: patterns,
rollover_alias: alias,
};
}
Expand Down Expand Up @@ -134,10 +134,15 @@ async function createAliasStream(opts: CreateConcreteWriteIndexOpts): Promise<vo
try {
// Specify both the index pattern for the backing indices and their aliases
// The alias prevents the request from finding other namespaces that could match the -* pattern
const patterns: string[] = [indexPatterns.pattern];
if (indexPatterns.reindexedPattern) {
patterns.push(indexPatterns.reindexedPattern);
}

const response = await retryTransientEsErrors(
() =>
esClient.indices.getAlias({
index: indexPatterns.pattern,
index: patterns,
name: indexPatterns.basePattern,
}),
{ logger }
Expand All @@ -151,7 +156,7 @@ async function createAliasStream(opts: CreateConcreteWriteIndexOpts): Promise<vo
}))
);

logger.debug(
logger.info(
() =>
`Found ${concreteIndices.length} concrete indices for ${
indexPatterns.name
Expand Down
21 changes: 15 additions & 6 deletions ...k/platform/plugins/shared/alerting/server/alerts_service/resource_installer_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,17 @@ describe('getIndexTemplateAndPattern', () => {
expect(getIndexTemplateAndPattern({ context: 'test' })).toEqual({
template: '.alerts-test.alerts-default-index-template',
pattern: '.internal.alerts-test.alerts-default-*',
reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-default-*',
basePattern: '.alerts-test.alerts-*',
alias: '.alerts-test.alerts-default',
validPrefixes: [
'.ds-.alerts-',
'.internal.alerts-',
'.alerts-',
'.internal.preview.alerts-',
'.internal.alerts-',
'.reindexed-v8-internal.alerts-',
'.preview.alerts-',
'.internal.preview.alerts-',
'.reindexed-v8-internal.preview.alerts-',
],
name: '.internal.alerts-test.alerts-default-000001',
});
Expand All @@ -53,14 +56,17 @@ describe('getIndexTemplateAndPattern', () => {
expect(getIndexTemplateAndPattern({ context: 'test', namespace: 'special' })).toEqual({
template: '.alerts-test.alerts-special-index-template',
pattern: '.internal.alerts-test.alerts-special-*',
reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-special-*',
basePattern: '.alerts-test.alerts-*',
alias: '.alerts-test.alerts-special',
validPrefixes: [
'.ds-.alerts-',
'.internal.alerts-',
'.alerts-',
'.internal.preview.alerts-',
'.internal.alerts-',
'.reindexed-v8-internal.alerts-',
'.preview.alerts-',
'.internal.preview.alerts-',
'.reindexed-v8-internal.preview.alerts-',
],
name: '.internal.alerts-test.alerts-special-000001',
});
Expand All @@ -76,15 +82,18 @@ describe('getIndexTemplateAndPattern', () => {
).toEqual({
template: '.alerts-test.alerts-special-index-template',
pattern: '.internal.alerts-test.alerts-special-*',
reindexedPattern: '.reindexed-v8-internal.alerts-test.alerts-special-*',
basePattern: '.alerts-test.alerts-*',
alias: '.alerts-test.alerts-special',
name: '.internal.alerts-test.alerts-special-000001',
validPrefixes: [
'.ds-.alerts-',
'.internal.alerts-',
'.alerts-',
'.internal.preview.alerts-',
'.internal.alerts-',
'.reindexed-v8-internal.alerts-',
'.preview.alerts-',
'.internal.preview.alerts-',
'.reindexed-v8-internal.preview.alerts-',
],
secondaryAlias: `siem.signals-special`,
});
Expand Down
9 changes: 7 additions & 2 deletions x-pack/platform/plugins/shared/alerting/server/alerts_service/resource_installer_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ interface GetComponentTemplateNameOpts {
context?: string;
name?: string;
}

export const VALID_ALERT_INDEX_PREFIXES = [
'.ds-.alerts-',
'.internal.alerts-',
'.alerts-',
'.internal.preview.alerts-',
'.internal.alerts-',
'.reindexed-v8-internal.alerts-',
'.preview.alerts-',
'.internal.preview.alerts-',
'.reindexed-v8-internal.preview.alerts-',
];

export const getComponentTemplateName = ({ context, name }: GetComponentTemplateNameOpts = {}) =>
Expand All @@ -27,6 +30,7 @@ export const getComponentTemplateName = ({ context, name }: GetComponentTemplate
export interface IIndexPatternString {
template: string;
pattern: string;
reindexedPattern?: string;
alias: string;
name: string;
basePattern: string;
Expand All @@ -51,6 +55,7 @@ export const getIndexTemplateAndPattern = ({
return {
template: `.alerts-${patternWithNamespace}-index-template`,
pattern: `.internal.alerts-${patternWithNamespace}-*`,
reindexedPattern: `.reindexed-v8-internal.alerts-${patternWithNamespace}-*`,
basePattern: `.alerts-${pattern}-*`,
name: `.internal.alerts-${patternWithNamespace}-000001`,
alias: `.alerts-${patternWithNamespace}`,
Expand Down
1 change: 1 addition & 0 deletions ...ing_api_integration/spaces_only/tests/alerting/group4/alerts_as_data/install_resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ export default function createAlertsAsDataInstallResourcesTest({ getService }: F
expect(contextIndexTemplate.name).to.eql(indexTemplateName);
expect(contextIndexTemplate.index_template.index_patterns).to.eql([
'.internal.alerts-test.patternfiring.alerts-default-*',
'.reindexed-v8-internal.alerts-test.patternfiring.alerts-default-*',
]);
expect(contextIndexTemplate.index_template.composed_of).to.eql([
'.alerts-test.patternfiring.alerts-mappings',
Expand Down
Loading