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.

Sign up for GitHub

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

Rename some alert types #61693

Merged
merged 5 commits into from
Apr 2, 2020
Merged

Rename some alert types #61693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a47e98
Rename some alert types
mikecote Mar 27, 2020
6cb8138
Merge branch 'master' into alerting/rename-some-alert-types
elasticmachine Mar 31, 2020
cd94d49
Merge branch 'master' of github.com:elastic/kibana into alerting/rena…
mikecote Mar 31, 2020
02b41ef
Use sentence case for remaining changes + fix jest test
mikecote Mar 31, 2020
9d60f01
Merge with master
mikecote Apr 1, 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
2 changes: 1 addition & 1 deletion ...y/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const rulesNotificationAlertType = ({
logger: Logger;
}): NotificationAlertTypeDefinition => ({
id: NOTIFICATIONS_ID,
name: 'SIEM Notifications',
name: 'SIEM notification',
actionGroups: siemRuleActionGroups,
defaultActionGroupId: 'default',
validate: {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const signalRulesAlertType = ({
}): SignalRuleAlertTypeDefinition => {
return {
id: SIGNALS_ID,
name: 'SIEM Signals',
name: 'SIEM signal',
actionGroups: siemRuleActionGroups,
defaultActionGroupId: 'default',
validate: {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ describe('monitor status alert type', () => {
{{context.downMonitorsWithGeo}}",
"iconClass": "uptimeApp",
"id": "xpack.uptime.alerts.monitorStatus",
"name": "Uptime Monitor Status",
"name": "Uptime monitor status",
"validate": [Function],
}
`);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/uptime/public/lib/alert_types/monitor_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const initMonitorStatusAlertType: AlertTypeInitializer = ({
autocomplete,
}): AlertTypeModel => ({
id: 'xpack.uptime.alerts.monitorStatus',
name: 'Uptime Monitor Status',
name: 'Uptime monitor status',
iconClass: 'uptimeApp',
alertParamsExpression: params => {
return <AlertMonitorStatus {...params} autocomplete={autocomplete} />;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/alert_type.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('alertType', () => {

it('alert type creation structure is the expected value', async () => {
expect(alertType.id).toBe('.index-threshold');
expect(alertType.name).toBe('Index Threshold');
expect(alertType.name).toBe('Index threshold');
expect(alertType.actionGroups).toEqual([{ id: 'threshold met', name: 'Threshold Met' }]);

expect(alertType.actionVariables).toMatchInlineSnapshot(`
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/alert_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function getAlertType(service: Service): AlertType {
const { logger } = service;

const alertTypeName = i18n.translate('xpack.alertingBuiltins.indexThreshold.alertTypeTitle', {
defaultMessage: 'Index Threshold',
defaultMessage: 'Index threshold',
});

const actionGroupName = i18n.translate(
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/alerting_builtins/server/plugin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('AlertingBuiltins Plugin', () => {
},
],
"id": ".index-threshold",
"name": "Index Threshold",
"name": "Index threshold",
}
`);
});
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/common/alert_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export enum AlertType {
export const ALERT_TYPES_CONFIG = {
[AlertType.ErrorRate]: {
name: i18n.translate('xpack.apm.errorRateAlert.name', {
defaultMessage: 'Error rate threshold'
defaultMessage: 'Error rate'
}),
actionGroups: [
{
Expand All @@ -28,7 +28,7 @@ export const ALERT_TYPES_CONFIG = {
},
[AlertType.TransactionDuration]: {
name: i18n.translate('xpack.apm.transactionDurationAlert.name', {
defaultMessage: 'Transaction duration threshold'
defaultMessage: 'Transaction duration'
}),
actionGroups: [
{
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/components/alerting/metrics/metric_threshold_alert_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function getAlertType(): AlertTypeModel {
return {
id: METRIC_THRESHOLD_ALERT_TYPE_ID,
name: i18n.translate('xpack.infra.metrics.alertFlyout.alertName', {
defaultMessage: 'Metric Threshold',
defaultMessage: 'Metric threshold',
}),
iconClass: 'bell',
alertParamsExpression: Expressions,
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export async function registerMetricThresholdAlertType(alertingPlugin: PluginSet

alertingPlugin.registerType({
id: METRIC_THRESHOLD_ALERT_TYPE_ID,
name: 'Metric Alert - Threshold',
name: 'Metric threshold',
validate: {
params: schema.object({
criteria: schema.arrayOf(schema.oneOf([countCriterion, nonCountCriterion])),
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/triggers_actions_ui/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ AlertTypeModel:
export function getAlertType(): AlertTypeModel {
return {
id: '.index-threshold',
name: 'Index Threshold',
name: 'Index threshold',
iconClass: 'alert',
alertParamsExpression: IndexThresholdAlertTypeExpression,
validate: validateAlertType,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ describe('status check alert', () => {

it('contains the expected static fields like id, name, etc.', () => {
expect(alert.id).toBe('xpack.uptime.alerts.monitorStatus');
expect(alert.name).toBe('Uptime Monitor Status');
expect(alert.name).toBe('Uptime monitor status');
expect(alert.defaultActionGroupId).toBe('xpack.uptime.alerts.actionGroups.monitorStatus');
expect(alert.actionGroups).toMatchInlineSnapshot(`
Array [
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/server/lib/alerts/status_check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const DEFAULT_MAX_MESSAGE_ROWS = 3;
export const statusCheckAlertFactory: UptimeAlertTypeFactory = (server, libs) => ({
id: 'xpack.uptime.alerts.monitorStatus',
name: i18n.translate('xpack.uptime.alerts.monitorStatus', {
defaultMessage: 'Uptime Monitor Status',
defaultMessage: 'Uptime monitor status',
}),
validate: {
params: schema.object({
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
{
name: alertName,
tagsText: '',
alertType: 'Index Threshold',
alertType: 'Index threshold',
interval: '1m',
},
]);
Expand Down Expand Up @@ -154,7 +154,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
{
name: createdAlert.name,
tagsText: 'foo, bar',
alertType: 'Index Threshold',
alertType: 'Index threshold',
interval: '1m',
},
]);
Expand All @@ -179,7 +179,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
{
name: updatedAlertName,
tagsText: 'foo, bar',
alertType: 'Index Threshold',
alertType: 'Index threshold',
interval: '1m',
},
]);
Expand Down Expand Up @@ -210,7 +210,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
{
name: createdAlert.name,
tagsText: 'foo, bar',
alertType: 'Index Threshold',
alertType: 'Index threshold',
interval: '1m',
},
]);
Expand Down Expand Up @@ -260,7 +260,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
{
name: createdAlert.name,
tagsText: 'foo, bar',
alertType: 'Index Threshold',
alertType: 'Index threshold',
interval: '1m',
},
]);
Expand Down