Skip to content

Commit

Permalink
[8.9] [AO] Remove default recovery messages for APM rule types (#160928
Browse files Browse the repository at this point in the history
…) (#160967)

# Backport

This will backport the following commits from `main` to `8.9`:
- [[AO] Remove default recovery messages for APM rule types
(#160928)](#160928)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Maryam
Saeidi","email":"maryam.saeidi@elastic.co"},"sourceCommit":{"committedDate":"2023-06-30T09:14:11Z","message":"[AO]
Remove default recovery messages for APM rule types (#160928)\n\nFixes
#160926\r\nPartially reverts
https://github.com/elastic/kibana/pull/159571\r\n\r\n##
Summary\r\n\r\nAt the moment, we don't have any context for recovered
alerts for APM\r\nrule types, and the default messages will be empty. We
will bring these\r\nmessages back after
#158183 is\r\ndone.\r\n\r\n## 🧪
How to test\r\n- When creating an APM rule, add an action for the
recovered state. You\r\nshould see the default recovery message as
Recovered\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/eb6ef0cc-0dbc-4758-a73e-4647b068f9a1\"\r\nwidth=\"500\"/>","sha":"3382061db4acd29c57f3b6def3e3008d46765a38","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:APM","release_note:skip","Team:
Actionable
Observability","backport:prev-minor","v8.10.0"],"number":160928,"url":"https://github.com/elastic/kibana/pull/160928","mergeCommit":{"message":"[AO]
Remove default recovery messages for APM rule types (#160928)\n\nFixes
#160926\r\nPartially reverts
https://github.com/elastic/kibana/pull/159571\r\n\r\n##
Summary\r\n\r\nAt the moment, we don't have any context for recovered
alerts for APM\r\nrule types, and the default messages will be empty. We
will bring these\r\nmessages back after
#158183 is\r\ndone.\r\n\r\n## 🧪
How to test\r\n- When creating an APM rule, add an action for the
recovered state. You\r\nshould see the default recovery message as
Recovered\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/eb6ef0cc-0dbc-4758-a73e-4647b068f9a1\"\r\nwidth=\"500\"/>","sha":"3382061db4acd29c57f3b6def3e3008d46765a38"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/160928","number":160928,"mergeCommit":{"message":"[AO]
Remove default recovery messages for APM rule types (#160928)\n\nFixes
#160926\r\nPartially reverts
https://github.com/elastic/kibana/pull/159571\r\n\r\n##
Summary\r\n\r\nAt the moment, we don't have any context for recovered
alerts for APM\r\nrule types, and the default messages will be empty. We
will bring these\r\nmessages back after
#158183 is\r\ndone.\r\n\r\n## 🧪
How to test\r\n- When creating an APM rule, add an action for the
recovered state. You\r\nshould see the default recovery message as
Recovered\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/eb6ef0cc-0dbc-4758-a73e-4647b068f9a1\"\r\nwidth=\"500\"/>","sha":"3382061db4acd29c57f3b6def3e3008d46765a38"}}]}]
BACKPORT-->

Co-authored-by: Maryam Saeidi <maryam.saeidi@elastic.co>
  • Loading branch information
kibanamachine and maryam-saeidi authored Jun 30, 2023
1 parent e5b0dd3 commit 7872c8e
Showing 1 changed file with 0 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@ import {
import { ApmRuleType } from '../../../../common/rules/apm_rule_types';
import {
anomalyMessage,
anomalyRecoveryMessage,
errorCountMessage,
errorCountRecoveryMessage,
transactionDurationMessage,
transactionDurationRecoveryMessage,
transactionErrorRateMessage,
transactionErrorRateRecoveryMessage,
} from '../../../../common/rules/default_action_message';

// copied from elasticsearch_fieldnames.ts to limit page load bundle size
Expand Down Expand Up @@ -59,7 +55,6 @@ export function registerApmRuleTypes(
}),
requiresAppContext: false,
defaultActionMessage: errorCountMessage,
defaultRecoveryMessage: errorCountRecoveryMessage,
});

observabilityRuleTypeRegistry.register({
Expand Down Expand Up @@ -97,7 +92,6 @@ export function registerApmRuleTypes(
),
requiresAppContext: false,
defaultActionMessage: transactionDurationMessage,
defaultRecoveryMessage: transactionDurationRecoveryMessage,
});

observabilityRuleTypeRegistry.register({
Expand Down Expand Up @@ -130,7 +124,6 @@ export function registerApmRuleTypes(
}),
requiresAppContext: false,
defaultActionMessage: transactionErrorRateMessage,
defaultRecoveryMessage: transactionErrorRateRecoveryMessage,
});

observabilityRuleTypeRegistry.register({
Expand Down Expand Up @@ -160,6 +153,5 @@ export function registerApmRuleTypes(
}),
requiresAppContext: false,
defaultActionMessage: anomalyMessage,
defaultRecoveryMessage: anomalyRecoveryMessage,
});
}

0 comments on commit 7872c8e

Please sign in to comment.