Skip to content

Commit

Permalink
Renamed button and dropdown items in headers (apm, logs, metrics and …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
6 people authored Jun 22, 2021
1 parent fc55c30 commit 65de579
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 130 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 =
Expand Down Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
Expand All @@ -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'),
},
Expand All @@ -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,
Expand Down Expand Up @@ -112,7 +112,7 @@ export const MetricsAlertDropdown = () => {
{
id: 0,
title: i18n.translate('xpack.infra.alerting.alertDropdownTitle', {
defaultMessage: 'Alerts',
defaultMessage: 'Alerts and rules',
}),
items: firstPanelMenuItems,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
];
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/monitoring/public/alerts/configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand All @@ -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,
});
Expand All @@ -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,
});
Expand All @@ -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,
});
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
38 changes: 0 additions & 38 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "前の期間",
Expand Down Expand Up @@ -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": "グラフデータがありません",
Expand Down Expand Up @@ -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": "検索スレッドプールの拒否数がしきい値を超過するときにアラートを発行します。",
Expand Down Expand Up @@ -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": "エージェントのインストール",
Expand Down Expand Up @@ -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} %",
Expand Down Expand Up @@ -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": "コンテナーメトリックを表示",
Expand Down Expand Up @@ -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": "お知らせを読む",
Expand Down Expand Up @@ -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": "クリックしたフィールドの名前。",
Expand Down
Loading

0 comments on commit 65de579

Please sign in to comment.