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

[ILM] Absolute to relative time conversion #87822

Merged
merged 8 commits into from
Jan 15, 2021
Merged

[ILM] Absolute to relative time conversion #87822

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9dfe2fc
cleaning up unused types and legacy logic
jloleysens Jan 11, 2021
ea8f0ee
added new relative age logic with unit tests
jloleysens Jan 11, 2021
a23654d
Merge branch 'master' into ilm/absolute-to-relative-time-conversion
kibanamachine Jan 12, 2021
5158ae9
export the calculate relative timing function that returns millisecon…
jloleysens Jan 13, 2021
316cc63
Merge branch 'master' into ilm/absolute-to-relative-time-conversion
kibanamachine Jan 13, 2021
90b7d8b
Merge branch 'master' into ilm/absolute-to-relative-time-conversion
kibanamachine Jan 14, 2021
64878d3
added exports to index.ts file
jloleysens Jan 14, 2021
80ee68f
copy update and test update
jloleysens Jan 15, 2021
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
19 changes: 0 additions & 19 deletions x-pack/plugins/index_lifecycle_management/common/types/policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,6 @@ export interface PhaseWithMinAge {
selectedMinimumAgeUnits: string;
}

/**
* Different types of allocation markers we use in deserialized policies.
*
* default - use data tier based data allocation based on node roles -- this is ES best practice mode.
* custom - use node_attrs to allocate data to specific nodes
* none - do not move data anywhere when entering a phase
*/
export type DataTierAllocationType = 'default' | 'custom' | 'none';

export interface PhaseWithAllocationAction {
selectedNodeAttrs: string;
selectedReplicaCount: string;
/**
* A string value indicating allocation type. If unspecified we assume the user
* wants to use default allocation.
*/
dataTierAllocationType: DataTierAllocationType;
}

export interface PhaseWithIndexPriority {
phaseIndexPriority: string;
}
Expand Down
34 changes: 1 addition & 33 deletions ...index_lifecycle_management/public/application/lib/data_tiers/determine_allocation_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { DataTierAllocationType, AllocateAction, MigrateAction } from '../../../../common/types';

/**
* Determine what deserialized state the policy config represents.
*
* See {@DataTierAllocationType} for more information.
*/
export const determineDataTierAllocationTypeLegacy = (
actions: {
allocate?: AllocateAction;
migrate?: MigrateAction;
} = {}
): DataTierAllocationType => {
const { allocate, migrate } = actions;

if (migrate?.enabled === false) {
return 'none';
}

if (!allocate) {
return 'default';
}

if (
(allocate.require && Object.keys(allocate.require).length) ||
(allocate.include && Object.keys(allocate.include).length) ||
(allocate.exclude && Object.keys(allocate.exclude).length)
) {
return 'custom';
}

return 'default';
};
import { AllocateAction, MigrateAction } from '../../../../common/types';

export const determineDataTierAllocationType = (
actions: {
Expand Down
Loading