Renamed button and dropdown items in headers (apm, logs, metrics and uptime) from alerts to rules (#100918)

Co-authored-by: Jonathan Buttner <jonathan.buttner@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Christos Nasikas <christos.nasikas@elastic.co>
Co-authored-by: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Co-authored-by: Steph Milovic <stephanie.milovic@elastic.co>

x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx

@@ -18,7 +18,7 @@ import { AlertType } from '../../../../common/alert_types';
 import { AlertingFlyout } from '../../alerting/alerting_flyout';
 
 const alertLabel = i18n.translate('xpack.apm.home.alertsMenu.alerts', {
-  defaultMessage: 'Alerts',
+  defaultMessage: 'Alerts and rules',
 });
 const transactionDurationLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.transactionDuration',
@@ -33,11 +33,11 @@ const errorCountLabel = i18n.translate('xpack.apm.home.alertsMenu.errorCount', {
 });
 const createThresholdAlertLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.createThresholdAlert',
-  { defaultMessage: 'Create threshold alert' }
+  { defaultMessage: 'Create threshold rule' }
 );
 const createAnomalyAlertAlertLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.createAnomalyAlert',
-  { defaultMessage: 'Create anomaly alert' }
+  { defaultMessage: 'Create anomaly rule' }
 );
 
 const CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID =
@@ -102,7 +102,7 @@ export function AlertingPopoverAndFlyout({
               {
                 name: i18n.translate(
                   'xpack.apm.home.alertsMenu.viewActiveAlerts',
-                  { defaultMessage: 'View active alerts' }
+                  { defaultMessage: 'Manage rules' }
                 ),
                 href: basePath.prepend(
                   '/app/management/insightsAndAlerting/triggersActions/alerts'

x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx

@@ -36,12 +36,12 @@ export const MetricsAlertDropdown = () => {
     () => ({
       id: 1,
       title: i18n.translate('xpack.infra.alerting.infrastructureDropdownTitle', {
-        defaultMessage: 'Infrastructure alerts',
+        defaultMessage: 'Infrastructure rules',
       }),
       items: [
         {
           name: i18n.translate('xpack.infra.alerting.createInventoryAlertButton', {
-            defaultMessage: 'Create inventory alert',
+            defaultMessage: 'Create inventory rule',
           }),
           onClick: () => setVisibleFlyoutType('inventory'),
         },
@@ -54,12 +54,12 @@ export const MetricsAlertDropdown = () => {
     () => ({
       id: 2,
       title: i18n.translate('xpack.infra.alerting.metricsDropdownTitle', {
-        defaultMessage: 'Metrics alerts',
+        defaultMessage: 'Metrics rules',
       }),
       items: [
         {
           name: i18n.translate('xpack.infra.alerting.createThresholdAlertButton', {
-            defaultMessage: 'Create threshold alert',
+            defaultMessage: 'Create threshold rule',
           }),
           onClick: () => setVisibleFlyoutType('threshold'),
         },
@@ -76,7 +76,7 @@ export const MetricsAlertDropdown = () => {
   const manageAlertsMenuItem = useMemo(
     () => ({
       name: i18n.translate('xpack.infra.alerting.manageAlerts', {
-        defaultMessage: 'Manage alerts',
+        defaultMessage: 'Manage rules',
       }),
       icon: 'tableOfContents',
       onClick: manageAlertsLinkProps.onClick,
@@ -112,7 +112,7 @@ export const MetricsAlertDropdown = () => {
         {
           id: 0,
           title: i18n.translate('xpack.infra.alerting.alertDropdownTitle', {
-            defaultMessage: 'Alerts',
+            defaultMessage: 'Alerts and rules',
           }),
           items: firstPanelMenuItems,
         },

x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx

@@ -17,7 +17,7 @@ export const ManageAlertsContextMenuItem = () => {
   });
   return (
     <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
-      <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage alerts" />
+      <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage rules" />
     </EuiContextMenuItem>
   );
 };

x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx

@@ -66,13 +66,13 @@ export const AlertDropdown = () => {
       >
         <FormattedMessage
           id="xpack.infra.alerting.logs.createAlertButton"
-          defaultMessage="Create alert"
+          defaultMessage="Create rule"
         />
       </EuiContextMenuItem>,
       <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
         <FormattedMessage
           id="xpack.infra.alerting.logs.manageAlerts"
-          defaultMessage="Manage alerts"
+          defaultMessage="Manage rules"
         />
       </EuiContextMenuItem>,
     ];

x-pack/plugins/monitoring/public/alerts/configuration.tsx

@@ -32,7 +32,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.disableAlert.errorTitle', {
-          defaultMessage: `Unable to disable alert`,
+          defaultMessage: `Unable to disable rule`,
         }),
         text: err.message,
       });
@@ -46,7 +46,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.enableAlert.errorTitle', {
-          defaultMessage: `Unable to enable alert`,
+          defaultMessage: `Unable to enable rule`,
         }),
         text: err.message,
       });
@@ -60,7 +60,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.muteAlert.errorTitle', {
-          defaultMessage: `Unable to mute alert`,
+          defaultMessage: `Unable to mute rule`,
         }),
         text: err.message,
       });
@@ -74,7 +74,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.ummuteAlert.errorTitle', {
-          defaultMessage: `Unable to unmute alert`,
+          defaultMessage: `Unable to unmute rule`,
         }),
         text: err.message,
       });
@@ -112,7 +112,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
             }}
           >
             {i18n.translate('xpack.monitoring.alerts.panel.editAlert', {
-              defaultMessage: `Edit alert`,
+              defaultMessage: `Edit rule`,
             })}
           </EuiButton>
         </EuiFlexItem>

x-pack/plugins/observability/public/pages/overview/empty_section.ts

@@ -97,7 +97,7 @@ export const getEmptySections = ({ core }: { core: CoreStart }): ISection[] => {
           'Are 503 errors stacking up? Are services responding? Is CPU and RAM utilization jumping? See warnings as they happen—not as part of the post-mortem.',
       }),
       linkTitle: i18n.translate('xpack.observability.emptySection.apps.alert.link', {
-        defaultMessage: 'Create alert',
+        defaultMessage: 'Create rule',
       }),
       href: core.http.basePath.prepend(
         '/app/management/insightsAndAlerting/triggersActions/alerts'

x-pack/plugins/translations/translations/ja-JP.json

@@ -5490,13 +5490,9 @@
     "xpack.apm.header.badge.readOnly.text": "読み取り専用",
     "xpack.apm.header.badge.readOnly.tooltip": "を保存できませんでした",
     "xpack.apm.helpMenu.upgradeAssistantLink": "アップグレードアシスタント",
-    "xpack.apm.home.alertsMenu.alerts": "アラート",
     "xpack.apm.home.alertsMenu.createAnomalyAlert": "異常アラートを作成",
-    "xpack.apm.home.alertsMenu.createThresholdAlert": "しきい値アラートを作成",
     "xpack.apm.home.alertsMenu.errorCount": "エラー数",
-    "xpack.apm.home.alertsMenu.transactionDuration": "レイテンシ",
     "xpack.apm.home.alertsMenu.transactionErrorRate": "トランザクションエラー率",
-    "xpack.apm.home.alertsMenu.viewActiveAlerts": "アクティブアラートを表示",
     "xpack.apm.home.serviceMapTabLabel": "サービスマップ",
     "xpack.apm.instancesLatencyDistributionChartLegend": "インスタンス",
     "xpack.apm.instancesLatencyDistributionChartLegend.previousPeriod": "前の期間",
@@ -10876,20 +10872,10 @@
     "xpack.indexLifecycleMgmt.timeline.title": "ポリシー概要",
     "xpack.indexLifecycleMgmt.timeline.warmPhaseSectionTitle": "ウォームフェーズ",
     "xpack.indexLifecycleMgmt.warmPhase.dataTier.description": "頻度が低い読み取り専用アクセス用に最適化されたノードにデータを移動します。",
-    "xpack.infra.alerting.alertDropdownTitle": "アラート",
     "xpack.infra.alerting.alertFlyout.groupBy.placeholder": "なし (グループなし) ",
     "xpack.infra.alerting.alertFlyout.groupByLabel": "グループ分けの条件",
-    "xpack.infra.alerting.alertsButton": "アラート",
-    "xpack.infra.alerting.createInventoryAlertButton": "インベントリアラートの作成",
-    "xpack.infra.alerting.createThresholdAlertButton": "しきい値アラートを作成",
     "xpack.infra.alerting.infrastructureDropdownMenu": "インフラストラクチャー",
-    "xpack.infra.alerting.infrastructureDropdownTitle": "インフラストラクチャーアラート",
-    "xpack.infra.alerting.logs.alertsButton": "アラート",
-    "xpack.infra.alerting.logs.createAlertButton": "アラートの作成",
-    "xpack.infra.alerting.logs.manageAlerts": "アラートを管理",
-    "xpack.infra.alerting.manageAlerts": "アラートを管理",
     "xpack.infra.alerting.metricsDropdownMenu": "メトリック",
-    "xpack.infra.alerting.metricsDropdownTitle": "メトリックアラート",
     "xpack.infra.alerts.charts.errorMessage": "問題が発生しました",
     "xpack.infra.alerts.charts.loadingMessage": "読み込み中",
     "xpack.infra.alerts.charts.noDataMessage": "グラフデータがありません",
@@ -15902,13 +15888,8 @@
     "xpack.monitoring.alerts.nodesChanged.ui.removedFiringMessage": "Elasticsearchノード「{removed}」がこのクラスターから削除されました。",
     "xpack.monitoring.alerts.nodesChanged.ui.resolvedMessage": "このクラスターのElasticsearchノードは変更されていません。",
     "xpack.monitoring.alerts.nodesChanged.ui.restartedFiringMessage": "このクラスターでElasticsearchノード「{restarted}」が再起動しました。",
-    "xpack.monitoring.alerts.panel.disableAlert.errorTitle": "アラートを無効にできません",
     "xpack.monitoring.alerts.panel.disableTitle": "無効にする",
-    "xpack.monitoring.alerts.panel.editAlert": "アラートを編集",
-    "xpack.monitoring.alerts.panel.enableAlert.errorTitle": "アラートを有効にできません",
-    "xpack.monitoring.alerts.panel.muteAlert.errorTitle": "アラートをミュートできません",
     "xpack.monitoring.alerts.panel.muteTitle": "ミュート",
-    "xpack.monitoring.alerts.panel.ummuteAlert.errorTitle": "アラートをミュート解除できません",
     "xpack.monitoring.alerts.rejection.paramDetails.duration.label": "最後の",
     "xpack.monitoring.alerts.rejection.paramDetails.threshold.label": "{type} 拒否カウントが超過するときに通知",
     "xpack.monitoring.alerts.searchThreadPoolRejections.description": "検索スレッドプールの拒否数がしきい値を超過するときにアラートを発行します。",
@@ -17235,7 +17216,6 @@
     "xpack.observability.alertsTable.viewInAppButtonLabel": "アプリで表示",
     "xpack.observability.alertsTitle": "アラート",
     "xpack.observability.emptySection.apps.alert.description": "503 エラーが累積していますか?サービスは応答していますか?CPUとRAMの使用量が跳ね上がっていますか?このような警告を、事後にではなく、発生と同時に把握しましょう。",
-    "xpack.observability.emptySection.apps.alert.link": "アラートの作成",
     "xpack.observability.emptySection.apps.alert.title": "アラートが見つかりません。",
     "xpack.observability.emptySection.apps.apm.description": "分散アーキテクチャ全体でトランザクションを追跡し、サービスの通信をマップ化して、簡単にパフォーマンスボトルネックを特定できます。",
     "xpack.observability.emptySection.apps.apm.link": "エージェントのインストール",
@@ -23526,8 +23506,6 @@
     "xpack.uptime.alerts.tls.validAfterExpiringString": "{relativeDate}日以内、{date}に期限切れになります。",
     "xpack.uptime.alerts.tls.validBeforeExpiredString": "{relativeDate}日前、{date}以降有効です。",
     "xpack.uptime.alerts.tls.validBeforeExpiringString": "今から{relativeDate}日間、{date}まで無効です。",
-    "xpack.uptime.alerts.toggleAlertFlyoutButtonText": "アラート",
-    "xpack.uptime.alertsPopover.toggleButton.ariaLabel": "アラートコンテキストメニューを開く",
     "xpack.uptime.apmIntegrationAction.description": "このモニターの検索 APM",
     "xpack.uptime.apmIntegrationAction.text": "APMデータを表示",
     "xpack.uptime.availabilityLabelText": "{value} %",
@@ -23746,15 +23724,11 @@
     "xpack.uptime.monitorDetails.title.pingType.tcp": "TCP ping",
     "xpack.uptime.monitorList.anomalyColumn.label": "レスポンス異常スコア",
     "xpack.uptime.monitorList.defineConnector.description": "アラートを有効にするには、デフォルトのアラートアクションコネクターを定義してください。",
-    "xpack.uptime.monitorList.disableDownAlert": "ステータスアラートを無効にする",
     "xpack.uptime.monitorList.downLineSeries.downLabel": "ダウン",
     "xpack.uptime.monitorList.drawer.missingLocation": "一部の Heartbeat インスタンスには位置情報が定義されていません。Heartbeat 構成への{link}。",
     "xpack.uptime.monitorList.drawer.mostRecentRun": "直近のテスト実行",
     "xpack.uptime.monitorList.drawer.statusRowLocationList": "前回の確認時に\"{status}\"ステータスだった場所のリスト。",
     "xpack.uptime.monitorList.drawer.url": "Url",
-    "xpack.uptime.monitorList.enabledAlerts.noAlert": "このモニターではアラートが有効ではありません。",
-    "xpack.uptime.monitorList.enabledAlerts.title": "有効なアラート",
-    "xpack.uptime.monitorList.enableDownAlert": "ステータスアラートを有効にする",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "ID {id}のモニターの行を展開",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "場所を追加",
     "xpack.uptime.monitorList.infraIntegrationAction.container.message": "コンテナーメトリックを表示",
@@ -23828,15 +23802,7 @@
     "xpack.uptime.monitorStatusBar.timestampFromNowTextAriaLabel": "最終確認からの経過時間",
     "xpack.uptime.monitorStatusBar.type.ariaLabel": "モニタータイプ",
     "xpack.uptime.monitorStatusBar.type.label": "型",
-    "xpack.uptime.navigateToAlertingButton.content": "アラートを管理",
-    "xpack.uptime.navigateToAlertingUi": "Uptime を離れてアラート管理ページに移動します",
     "xpack.uptime.notFountPage.homeLinkText": "ホームへ戻る",
-    "xpack.uptime.openAlertContextPanel.ariaLabel": "アラートコンテキストパネルを開くと、アラートタイプを選択できます",
-    "xpack.uptime.openAlertContextPanel.label": "アラートの作成",
-    "xpack.uptime.overview.alerts.disabled.failed": "アラートを無効にできません。",
-    "xpack.uptime.overview.alerts.disabled.success": "アラートが正常に無効にされました。",
-    "xpack.uptime.overview.alerts.enabled.failed": "アラートを有効にできません。",
-    "xpack.uptime.overview.alerts.enabled.success": "アラートが正常に有効にされました。 ",
     "xpack.uptime.overview.alerts.enabled.success.description": "この監視が停止しているときには、メッセージが {actionConnectors} に送信されます。",
     "xpack.uptime.overview.filterButton.label": "{title}フィルターのフィルターグループを展開",
     "xpack.uptime.overview.pageHeader.syntheticsCallout.announcementLink": "お知らせを読む",
@@ -24004,10 +23970,6 @@
     "xpack.uptime.synthetics.waterfallChart.labels.timings.ssl": "TLS",
     "xpack.uptime.synthetics.waterfallChart.labels.timings.wait": "待機中 (TTFB) ",
     "xpack.uptime.title": "アップタイム",
-    "xpack.uptime.toggleAlertButton.content": "ステータスアラートを監視",
-    "xpack.uptime.toggleAlertFlyout.ariaLabel": "アラートの追加ポップアップを開く",
-    "xpack.uptime.toggleTlsAlertButton.ariaLabel": "TLSアラートの追加ポップアップを開く",
-    "xpack.uptime.toggleTlsAlertButton.content": "TLSアラート",
     "xpack.uptime.uptimeFeatureCatalogueTitle": "アップタイム",
     "xpack.urlDrilldown.click.event.key.documentation": "クリックしたデータポイントの後ろのフィールド名。",
     "xpack.urlDrilldown.click.event.key.title": "クリックしたフィールドの名前。",

x-pack/plugins/translations/translations/zh-CN.json

@@ -5520,13 +5520,9 @@
     "xpack.apm.header.badge.readOnly.text": "只读",
     "xpack.apm.header.badge.readOnly.tooltip": "无法保存",
     "xpack.apm.helpMenu.upgradeAssistantLink": "升级助手",
-    "xpack.apm.home.alertsMenu.alerts": "告警",
     "xpack.apm.home.alertsMenu.createAnomalyAlert": "创建异常告警",
-    "xpack.apm.home.alertsMenu.createThresholdAlert": "创建阈值告警",
     "xpack.apm.home.alertsMenu.errorCount": "错误计数",
-    "xpack.apm.home.alertsMenu.transactionDuration": "延迟",
     "xpack.apm.home.alertsMenu.transactionErrorRate": "事务错误率",
-    "xpack.apm.home.alertsMenu.viewActiveAlerts": "查看活动告警",
     "xpack.apm.home.serviceMapTabLabel": "服务地图",
     "xpack.apm.instancesLatencyDistributionChartLegend": "实例",
     "xpack.apm.instancesLatencyDistributionChartLegend.previousPeriod": "上一时段",
@@ -11015,20 +11011,10 @@
     "xpack.indexLifecycleMgmt.timeline.title": "策略摘要",
     "xpack.indexLifecycleMgmt.timeline.warmPhaseSectionTitle": "温阶段",
     "xpack.indexLifecycleMgmt.warmPhase.dataTier.description": "将数据移到针对不太频繁的只读访问优化的节点。",
-    "xpack.infra.alerting.alertDropdownTitle": "告警",
     "xpack.infra.alerting.alertFlyout.groupBy.placeholder": "无内容 (未分组) ",
     "xpack.infra.alerting.alertFlyout.groupByLabel": "分组依据",
-    "xpack.infra.alerting.alertsButton": "告警",
-    "xpack.infra.alerting.createInventoryAlertButton": "创建库存告警",
-    "xpack.infra.alerting.createThresholdAlertButton": "创建阈值告警",
     "xpack.infra.alerting.infrastructureDropdownMenu": "基础设施",
-    "xpack.infra.alerting.infrastructureDropdownTitle": "基础架构告警",
-    "xpack.infra.alerting.logs.alertsButton": "告警",
-    "xpack.infra.alerting.logs.createAlertButton": "创建告警",
-    "xpack.infra.alerting.logs.manageAlerts": "管理告警",
-    "xpack.infra.alerting.manageAlerts": "管理告警",
     "xpack.infra.alerting.metricsDropdownMenu": "指标",
-    "xpack.infra.alerting.metricsDropdownTitle": "指标告警",
     "xpack.infra.alerts.charts.errorMessage": "哇哦，出问题了",
     "xpack.infra.alerts.charts.loadingMessage": "正在加载",
     "xpack.infra.alerts.charts.noDataMessage": "没有可用图表数据",
@@ -16138,13 +16124,8 @@
     "xpack.monitoring.alerts.nodesChanged.ui.removedFiringMessage": "Elasticsearch 节点“{removed}”已从此集群中移除。",
     "xpack.monitoring.alerts.nodesChanged.ui.resolvedMessage": "此集群的 Elasticsearch 节点中没有更改。",
     "xpack.monitoring.alerts.nodesChanged.ui.restartedFiringMessage": "此集群中 Elasticsearch 节点“{restarted}”已重新启动。",
-    "xpack.monitoring.alerts.panel.disableAlert.errorTitle": "无法禁用告警",
     "xpack.monitoring.alerts.panel.disableTitle": "禁用",
-    "xpack.monitoring.alerts.panel.editAlert": "编辑告警",
-    "xpack.monitoring.alerts.panel.enableAlert.errorTitle": "无法启用告警",
-    "xpack.monitoring.alerts.panel.muteAlert.errorTitle": "无法静音告警",
     "xpack.monitoring.alerts.panel.muteTitle": "静音",
-    "xpack.monitoring.alerts.panel.ummuteAlert.errorTitle": "无法取消告警静音",
     "xpack.monitoring.alerts.rejection.paramDetails.duration.label": "过去",
     "xpack.monitoring.alerts.rejection.paramDetails.threshold.label": "当 {type} 拒绝计数超过以下阈值时通知：",
     "xpack.monitoring.alerts.searchThreadPoolRejections.description": "当搜索线程池中的拒绝数目超过阈值时告警。",
@@ -17471,7 +17452,6 @@
     "xpack.observability.alertsTable.viewInAppButtonLabel": "在应用中查看",
     "xpack.observability.alertsTitle": "告警",
     "xpack.observability.emptySection.apps.alert.description": "503 错误是否越来越多？服务是否响应？CPU 和 RAM 利用率是否激增？实时查看警告，而不是事后再进行剖析。",
-    "xpack.observability.emptySection.apps.alert.link": "创建告警",
     "xpack.observability.emptySection.apps.alert.title": "未找到告警。",
     "xpack.observability.emptySection.apps.apm.description": "通过分布式体系结构跟踪事务并映射服务的交互以轻松发现性能瓶颈。",
     "xpack.observability.emptySection.apps.apm.link": "安装代理",
@@ -23892,8 +23872,6 @@
     "xpack.uptime.alerts.tls.validAfterExpiringString": "将在{relativeDate} 天后，即 {date}到期。",
     "xpack.uptime.alerts.tls.validBeforeExpiredString": "自 {relativeDate} 天前，即 {date}开始生效。",
     "xpack.uptime.alerts.tls.validBeforeExpiringString": "从现在到 {date}的 {relativeDate} 天里无效。",
-    "xpack.uptime.alerts.toggleAlertFlyoutButtonText": "告警",
-    "xpack.uptime.alertsPopover.toggleButton.ariaLabel": "打开告警上下文菜单",
     "xpack.uptime.apmIntegrationAction.description": "在 APM 中搜索此监测",
     "xpack.uptime.apmIntegrationAction.text": "显示 APM 数据",
     "xpack.uptime.availabilityLabelText": "{value} %",
@@ -24112,15 +24090,11 @@
     "xpack.uptime.monitorDetails.title.pingType.tcp": "TCP ping",
     "xpack.uptime.monitorList.anomalyColumn.label": "响应异常分数",
     "xpack.uptime.monitorList.defineConnector.description": "要开始启用告警，请在以下位置定义默认告警操作连接器",
-    "xpack.uptime.monitorList.disableDownAlert": "禁用状态告警",
     "xpack.uptime.monitorList.downLineSeries.downLabel": "关闭检查",
     "xpack.uptime.monitorList.drawer.missingLocation": "某些 Heartbeat 实例未定义位置。{link}到您的 Heartbeat 配置。",
     "xpack.uptime.monitorList.drawer.mostRecentRun": "最新测试运行",
     "xpack.uptime.monitorList.drawer.statusRowLocationList": "上次检查时状态为“{status}”的位置列表。",
     "xpack.uptime.monitorList.drawer.url": "URL",
-    "xpack.uptime.monitorList.enabledAlerts.noAlert": "没有为此监测启用告警。",
-    "xpack.uptime.monitorList.enabledAlerts.title": "已启用的告警",
-    "xpack.uptime.monitorList.enableDownAlert": "启用状态告警",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "展开 ID {id} 的监测行",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "添加位置",
     "xpack.uptime.monitorList.infraIntegrationAction.container.message": "显示容器指标",
@@ -24194,15 +24168,7 @@
     "xpack.uptime.monitorStatusBar.timestampFromNowTextAriaLabel": "自上次检查以来经过的时间",
     "xpack.uptime.monitorStatusBar.type.ariaLabel": "监测类型",
     "xpack.uptime.monitorStatusBar.type.label": "类型",
-    "xpack.uptime.navigateToAlertingButton.content": "管理告警",
-    "xpack.uptime.navigateToAlertingUi": "离开 Uptime 并前往“Alerting 管理”页面",
     "xpack.uptime.notFountPage.homeLinkText": "返回主页",
-    "xpack.uptime.openAlertContextPanel.ariaLabel": "打开告警上下文面板，以便可以选择告警类型",
-    "xpack.uptime.openAlertContextPanel.label": "创建告警",
-    "xpack.uptime.overview.alerts.disabled.failed": "无法禁用告警！",
-    "xpack.uptime.overview.alerts.disabled.success": "已成功禁用告警！",
-    "xpack.uptime.overview.alerts.enabled.failed": "无法启用告警！",
-    "xpack.uptime.overview.alerts.enabled.success": "已成功启用告警 ",
     "xpack.uptime.overview.alerts.enabled.success.description": "此监测关闭时，将有消息发送到 {actionConnectors}。",
     "xpack.uptime.overview.filterButton.label": "展开筛选 {title} 的筛选组",
     "xpack.uptime.overview.pageHeader.syntheticsCallout.announcementLink": "阅读公告",
@@ -24370,10 +24336,6 @@
     "xpack.uptime.synthetics.waterfallChart.labels.timings.ssl": "TLS",
     "xpack.uptime.synthetics.waterfallChart.labels.timings.wait": "等待中 (TTFB)",
     "xpack.uptime.title": "运行时间",
-    "xpack.uptime.toggleAlertButton.content": "监测状态告警",
-    "xpack.uptime.toggleAlertFlyout.ariaLabel": "打开添加告警浮出控件",
-    "xpack.uptime.toggleTlsAlertButton.ariaLabel": "打开 TLS 告警浮出控件",
-    "xpack.uptime.toggleTlsAlertButton.content": "TLS 告警",
     "xpack.uptime.uptimeFeatureCatalogueTitle": "运行时间",
     "xpack.urlDrilldown.click.event.key.documentation": "已点击数据点背后的字段名称。",
     "xpack.urlDrilldown.click.event.key.title": "已点击字段的名称。",

x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx

@@ -14,12 +14,12 @@ describe('ActionMenuContent', () => {
   it('renders alerts dropdown', async () => {
     const { getByLabelText, getByText } = render(<ActionMenuContent />);
 
-    const alertsDropdown = getByLabelText('Open alert context menu');
+    const alertsDropdown = getByLabelText('Open alerts and rules context menu');
     fireEvent.click(alertsDropdown);
 
     await waitFor(() => {
-      expect(getByText('Create alert'));
-      expect(getByText('Manage alerts'));
+      expect(getByText('Create rule'));
+      expect(getByText('Manage rules'));
     });
   });
 

x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx

@@ -67,7 +67,7 @@ export const ToggleAlertFlyoutButtonComponent: React.FC<Props> = ({
       >
         <FormattedMessage
           id="xpack.uptime.navigateToAlertingButton.content"
-          defaultMessage="Manage alerts"
+          defaultMessage="Manage rules"
         />
       </EuiLink>
     ),
@@ -114,7 +114,7 @@ export const ToggleAlertFlyoutButtonComponent: React.FC<Props> = ({
       },
       {
         id: ALERT_CONTEXT_SELECT_TYPE_PANEL_ID,
-        title: 'create alerts',
+        title: ToggleFlyoutTranslations.toggleAlertFlyoutButtonLabel,
         items: selectionItems,
       },
     ];
@@ -134,7 +134,7 @@ export const ToggleAlertFlyoutButtonComponent: React.FC<Props> = ({
         >
           <FormattedMessage
             id="xpack.uptime.alerts.toggleAlertFlyoutButtonText"
-            defaultMessage="Alerts"
+            defaultMessage="Alerts and rules"
           />
         </EuiButtonEmpty>
       }

x-pack/plugins/uptime/public/components/overview/alerts/translations.ts

@@ -283,30 +283,33 @@ export const TlsTranslations = {
 
 export const ToggleFlyoutTranslations = {
   toggleButtonAriaLabel: i18n.translate('xpack.uptime.alertsPopover.toggleButton.ariaLabel', {
-    defaultMessage: 'Open alert context menu',
+    defaultMessage: 'Open alerts and rules context menu',
   }),
   openAlertContextPanelAriaLabel: i18n.translate('xpack.uptime.openAlertContextPanel.ariaLabel', {
-    defaultMessage: 'Open the alert context panel so you can choose an alert type',
+    defaultMessage: 'Open the rule context panel so you can choose a rule type',
   }),
   openAlertContextPanelLabel: i18n.translate('xpack.uptime.openAlertContextPanel.label', {
-    defaultMessage: 'Create alert',
+    defaultMessage: 'Create rule',
   }),
   toggleTlsAriaLabel: i18n.translate('xpack.uptime.toggleTlsAlertButton.ariaLabel', {
-    defaultMessage: 'Open TLS alert flyout',
+    defaultMessage: 'Open TLS rule flyout',
   }),
   toggleTlsContent: i18n.translate('xpack.uptime.toggleTlsAlertButton.content', {
-    defaultMessage: 'TLS alert',
+    defaultMessage: 'TLS rule',
   }),
   toggleMonitorStatusAriaLabel: i18n.translate('xpack.uptime.toggleAlertFlyout.ariaLabel', {
-    defaultMessage: 'Open add alert flyout',
+    defaultMessage: 'Open add rule flyout',
   }),
   toggleMonitorStatusContent: i18n.translate('xpack.uptime.toggleAlertButton.content', {
-    defaultMessage: 'Monitor status alert',
+    defaultMessage: 'Monitor status rule',
   }),
   navigateToAlertingUIAriaLabel: i18n.translate('xpack.uptime.navigateToAlertingUi', {
     defaultMessage: 'Leave Uptime and go to Alerting Management page',
   }),
   navigateToAlertingButtonContent: i18n.translate('xpack.uptime.navigateToAlertingButton.content', {
-    defaultMessage: 'Manage alerts',
+    defaultMessage: 'Manage rules',
+  }),
+  toggleAlertFlyoutButtonLabel: i18n.translate('xpack.uptime.alerts.createRulesPanel.title', {
+    defaultMessage: 'Create rules',
   }),
 };

x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap

@@ -1303,7 +1303,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                     >
                       <button
                         aria-checked="false"
-                        aria-label="Enable status alert"
+                        aria-label="Enable rule"
                         class="euiSwitch__button"
                         data-test-subj="uptimeDisplayDefineConnector"
                         id="defineAlertSettingsSwitch"
@@ -1556,7 +1556,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                     >
                       <button
                         aria-checked="false"
-                        aria-label="Enable status alert"
+                        aria-label="Enable rule"
                         class="euiSwitch__button"
                         data-test-subj="uptimeDisplayDefineConnector"
                         id="defineAlertSettingsSwitch"

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx

@@ -14,8 +14,8 @@ import { ReactRouterEuiLink } from '../../../common/react_router_helpers';
 import { MONITOR_ROUTE, SETTINGS_ROUTE } from '../../../../../common/constants';
 import { ENABLE_STATUS_ALERT } from './translations';
 
-const SETTINGS_LINK_TEXT = i18n.translate('xpack.uptime.page_header.settingsLink', {
-  defaultMessage: 'Settings',
+const SETTINGS_LINK_TEXT = i18n.translate('xpack.uptime.page_header.defineConnector', {
+  defaultMessage: 'Define a default connector',
 });
 
 export const DefineAlertConnectors = () => {
@@ -44,16 +44,16 @@ export const DefineAlertConnectors = () => {
       closePopover={closePopover}
     >
       <EuiText style={{ width: '350px' }} data-test-subj={'uptimeSettingsDefineConnector'}>
-        <FormattedMessage
-          id="xpack.uptime.monitorList.defineConnector.description"
-          defaultMessage="To start enabling alerts, please define a default alert action connector in"
-        />{' '}
         <ReactRouterEuiLink
           to={SETTINGS_ROUTE + '?focusConnectorField=true'}
           data-test-subj={'uptimeSettingsLink'}
         >
           {SETTINGS_LINK_TEXT}
-        </ReactRouterEuiLink>
+        </ReactRouterEuiLink>{' '}
+        <FormattedMessage
+          id="xpack.uptime.monitorList.defineConnector.description"
+          defaultMessage="to receive status alerts."
+        />
       </EuiText>
     </EuiPopover>
   );

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx

@@ -33,9 +33,7 @@ describe('EnableAlertComponent', () => {
       'href',
       '/settings?focusConnectorField=true'
     );
-    expect(
-      getByText('To start enabling alerts, please define a default alert action connector in')
-    );
+    expect(getByText('to receive status alerts.'));
   });
 
   it('does not displays define connectors when there is connector', () => {

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts

@@ -8,11 +8,11 @@
 import { i18n } from '@kbn/i18n';
 
 export const ENABLE_STATUS_ALERT = i18n.translate('xpack.uptime.monitorList.enableDownAlert', {
-  defaultMessage: 'Enable status alert',
+  defaultMessage: 'Enable rule',
 });
 
 export const DISABLE_STATUS_ALERT = i18n.translate('xpack.uptime.monitorList.disableDownAlert', {
-  defaultMessage: 'Disable status alert',
+  defaultMessage: 'Disable rule',
 });
 
 export const EXPAND_TAGS_LABEL = i18n.translate('xpack.uptime.monitorList.tags.expand', {

x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx

@@ -52,8 +52,8 @@ export const EnabledAlerts = ({ monitorAlerts, loading }: Props) => {
     <EuiDescriptionList>
       <EuiDescriptionListTitle>
         {i18n.translate('xpack.uptime.monitorList.enabledAlerts.title', {
-          defaultMessage: 'Enabled alerts',
-          description: 'Alerts enabled for this monitor',
+          defaultMessage: 'Enabled rules',
+          description: 'Rules enabled for this monitor',
         })}
       </EuiDescriptionListTitle>
       <EuiDescriptionListDescription>
@@ -61,7 +61,7 @@ export const EnabledAlerts = ({ monitorAlerts, loading }: Props) => {
           <EuiCallOut
             size="s"
             title={i18n.translate('xpack.uptime.monitorList.enabledAlerts.noAlert', {
-              defaultMessage: 'No alert is enabled for this monitor.',
+              defaultMessage: 'No rules is enabled for this monitor.',
             })}
           />
         )}

x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx

@@ -14,7 +14,7 @@ import { ActionConnector } from '../../state/alerts/alerts';
 export const simpleAlertEnabled = (defaultActions: ActionConnector[]) => {
   return {
     title: i18n.translate('xpack.uptime.overview.alerts.enabled.success', {
-      defaultMessage: 'Alert successfully enabled ',
+      defaultMessage: 'Rule successfully enabled ',
     }),
     text: toMountPoint(
       <FormattedMessage

x-pack/plugins/uptime/public/state/alerts/alerts.ts

@@ -86,7 +86,7 @@ export const alertsReducer = handleActions<AlertState>(
 const showAlertDisabledSuccess = () => {
   kibanaService.core.notifications.toasts.addSuccess(
     i18n.translate('xpack.uptime.overview.alerts.disabled.success', {
-      defaultMessage: 'Alert successfully disabled!',
+      defaultMessage: 'Rule successfully disabled!',
     })
   );
 };
@@ -94,7 +94,7 @@ const showAlertDisabledSuccess = () => {
 const showAlertDisabledFailed = (err: Error) => {
   kibanaService.core.notifications.toasts.addError(err, {
     title: i18n.translate('xpack.uptime.overview.alerts.disabled.failed', {
-      defaultMessage: 'Alert cannot be disabled!',
+      defaultMessage: 'Rule cannot be disabled!',
     }),
   });
 };
@@ -157,7 +157,7 @@ export function* fetchAlertsEffect() {
     } catch (err) {
       kibanaService.core.notifications.toasts.addError(err, {
         title: i18n.translate('xpack.uptime.overview.alerts.enabled.failed', {
-          defaultMessage: 'Alert cannot be enabled!',
+          defaultMessage: 'Rule cannot be enabled!',
         }),
       });
       yield put(createAlertAction.fail(err));