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

Kibana should allow a min_age setting of 0ms in ILM policy phases #53719

Merged
merged 14 commits into from
Jan 10, 2020
Merged

Kibana should allow a min_age setting of 0ms in ILM policy phases #53719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
809b32f
Kibana should allow a min_age setting of 0ms in ILM policy phases
jkelastic Dec 19, 2019
231071a
Fixed jest by adding >= 0 in lifecycle.js line 133
jkelastic Dec 20, 2019
3d23c4e
1) Updated the jest conditions to allow equal to and above 0. 2) Set …
jkelastic Dec 21, 2019
6393ae2
Fix Internationalization check, line 81 was the same as line 74
jkelastic Dec 22, 2019
595ab8f
Updated <=0 to < 0 as this will not throw error line 133 lifecycle.js
jkelastic Dec 27, 2019
1827fab
Remove comments
jkelastic Dec 27, 2019
2f7c197
Updated the edit_policy.js test cases to accept 0 timing phase
jkelastic Dec 27, 2019
c0e0ba9
Merge branch 'master' into bugfix/ILM
elasticmachine Dec 27, 2019
5765daa
Merge branch 'master' into bugfix/ILM
elasticmachine Dec 30, 2019
b76b763
Merge branch 'master' into bugfix/ILM
elasticmachine Jan 2, 2020
3b52342
Add back test cases to edit_policy.test.js and removed operational co…
jkelastic Jan 9, 2020
a2a5275
Merge branch 'master' into bugfix/ILM
elasticmachine Jan 9, 2020
c382972
Merge branch 'master' into bugfix/ILM
elasticmachine Jan 10, 2020
1f06380
Merge branch 'master' into bugfix/ILM
elasticmachine Jan 10, 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
15 changes: 8 additions & 7 deletions x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import sinon from 'sinon';
import { findTestSubject } from '@elastic/eui/lib/test';
import {
positiveNumbersAboveZeroErrorMessage,
numberRequiredMessage,
positiveNumberRequiredMessage,
numberRequiredMessage,
maximumAgeRequiredMessage,
maximumSizeRequiredMessage,
policyNameRequiredMessage,
Expand Down Expand Up @@ -243,17 +243,18 @@ describe('edit policy', () => {
noRollover(rendered);
setPolicyName(rendered, 'mypolicy');
activatePhase(rendered, 'warm');
setPhaseAfter(rendered, 'warm', '');
save(rendered);
expectedErrorMessages(rendered, [numberRequiredMessage]);
});
test('should show positive number required above zero error when trying to save warm phase with 0 for after', () => {
test('should allow 0 for phase timing', () => {
const rendered = mountWithIntl(component);
noRollover(rendered);
setPolicyName(rendered, 'mypolicy');
activatePhase(rendered, 'warm');
setPhaseAfter(rendered, 'warm', 0);
save(rendered);
expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
expectedErrorMessages(rendered, []);
});
test('should show positive number required error when trying to save warm phase with -1 for after', () => {
const rendered = mountWithIntl(component);
Expand Down Expand Up @@ -383,14 +384,14 @@ describe('edit policy', () => {
});
});
describe('cold phase', () => {
test('should show positive number required error when trying to save cold phase with 0 for after', () => {
alisonelizabeth marked this conversation as resolved.
Show resolved Hide resolved
test('should allow 0 for phase timing', () => {
const rendered = mountWithIntl(component);
noRollover(rendered);
setPolicyName(rendered, 'mypolicy');
activatePhase(rendered, 'cold');
setPhaseAfter(rendered, 'cold', 0);
save(rendered);
expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
expectedErrorMessages(rendered, []);
});
test('should show positive number required error when trying to save cold phase with -1 for after', () => {
const rendered = mountWithIntl(component);
Expand Down Expand Up @@ -464,14 +465,14 @@ describe('edit policy', () => {
});
});
describe('delete phase', () => {
test('should show positive number required error when trying to save delete phase with 0 for after', () => {
alisonelizabeth marked this conversation as resolved.
Show resolved Hide resolved
test('should allow 0 for phase timing', () => {
const rendered = mountWithIntl(component);
noRollover(rendered);
setPolicyName(rendered, 'mypolicy');
activatePhase(rendered, 'delete');
setPhaseAfter(rendered, 'delete', 0);
save(rendered);
expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
expectedErrorMessages(rendered, []);
});
test('should show positive number required error when trying to save delete phase with -1 for after', () => {
const rendered = mountWithIntl(component);
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const MinAgeInput = props => {
onChange={async e => {
setPhaseData(PHASE_ROLLOVER_MINIMUM_AGE, e.target.value);
}}
min={1}
min={0}
/>
</ErrableFormRow>
</EuiFlexItem>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/index_lifecycle_management/public/store/defaults/cold_phase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
export const defaultColdPhase = {
[PHASE_ENABLED]: false,
[PHASE_ROLLOVER_ALIAS]: '',
[PHASE_ROLLOVER_MINIMUM_AGE]: '',
[PHASE_ROLLOVER_MINIMUM_AGE]: 0,
[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
[PHASE_NODE_ATTRS]: '',
[PHASE_REPLICA_COUNT]: '',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/index_lifecycle_management/public/store/defaults/delete_phase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const defaultDeletePhase = {
[PHASE_ENABLED]: false,
[PHASE_ROLLOVER_ENABLED]: false,
[PHASE_ROLLOVER_ALIAS]: '',
[PHASE_ROLLOVER_MINIMUM_AGE]: '',
[PHASE_ROLLOVER_MINIMUM_AGE]: 0,
[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
};
export const defaultEmptyDeletePhase = defaultDeletePhase;
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/index_lifecycle_management/public/store/defaults/warm_phase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const defaultWarmPhase = {
[PHASE_ROLLOVER_ALIAS]: '',
[PHASE_FORCE_MERGE_SEGMENTS]: '',
[PHASE_FORCE_MERGE_ENABLED]: false,
[PHASE_ROLLOVER_MINIMUM_AGE]: '',
[PHASE_ROLLOVER_MINIMUM_AGE]: 0,
[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
[PHASE_NODE_ATTRS]: '',
[PHASE_SHRINK_ENABLED]: false,
Expand Down
6 changes: 0 additions & 6 deletions x-pack/legacy/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,6 @@ export const validatePhase = (type, phase, errors) => {
phaseErrors[numberedAttribute] = [numberRequiredMessage];
} else if (phase[numberedAttribute] < 0) {
phaseErrors[numberedAttribute] = [positiveNumberRequiredMessage];
} else if (
(numberedAttribute === PHASE_ROLLOVER_MINIMUM_AGE ||
numberedAttribute === PHASE_PRIMARY_SHARD_COUNT) &&
phase[numberedAttribute] < 1
) {
phaseErrors[numberedAttribute] = [positiveNumbersAboveZeroErrorMessage];
}
}
}
Expand Down