-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
[Reporting] Add new ILM policy notice to deprecations service #100567
Closed
jloleysens
wants to merge
21
commits into
elastic:master
from
jloleysens:reporting/ua-deprecation-ilm-policy
Closed
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
944c541
wip; added logic for creating ILM policy at start up
jloleysens 13885c6
Merge branch 'master' into reporting/ilm-policy
kibanamachine c94974f
added log when ilm policy is not created
jloleysens cc739ba
added test for start function
jloleysens e9a27f7
updated ilm policy to not delete data
jloleysens 385e170
actually update jest snapshots and remove unused import
jloleysens ccaa9a7
Merge branch 'master' into reporting/ilm-policy
kibanamachine bcabc5c
updated the ilm policy, removed the min_age for the hot phase
jloleysens 37aa7fd
wip: integrate reporting with upgrade assistant
jloleysens d649f56
initial version of upgrade assistant integration
jloleysens 812f82c
Merge branch 'master' of github.com:elastic/kibana into reporting/ua-…
jloleysens 24ec3b7
remove TODO and added manual step
jloleysens bf030cb
removed unnecessary api request body
jloleysens 7a0ff6d
added jest test for deprecations registration
jloleysens 647827e
use the scoped elasticsearch user
jloleysens f9e66a3
added jest test for deprecations route
jloleysens d3d3211
added additional test for error responses
jloleysens cb5ecdc
fix i18n
jloleysens 01189d9
Merge branch 'master' into reporting/ua-deprecation-ilm-policy
kibanamachine 62989f7
- moved deprecations.ts to deprecations folder
jloleysens b769761
Merge branch 'master' into reporting/ua-deprecation-ilm-policy
kibanamachine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
import { CoreSetup } from 'src/core/server'; | ||
import { ReportingCore } from '../core'; | ||
|
||
import { getDeprecationsInfo as getIlmPolicyDeprecationsInfo } from './migrate_existing_indices_ilm_policy'; | ||
import { getDeprecationsInfo as getReportingRoleDeprecationsInfo } from './reporting_role'; | ||
|
||
export const registerDeprecations = ({ | ||
core, | ||
reportingCore, | ||
}: { | ||
core: CoreSetup; | ||
reportingCore: ReportingCore; | ||
}) => { | ||
core.deprecations.registerDeprecations({ | ||
getDeprecations: async (ctx) => { | ||
return [ | ||
...(await getIlmPolicyDeprecationsInfo(ctx, { reportingCore })), | ||
...(await getReportingRoleDeprecationsInfo(ctx, { reportingCore })), | ||
]; | ||
}, | ||
}); | ||
}; |
98 changes: 98 additions & 0 deletions
98
x-pack/plugins/reporting/server/deprecations/migrage_existing_indices_ilm_policy.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import type { GetDeprecationsContext } from 'src/core/server'; | ||
import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks'; | ||
|
||
import { ReportingCore } from '../core'; | ||
import { createMockConfigSchema, createMockReportingCore } from '../test_helpers'; | ||
|
||
import { getDeprecationsInfo } from './migrate_existing_indices_ilm_policy'; | ||
|
||
type ScopedClusterClientMock = ReturnType< | ||
typeof elasticsearchServiceMock.createScopedClusterClient | ||
>; | ||
|
||
const { createApiResponse } = elasticsearchServiceMock; | ||
|
||
describe("Migrate existing indices' ILM policy deprecations", () => { | ||
let esClient: ScopedClusterClientMock; | ||
let deprecationsCtx: GetDeprecationsContext; | ||
let reportingCore: ReportingCore; | ||
|
||
beforeEach(async () => { | ||
esClient = elasticsearchServiceMock.createScopedClusterClient(); | ||
deprecationsCtx = { esClient, savedObjectsClient: savedObjectsClientMock.create() }; | ||
reportingCore = await createMockReportingCore(createMockConfigSchema()); | ||
}); | ||
|
||
const createIndexSettings = (lifecycleName: string) => ({ | ||
aliases: {}, | ||
mappings: {}, | ||
settings: { | ||
index: { | ||
lifecycle: { | ||
name: lifecycleName, | ||
}, | ||
}, | ||
}, | ||
}); | ||
|
||
it('returns deprecation information when reporting indices are not using the reporting ILM policy', async () => { | ||
esClient.asInternalUser.indices.getSettings.mockResolvedValueOnce( | ||
createApiResponse({ | ||
body: { | ||
indexA: createIndexSettings('not-reporting-lifecycle'), | ||
indexB: createIndexSettings('kibana-reporting'), | ||
}, | ||
}) | ||
); | ||
|
||
expect(await getDeprecationsInfo(deprecationsCtx, { reportingCore })).toMatchInlineSnapshot(` | ||
Array [ | ||
Object { | ||
"correctiveActions": Object { | ||
"api": Object { | ||
"method": "PUT", | ||
"path": "/api/reporting/deprecations/migrate_ilm_policy", | ||
}, | ||
"manualSteps": Array [ | ||
"Send a request to Elasticsearch that configures indices matching \\".reporting-*\\" to be managed by the \\"kibana-reporting\\" Index Lifecycle Policy.", | ||
], | ||
}, | ||
"level": "warning", | ||
"message": "All new reporting indices will be managed by a provisioned ILM policy: \\"kibana-reporting\\". To manage the lifecycle of reports edit the kibana-reporting policy. Please note, this action will target all indices prefixed with \\".reporting-*\\".", | ||
}, | ||
] | ||
`); | ||
}); | ||
|
||
it('does not return deprecations when all reporting indices are managed by the provisioned ILM policy', async () => { | ||
esClient.asInternalUser.indices.getSettings.mockResolvedValueOnce( | ||
createApiResponse({ | ||
body: { | ||
indexA: createIndexSettings('kibana-reporting'), | ||
indexB: createIndexSettings('kibana-reporting'), | ||
}, | ||
}) | ||
); | ||
|
||
expect(await getDeprecationsInfo(deprecationsCtx, { reportingCore })).toMatchInlineSnapshot( | ||
`Array []` | ||
); | ||
|
||
esClient.asInternalUser.indices.getSettings.mockResolvedValueOnce( | ||
createApiResponse({ | ||
body: {}, | ||
}) | ||
); | ||
|
||
expect(await getDeprecationsInfo(deprecationsCtx, { reportingCore })).toMatchInlineSnapshot( | ||
`Array []` | ||
); | ||
}); | ||
}); |
55 changes: 55 additions & 0 deletions
55
x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import { i18n } from '@kbn/i18n'; | ||
import { DeprecationsDetails, GetDeprecationsContext } from 'src/core/server'; | ||
import { API_MIGRATE_ILM_POLICY_URL } from '../../common/constants'; | ||
import { ReportingCore } from '../core'; | ||
|
||
interface ExtraDependencies { | ||
reportingCore: ReportingCore; | ||
} | ||
|
||
export const getDeprecationsInfo = async ( | ||
{ esClient }: GetDeprecationsContext, | ||
{ reportingCore }: ExtraDependencies | ||
): Promise<DeprecationsDetails[]> => { | ||
const store = await reportingCore.getStore(); | ||
const reportingIlmPolicy = store.getIlmPolicyName(); | ||
const indexPattern = store.getReportingIndexPattern(); | ||
|
||
const { body: reportingIndicesSettings } = await esClient.asInternalUser.indices.getSettings({ | ||
index: indexPattern, | ||
}); | ||
|
||
const someIndicesNotManagedByReportingIlm = Object.values(reportingIndicesSettings).some( | ||
(settings) => settings?.settings?.index?.lifecycle?.name !== reportingIlmPolicy | ||
); | ||
|
||
if (someIndicesNotManagedByReportingIlm) { | ||
return [ | ||
{ | ||
level: 'warning', | ||
message: i18n.translate('xpack.reporting.deprecations.migrateIndexIlmPolicyActionMessage', { | ||
defaultMessage: `All new reporting indices will be managed by a provisioned ILM policy: "{reportingIlmPolicy}". To manage the lifecycle of reports edit the {reportingIlmPolicy} policy. Please note, this action will target all indices prefixed with "{indexPattern}".`, | ||
values: { | ||
reportingIlmPolicy, | ||
indexPattern, | ||
}, | ||
}), | ||
correctiveActions: { | ||
api: { | ||
method: 'PUT', | ||
path: API_MIGRATE_ILM_POLICY_URL, | ||
}, | ||
}, | ||
}, | ||
]; | ||
} | ||
|
||
return []; | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.