Merge branch '7.x' into ua/update_readme

kibanamachine · web-flow · commit b8fb3049a53a · 2021-08-23T02:27:45.000-04:00
diff --git a/docs/user/monitoring/kibana-alerts.asciidoc b/docs/user/monitoring/kibana-alerts.asciidoc
@@ -124,7 +124,7 @@ valid for 30 days.
 == Alerts and rules
 [discrete]
 === Create default rules
-This option can be used to create default rules in this kibana spaces. This is 
+This option can be used to create default rules in this kibana space. This is 
 useful for scenarios when you didn't choose to create these default rules initially 
 or anytime later if the rules were accidentally deleted.
 
diff --git a/x-pack/plugins/monitoring/public/alerts/enable_alerts_modal.tsx b/x-pack/plugins/monitoring/public/alerts/enable_alerts_modal.tsx
@@ -42,7 +42,7 @@ export const EnableAlertsModal: React.FC<Props> = ({ alerts }: Props) => {
     {
       id: 'create-alerts',
       label: i18n.translate('xpack.monitoring.alerts.modal.yesOption', {
-        defaultMessage: 'Yes (Recommended - create default rules in this kibana spaces)',
+        defaultMessage: 'Yes (Recommended - create default rules in this kibana space)',
       }),
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export const EnableAlertsModal: React.FC<Props> = ({ alerts }: Props) => {`
`42`	`42`	`{`
`43`	`43`	`id: 'create-alerts',`
`44`	`44`	`label: i18n.translate('xpack.monitoring.alerts.modal.yesOption', {`
`45`		`- defaultMessage: 'Yes (Recommended - create default rules in this kibana spaces)',`
	`45`	`+ defaultMessage: 'Yes (Recommended - create default rules in this kibana space)',`
`46`	`46`	`}),`
`47`	`47`	`},`
`48`	`48`	`{`