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

Jump to bottom

[ILM] Add support for frozen phase in UI #75968

Merged
merged 10 commits into from
Aug 31, 2020
Merged

[ILM] Add support for frozen phase in UI #75968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
469e5bb
ILM public side changes to support frozen phase
jloleysens Aug 26, 2020
19afe82
added "frozen" to the server side schema
jloleysens Aug 26, 2020
9ff7eaa
add frozen phases component
jloleysens Aug 26, 2020
e7dcc64
fix i18n and update jest tests
jloleysens Aug 27, 2020
5149dd2
Merge branch 'master' into ilm/add-frozen-phase
elasticmachine Aug 27, 2020
067d25a
Merge branch 'master' into ilm/add-frozen-phase
elasticmachine Aug 27, 2020
0935f6b
Slight restructuring to phase types and fix copy paste issues.
jloleysens Aug 27, 2020
c366c5e
fix hot phase type and remove type constraint from error messages
jloleysens Aug 27, 2020
dc2b0d1
update validation logic
jloleysens Aug 27, 2020
a087b04
Merge branch 'master' into ilm/add-frozen-phase
elasticmachine Aug 31, 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
4 changes: 4 additions & 0 deletions ...ns/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
DeletePhase,
HotPhase,
WarmPhase,
FrozenPhase,
} from '../services/policies/types';

export const defaultNewHotPhase: HotPhase = {
Expand Down Expand Up @@ -47,6 +48,16 @@ export const defaultNewColdPhase: ColdPhase = {
phaseIndexPriority: '0',
};

export const defaultNewFrozenPhase: FrozenPhase = {
phaseEnabled: false,
selectedMinimumAge: '0',
selectedMinimumAgeUnits: 'd',
selectedNodeAttrs: '',
selectedReplicaCount: '',
freezeEnabled: false,
phaseIndexPriority: '0',
};

export const defaultNewDeletePhase: DeletePhase = {
phaseEnabled: false,
selectedMinimumAge: '0',
Expand Down
11 changes: 8 additions & 3 deletions ...lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from
import { LearnMoreLink } from './learn_more_link';
import { ErrableFormRow } from './form_errors';
import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
import { ColdPhase, DeletePhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
import { PhaseWithMinAge, Phases } from '../../../services/policies/types';

function getTimingLabelForPhase(phase: keyof Phases) {
// NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
Expand All @@ -27,6 +27,11 @@ function getTimingLabelForPhase(phase: keyof Phases) {
defaultMessage: 'Timing for cold phase',
});

case 'frozen':
return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseFrozen.minimumAgeLabel', {
defaultMessage: 'Timing for frozen phase',
});

case 'delete':
return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeLabel', {
defaultMessage: 'Timing for delete phase',
Expand Down Expand Up @@ -63,7 +68,7 @@ function getUnitsAriaLabelForPhase(phase: keyof Phases) {
}
}

interface Props<T extends Phase> {
interface Props<T extends PhaseWithMinAge> {
rolloverEnabled: boolean;
errors?: PhaseValidationErrors<T>;
phase: keyof Phases & string;
Expand All @@ -72,7 +77,7 @@ interface Props<T extends Phase> {
isShowingErrors: boolean;
}

export const MinAgeInput = <Phase extends WarmPhase | ColdPhase | DeletePhase>({
export const MinAgeInput = <Phase extends PhaseWithMinAge>({
rolloverEnabled,
errors,
phaseData,
Expand Down
6 changes: 3 additions & 3 deletions ...fecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { LearnMoreLink } from './learn_more_link';
import { ErrableFormRow } from './form_errors';
import { useLoadNodes } from '../../../services/api';
import { NodeAttrsDetails } from './node_attrs_details';
import { ColdPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
import { PhaseWithAllocationAction, Phases } from '../../../services/policies/types';
import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';

const learnMoreLink = (
Expand All @@ -38,14 +38,14 @@ const learnMoreLink = (
</Fragment>
);

interface Props<T extends Phase> {
interface Props<T extends PhaseWithAllocationAction> {
phase: keyof Phases & string;
errors?: PhaseValidationErrors<T>;
phaseData: T;
setPhaseData: (dataKey: keyof T & string, value: string) => void;
isShowingErrors: boolean;
}
export const NodeAllocation = <T extends WarmPhase | ColdPhase>({
export const NodeAllocation = <T extends PhaseWithAllocationAction>({
phase,
setPhaseData,
errors,
Expand Down
6 changes: 3 additions & 3 deletions ...ycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import { EuiFieldNumber, EuiTextColor, EuiDescribedFormGroup } from '@elastic/eu
import { LearnMoreLink } from './';
import { OptionalLabel } from './';
import { ErrableFormRow } from './';
import { ColdPhase, HotPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
import { PhaseWithIndexPriority, Phases } from '../../../services/policies/types';
import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';

interface Props<T extends Phase> {
interface Props<T extends PhaseWithIndexPriority> {
errors?: PhaseValidationErrors<T>;
phase: keyof Phases & string;
phaseData: T;
setPhaseData: (dataKey: keyof T & string, value: any) => void;
isShowingErrors: boolean;
}
export const SetPriorityInput = <T extends HotPhase | WarmPhase | ColdPhase>({
export const SetPriorityInput = <T extends PhaseWithIndexPriority>({
errors,
phaseData,
phase,
Expand Down
16 changes: 13 additions & 3 deletions ...lugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {

import { toasts } from '../../services/notification';

import { Policy, PolicyFromES } from '../../services/policies/types';
import { Phases, Policy, PolicyFromES } from '../../services/policies/types';
import {
validatePolicy,
ValidationErrors,
Expand All @@ -42,7 +42,7 @@ import {
} from '../../services/policies/policy_serialization';

import { ErrableFormRow, LearnMoreLink, PolicyJsonFlyout } from './components';
import { ColdPhase, DeletePhase, HotPhase, WarmPhase } from './phases';
import { ColdPhase, DeletePhase, FrozenPhase, HotPhase, WarmPhase } from './phases';

interface Props {
policies: PolicyFromES[];
Expand Down Expand Up @@ -118,7 +118,7 @@ export const EditPolicy: React.FunctionComponent<Props> = ({
setIsShowingPolicyJsonFlyout(!isShowingPolicyJsonFlyout);
};

const setPhaseData = (phase: 'hot' | 'warm' | 'cold' | 'delete', key: string, value: any) => {
const setPhaseData = (phase: keyof Phases, key: string, value: any) => {
setPolicy({
...policy,
phases: {
Expand Down Expand Up @@ -303,6 +303,16 @@ export const EditPolicy: React.FunctionComponent<Props> = ({

<EuiHorizontalRule />

<FrozenPhase
errors={errors?.frozen}
isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.frozen).length > 0}
setPhaseData={(key, value) => setPhaseData('frozen', key, value)}
phaseData={policy.phases.frozen}
hotPhaseRolloverEnabled={policy.phases.hot.rolloverEnabled}
/>

<EuiHorizontalRule />

<DeletePhase
errors={errors?.delete}
isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.delete).length > 0}
Expand Down
7 changes: 3 additions & 4 deletions .../index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '@elastic/eui';

import { ColdPhase as ColdPhaseInterface, Phases } from '../../../services/policies/types';
import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
import { PhaseValidationErrors } from '../../../services/policies/policy_validation';

import {
LearnMoreLink,
Expand All @@ -36,9 +36,8 @@ const freezeLabel = i18n.translate('xpack.indexLifecycleMgmt.coldPhase.freezeInd
defaultMessage: 'Freeze index',
});

const coldProperty = propertyof<Phases>('cold');
const phaseProperty = (propertyName: keyof ColdPhaseInterface) =>
propertyof<ColdPhaseInterface>(propertyName);
const coldProperty: keyof Phases = 'cold';
const phaseProperty = (propertyName: keyof ColdPhaseInterface) => propertyName;

interface Props {
setPhaseData: (key: keyof ColdPhaseInterface & string, value: string | boolean) => void;
Expand Down
7 changes: 3 additions & 4 deletions ...ndex_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { EuiDescribedFormGroup, EuiSwitch, EuiTextColor, EuiFormRow } from '@elastic/eui';

import { DeletePhase as DeletePhaseInterface, Phases } from '../../../services/policies/types';
import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
import { PhaseValidationErrors } from '../../../services/policies/policy_validation';

import {
ActiveBadge,
Expand All @@ -20,9 +20,8 @@ import {
SnapshotPolicies,
} from '../components';

const deleteProperty = propertyof<Phases>('delete');
const phaseProperty = (propertyName: keyof DeletePhaseInterface) =>
propertyof<DeletePhaseInterface>(propertyName);
const deleteProperty: keyof Phases = 'delete';
const phaseProperty = (propertyName: keyof DeletePhaseInterface) => propertyName;

interface Props {
setPhaseData: (key: keyof DeletePhaseInterface & string, value: string | boolean) => void;
Expand Down
Loading