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

Jump to bottom

Add fieldsForAAD to observability plugin rule types #172809

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Add fieldsForAAD to observability plugin rule types #172809

merged 1 commit into from
Dec 7, 2023

Conversation

maryam-saeidi
Copy link
Member

@maryam-saeidi maryam-saeidi commented Dec 7, 2023 •
edited by kibanamachine
Loading

Related to #158324

Summary

This PR adds fieldsForAAD to the SLO burn rate and Custom threshold rules to ensure conditional actions can use fields related to these rules.

@maryam-saeidi maryam-saeidi added bug Fixes for quality problems that affect the customer experience backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) Team:obs-ux-management Observability Management User Experience Team labels Dec 7, 2023
@maryam-saeidi maryam-saeidi requested a review from XavierM December 7, 2023 12:52
@maryam-saeidi maryam-saeidi self-assigned this Dec 7, 2023
@maryam-saeidi maryam-saeidi requested a review from a team as a code owner December 7, 2023 12:52
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ux-management-team (Team:obs-ux-management)

@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@maryam-saeidi maryam-saeidi added the release_note:skip Skip the PR/issue when compiling release notes label Dec 7, 2023
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @maryam-saeidi

shahzad31
shahzad31 reviewed Dec 7, 2023
View reviewed changes
...ugins/observability/server/lib/rules/custom_threshold/register_custom_threshold_rule_type.ts
@@ -110,6 +110,7 @@ export function thresholdRuleType(
name: i18n.translate('xpack.observability.threshold.ruleName', {
defaultMessage: 'Custom threshold (Beta)',
}),
fieldsForAAD: CUSTOM_THRESHOLD_AAD_FIELDS,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to merge this with ?

import { O11Y_AAD_FIELDS } from '@kbn/infra-plugin/common/constants';

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it but since we will deprecate the infra rules in the future, I thought having these fields separately makes more sense.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can also move this Fields in package like '@kbn/rule-data-utils, might be useful to have it one place.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not convinced this will be used in multiple places in the future, but if you prefer it that way, I will move it there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep it for now. if it makes sense we can move in future

XavierM
XavierM approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@XavierM XavierM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you a lot for doing that! it will make a big a difference to our user.

@maryam-saeidi maryam-saeidi merged commit 6e69fdc into elastic:main Dec 7, 2023
9 checks passed
@maryam-saeidi maryam-saeidi deleted the add-fieldsForAAD-to-obs-plugin-rules branch December 7, 2023 14:28
@kibanamachine kibanamachine mentioned this pull request Dec 7, 2023
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 7, 2023
@maryam-saeidi
Add fieldsForAAD to observability plugin rule types (elastic#172809)
faaec96 
Related to elastic#158324

## Summary

This PR adds `fieldsForAAD` to the SLO burn rate and Custom threshold
rules to ensure conditional actions can use fields related to these
rules.

<img
src="https://github.com/elastic/kibana/assets/12370520/7cb31448-58cc-4bf6-b0da-cdc5e746ae60"
width=500 />

(cherry picked from commit 6e69fdc)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.12

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Dec 7, 2023
@kibanamachine @maryam-saeidi
[8.12] Add fieldsForAAD to observability plugin rule types (#172809) (#…
555876a 
…172826)

# Backport

This will backport the following commits from `main` to `8.12`:
- [Add fieldsForAAD to observability plugin rule types
(#172809)](#172809)

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

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

<!--BACKPORT [{"author":{"name":"Maryam
Saeidi","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-07T14:28:04Z","message":"Add
fieldsForAAD to observability plugin rule types (#172809)\n\nRelated to
#158324\r\n\r\n## Summary\r\n\r\nThis PR adds `fieldsForAAD` to the SLO
burn rate and Custom threshold\r\nrules to ensure conditional actions
can use fields related to
these\r\nrules.\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/7cb31448-58cc-4bf6-b0da-cdc5e746ae60\"\r\nwidth=500
/>","sha":"6e69fdceec7db321601923c005063c17bf605c78","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","backport:prev-minor","Team:obs-ux-management","v8.13.0"],"number":172809,"url":"https://github.com/elastic/kibana/pull/172809","mergeCommit":{"message":"Add
fieldsForAAD to observability plugin rule types (#172809)\n\nRelated to
#158324\r\n\r\n## Summary\r\n\r\nThis PR adds `fieldsForAAD` to the SLO
burn rate and Custom threshold\r\nrules to ensure conditional actions
can use fields related to
these\r\nrules.\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/7cb31448-58cc-4bf6-b0da-cdc5e746ae60\"\r\nwidth=500
/>","sha":"6e69fdceec7db321601923c005063c17bf605c78"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/172809","number":172809,"mergeCommit":{"message":"Add
fieldsForAAD to observability plugin rule types (#172809)\n\nRelated to
#158324\r\n\r\n## Summary\r\n\r\nThis PR adds `fieldsForAAD` to the SLO
burn rate and Custom threshold\r\nrules to ensure conditional actions
can use fields related to
these\r\nrules.\r\n\r\n<img\r\nsrc=\"https://github.com/elastic/kibana/assets/12370520/7cb31448-58cc-4bf6-b0da-cdc5e746ae60\"\r\nwidth=500
/>","sha":"6e69fdceec7db321601923c005063c17bf605c78"}}]}] BACKPORT-->

Co-authored-by: Maryam Saeidi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shahzad31 shahzad31 shahzad31 approved these changes

@XavierM XavierM XavierM approved these changes

Assignees

@maryam-saeidi maryam-saeidi

Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes Team:obs-ux-management Observability Management User Experience Team v8.12.0 v8.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@maryam-saeidi @elasticmachine @apmmachine @kibana-ci @kibanamachine @XavierM @shahzad31