diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/configuration/configuration.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/configuration/configuration.js index 99a5899dd5efe2..707bf4d9dcad28 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/configuration/configuration.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/configuration/configuration.js @@ -92,9 +92,9 @@ export class Configuration extends Component { return (
Configuration} + title={

Configure hot indices

} titleSize="s" - description="Indices are thought of as "hot" when they are actively being written to." + description="A hot index is actively being written to." fullWidth > - Learn more in our docs - . + Learn more +

} /> diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/template_selection/template_selection.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/template_selection/template_selection.js index 3d5777711a5554..29a1430a4b17bc 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/template_selection/template_selection.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/index_template/components/template_selection/template_selection.js @@ -68,7 +68,7 @@ export class TemplateSelection extends PureComponent { when you create an index.{' '} Learn more - . +

} > @@ -100,7 +100,7 @@ export class TemplateSelection extends PureComponent { {bootstrapEnabled ? (

- Your read-only index is queried less frequently. Use this phase - when the index no longer needs to be on the most performant hardware. + Your index is queried less frequently + and no longer needs to be on the most performant hardware.

{isShowingErrors ? ( -

This phase contains errors that need to be fixed.

+

This phase contains errors

 ) : null} @@ -206,7 +206,7 @@ export class ColdPhase extends PureComponent { setPhaseData(PHASE_REPLICA_COUNT, warmPhaseReplicaCount) } > - Set same as warm phase + Set to same as warm phase diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/delete_phase/delete_phase.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/delete_phase/delete_phase.js index 40974abb33fecb..7c674116c0fa6e 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/delete_phase/delete_phase.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/delete_phase/delete_phase.js @@ -73,12 +73,12 @@ export class DeletePhase extends PureComponent { description={

- When your data is no longer useful. Define how long you want to retain it. + Use this phase to define how long to retain your data.

{isShowingErrors ? ( -

This phase contains errors that need to be fixed.

+

This phase contains errors

 ) : null} diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/hot_phase/hot_phase.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/hot_phase/hot_phase.js index 89d893dbc070fa..2510e264f93955 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/hot_phase/hot_phase.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/components/hot_phase/hot_phase.js @@ -77,12 +77,13 @@ export class HotPhase extends PureComponent { description={

- This phase is required. Your index is being queried and in active writing mode. + This phase is required. Your index is being queried and actively written to. + You can optimize this phase for write throughput.

{isShowingErrors ? ( -

This phase contains errors that need to be fixed.

+

This phase contains errors

 ) : null} @@ -94,9 +95,9 @@ export class HotPhase extends PureComponent { hasEmptyLabelSpace helpText={

- Setting this to true will rollover the index when it gets too big or too old. The alias will switch to the new index.{' '} + If true, rollover the index when it gets too big or too old. The alias switches to the new index.{' '} - Learn more. + Learn more

} @@ -116,7 +117,7 @@ export class HotPhase extends PureComponent {

- Your index is frequently queried, but is read-only. - Use this phase to optimize for search.Your index is being queried - and in active writing mode. + Your index becomes read-only when it enters the warm phase. + You can optimize this phase for search.

{isShowingErrors ? ( -

This phase contains errors that need to be fixed.

+

This phase contains errors

 ) : null} @@ -267,7 +266,7 @@ export class WarmPhase extends Component { validate(); }} > - Set same as hot phase + Set to same as hot phase @@ -282,7 +281,7 @@ export class WarmPhase extends Component { Shrink the index into a new index with fewer primary shards.{' '} - Learn more. + Learn more @@ -295,7 +294,7 @@ export class WarmPhase extends Component { await setPhaseData(PHASE_SHRINK_ENABLED, e.target.checked); validate(); }} - label="Enable shrink" + label="Shrink index" /> @@ -334,7 +333,7 @@ export class WarmPhase extends Component { validate(); }} > - Set same as hot phase + Set to same as hot phase @@ -349,10 +348,10 @@ export class WarmPhase extends Component { - Reduce the number of segments in your shard by and merging smaller + Reduce the number of segments in your shard by merging smaller files and clearing deleted ones.{' '} - Learn More + Learn more diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/policy_configuration.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/policy_configuration.js index 8cabbf599371e2..eacadcba7fd6a7 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/policy_configuration.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/components/policy_configuration/policy_configuration.js @@ -72,7 +72,7 @@ export class PolicyConfiguration extends Component { if (await this.validate()) { this.props.done(); } else { - toastNotifications.addDanger('Please fix errors on the page.'); + toastNotifications.addDanger('Please the fix errors on the page'); } }; @@ -124,12 +124,12 @@ export class PolicyConfiguration extends Component {

- {!selectedPolicyName ? 'Create a new policy' : `Edit policy ${selectedPolicyName}`} + {!selectedPolicyName ? 'Create a policy' : `Edit policy ${selectedPolicyName}`}

-

Configure the phases of your data and when to transition between them. Only the hot phase is required.

+

Configure the phases of your data and when to transition between them.

 Review your policy changes -

Be careful. Your changes will go into effect immediately once you save.

+

When you save a policy, your changes go into effect immediately.

 -

{`${affectedIndexTemplates.length} Affected index ${affectedIndexTemplates.length === 1 ? 'template' : 'templates'}`}

+

{`${affectedIndexTemplates.length} Index ${affectedIndexTemplates.length === 1 ? 'template' : 'templates'}`}

    {affectedIndexTemplates.map(template => (
  • {template}
    • ))}
-

{`${affectedIndices.length} Affected ${affectedIndices.length === 1 ? 'Index' : 'Indices' }`}

+

{`${affectedIndices.length} ${affectedIndices.length === 1 ? 'Index' : 'Indices' }`}

{ isLoadingAffectedIndices ? ( ) : ( @@ -177,10 +177,10 @@ export class Review extends Component { -

Since you decided to bootstrap a new index you'll want to point to a new alias going forward

+

You decided to bootstrap a new index. Point to this new alias going forward.

{aliasName} is your new alias

 @@ -224,13 +224,13 @@ export class Review extends Component { { showSaveChangedMessage ? ( -

Save changes to {selectedPolicyName} policy

+

Save changes to {selectedPolicyName} policy?

- You are editing an existing policy. This means that any saves you make - will also change any index templates this policy is attached to. You can instead save - these changes and make it a brand new policy that only changes the template you + You are editing an existing policy. Any changes you make + will also change index templates that this policy is attached to. Alternately, you can save + these changes in a new policy and only change the template you selected.

diff --git a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/wizard.js b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/wizard.js index 3a7ba64893b23f..757326c6ed1d26 100644 --- a/x-pack/plugins/index_lifecycle_management/public/sections/wizard/wizard.js +++ b/x-pack/plugins/index_lifecycle_management/public/sections/wizard/wizard.js @@ -144,7 +144,7 @@ export class Wizard extends Component { // onClick: () => this.onSelectedStepChanged(2), // }, { - title: 'Configure policy', + title: 'Configure a policy', isSelected: this.state.selectedStep === 2, isComplete: this.state.selectedStep > 2, disabled: this.state.selectedStep < 2, diff --git a/x-pack/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js b/x-pack/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js index a34e94af5c6ab3..0b3b97f7d83b97 100644 --- a/x-pack/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js +++ b/x-pack/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js @@ -58,10 +58,10 @@ export const validatePhase = (type, phase) => { !isNumber(phase[PHASE_ROLLOVER_MAX_SIZE_STORED]) ) { errors[PHASE_ROLLOVER_MAX_AGE] = [ - 'A rollover requires a max age, max docs, or max size.' + 'A maximum age is required' ]; errors[PHASE_ROLLOVER_MAX_SIZE_STORED] = [ - 'A rollover requires a max age, max docs, or max size.' + 'A maximum index size is required' ]; } } @@ -73,13 +73,13 @@ export const validatePhase = (type, phase) => { continue; } if (!isNumber(phase[numberedAttribute])) { - errors[numberedAttribute] = ['A number is required.']; + errors[numberedAttribute] = ['A number is required']; } else if (phase[numberedAttribute] < 0) { - errors[numberedAttribute] = ['Only positive numbers allowed.']; + errors[numberedAttribute] = ['Only positive numbers are allowed']; } else if (numberedAttribute === PHASE_PRIMARY_SHARD_COUNT && phase[numberedAttribute] < 1) { - errors[numberedAttribute] = ['Only positive numbers above 0 are allowed.']; + errors[numberedAttribute] = ['Only positive numbers are allowed']; } } } @@ -98,41 +98,41 @@ export const validateLifecycle = state => { } if (getBootstrapEnabled(state) && !getIndexName(state)) { - errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_TEMPLATE_SELECTION][STRUCTURE_INDEX_NAME].push('An index name is required.'); + errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_TEMPLATE_SELECTION][STRUCTURE_INDEX_NAME].push('An index name is required'); } if (getBootstrapEnabled(state) && !getAliasName(state)) { - errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_TEMPLATE_SELECTION][STRUCTURE_ALIAS_NAME].push('An alias name is required.'); + errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_TEMPLATE_SELECTION][STRUCTURE_ALIAS_NAME].push('An alias name is required'); } if (!isNumber(getSelectedPrimaryShardCount(state))) { errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_CONFIGURATION][ STRUCTURE_PRIMARY_NODES - ].push('A value is required.'); + ].push('A value is required'); } else if (getSelectedPrimaryShardCount(state) < 1) { errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_CONFIGURATION][ STRUCTURE_PRIMARY_NODES - ].push('Only positive numbers above 0 are allowed.'); + ].push('Only positive numbers are allowed'); } if (!isNumber(getSelectedReplicaCount(state))) { errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_CONFIGURATION][ STRUCTURE_REPLICAS - ].push('A value is required.'); + ].push('A value is required'); } else if (getSelectedReplicaCount(state) < 0) { errors[STRUCTURE_INDEX_TEMPLATE][STRUCTURE_CONFIGURATION][ STRUCTURE_REPLICAS - ].push('Only positive numbers allowed.'); + ].push('Only positive numbers are allowed'); } if (!getSelectedPolicyName(state)) { - errors[STRUCTURE_REVIEW][STRUCTURE_POLICY_NAME].push('A policy name is required.'); + errors[STRUCTURE_REVIEW][STRUCTURE_POLICY_NAME].push('A policy name is required'); } if (getSaveAsNewPolicy(state) && getSelectedOriginalPolicyName(state) === getSelectedPolicyName(state)) { - errors[STRUCTURE_REVIEW][STRUCTURE_POLICY_NAME].push('The policy name must be different.'); + errors[STRUCTURE_REVIEW][STRUCTURE_POLICY_NAME].push('The policy name must be different'); } // if (getSaveAsNewPolicy(state)) {