maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add back min zero value, add validation (#103898)

Browse source
This commit is contained in:
Jen Huang 2021-06-30 09:36:21 -07:00 committed by GitHub
parent 2576d61fef
commit ffc207281f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_form.tsx
View file

@ -63,6 +63,15 @@ export const agentPolicyFormValidation = (
errors.namespace = [namespaceValidation.error];
}
if (agentPolicy.unenroll_timeout && agentPolicy.unenroll_timeout < 0) {
errors.unenroll_timeout = [
<FormattedMessage
id="xpack.fleet.agentPolicyForm.unenrollTimeoutMinValueErrorMessage"
defaultMessage="Timeout must be greater than zero."
/>,
];
}
return errors;
};
@ -314,11 +323,20 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
/>
}
>
<EuiFormRow fullWidth>
<EuiFormRow
fullWidth
error={
touchedFields.unenroll_timeout && validation.unenroll_timeout
? validation.unenroll_timeout
: null
}
isInvalid={Boolean(touchedFields.unenroll_timeout && validation.unenroll_timeout)}
>
<EuiFieldNumber
fullWidth
disabled={agentPolicy.is_managed === true}
value={agentPolicy.unenroll_timeout || ''}
min={0}
onChange={(e) => {
updateAgentPolicy({
unenroll_timeout: e.target.value ? Number(e.target.value) : 0,

2
x-pack/plugins/fleet/server/types/models/agent_policy.ts
View file

@ -16,7 +16,7 @@ export const AgentPolicyBaseSchema = {
namespace: NamespaceSchema,
description: schema.maybe(schema.string()),
is_managed: schema.maybe(schema.boolean()),
unenroll_timeout: schema.maybe(schema.number()),
unenroll_timeout: schema.maybe(schema.number({ min: 0 })),
monitoring_enabled: schema.maybe(
schema.arrayOf(
schema.oneOf([schema.literal(dataTypes.Logs), schema.literal(dataTypes.Metrics)])