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

x-pack/plugins/apm/public/application/action_menu/alerting_popover_flyout.tsx

@@ -18,7 +18,7 @@ import { AlertType } from '../../../common/alert_types';
 import { AlertingFlyout } from '../../components/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 =
@@ -101,7 +101,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,
         },
@@ -135,7 +135,10 @@ export const MetricsAlertDropdown = () => {
         anchorPosition="downLeft"
         button={
           <EuiButtonEmpty iconSide={'right'} iconType={'arrowDown'} onClick={openPopover}>
-            <FormattedMessage id="xpack.infra.alerting.alertsButton" defaultMessage="Alerts" />
+            <FormattedMessage
+              id="xpack.infra.alerting.alertsButton"
+              defaultMessage="Alerts and rules"
+            />
           </EuiButtonEmpty>
         }
         isOpen={popoverOpen}

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>,
     ];
@@ -84,7 +84,10 @@ export const AlertDropdown = () => {
         panelPaddingSize="none"
         button={
           <EuiButtonEmpty iconSide={'right'} iconType={'arrowDown'} onClick={openPopover}>
-            <FormattedMessage id="xpack.infra.alerting.logs.alertsButton" defaultMessage="Alerts" />
+            <FormattedMessage
+              id="xpack.infra.alerting.logs.alertsButton"
+              defaultMessage="Alerts and rules"
+            />
           </EuiButtonEmpty>
         }
         isOpen={popoverOpen}

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

@@ -5518,13 +5518,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.home.servicesTabLabel": "サービス",
     "xpack.apm.home.tracesTabLabel": "トレース",
@@ -10989,20 +10985,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": "グラフデータがありません",
@@ -23785,8 +23771,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} %",
@@ -24087,11 +24071,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": "アラートを有効にできません。",
@@ -24263,10 +24243,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

@@ -5548,13 +5548,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.home.servicesTabLabel": "服务",
     "xpack.apm.home.tracesTabLabel": "追溯",
@@ -11127,20 +11123,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": "没有可用图表数据",
@@ -24153,8 +24139,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} %",
@@ -24455,11 +24439,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": "无法启用告警！",
@@ -24631,10 +24611,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: 'Create rules',
         items: selectionItems,
       },
     ];
@@ -132,7 +132,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,30 @@ 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',
   }),
 };