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.

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

Added defaultActionMessage to index threshold alert UI type definition #80936

Merged
merged 19 commits into from
Nov 9, 2020
Merged
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a012543
resolves https://github.com/elastic/kibana/issues/78148
dB2510 Oct 17, 2020
8a50c7f
Merge branch 'master' into master
kibanamachine Oct 19, 2020
c5808a0
required changes done for https://github.com/elastic/kibana/issues/78148
dB2510 Oct 21, 2020
5d3b8be
Merge branch 'master' of https://github.com/dB2510/kibana
dB2510 Oct 21, 2020
10cf1ec
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Oct 21, 2020
e00826b
requested changes done https://github.com/elastic/kibana/issues/78148
dB2510 Oct 21, 2020
86c0e5b
functional tests for index threshold default action message
pmuellr Oct 22, 2020
4cc33bc
resolved type-check and jest errors
dB2510 Oct 22, 2020
18c0da9
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Oct 22, 2020
7fe16cd
Merge pull request #1 from pmuellr/alerts/default-action-message-ft
dB2510 Oct 27, 2020
9c931be
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Oct 27, 2020
eb2b0c7
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Oct 29, 2020
5830f13
added functional UI test for defaultActionMessage
dB2510 Oct 29, 2020
31f50e6
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Nov 2, 2020
ebb3fee
added functional UI test to an existing test
dB2510 Nov 2, 2020
a519a6d
remove comments in x-pack/test/alerting_api_integration/spaces_only/t…
dB2510 Nov 3, 2020
b42992a
Merge branch 'master' of https://github.com/elastic/kibana
dB2510 Nov 6, 2020
a137daf
fix: i18n labels corrected to camelcase
dB2510 Nov 6, 2020
40a7093
Merge branch 'master' into master
kibanamachine Nov 9, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { lazy } from 'react';

import { i18n } from '@kbn/i18n';
import { AlertTypeModel } from '../../../../types';
import { validateExpression } from './validation';
import { IndexThresholdAlertParams } from './types';
Expand All @@ -17,6 +17,12 @@ export function getAlertType(): AlertTypeModel<IndexThresholdAlertParams, Alerts
iconClass: 'alert',
alertParamsExpression: lazy(() => import('./expression')),
validate: validateExpression,
defaultActionMessage: i18n.translate(
'xpack.triggers_actions_ui.builtin_alert_types.threshold.alertDefaultActionMessage',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The i18n error in the CI seems to be caused by using triggers_actions_ui instead of triggersActionsUI, for the string above.

Suggested change
'xpack.triggers_actions_ui.builtin_alert_types.threshold.alertDefaultActionMessage',
'xpack.triggersActionsUI.builtin_alert_types.threshold.alertDefaultActionMessage',

That's a difference from other usages anyway, like this one:

'xpack.triggersActionsUI.sections.alertAdd.threshold.fixErrorInExpressionBelowValidationMessage',

{
defaultMessage: `alert \\{\\{alertName\\}\\} group \\{\\{context.group\\}\\} value \\{\\{context.value\\}\\} exceeded threshold \\{\\{context.function\\}\\} over \\{\\{context.window\\}\\} on \\{\\{context.date\\}\\}`,
}
),
requiresAppContext: false,
};
}