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.

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

[Metric Alerts] Add backend support for multiple expressions per alert #58672

Merged
merged 4 commits into from
Feb 28, 2020

Conversation

Zacqary
Copy link
Contributor

@Zacqary Zacqary commented Feb 26, 2020

Summary

Fixes #58669

(Based off #57606, don't merge until rebasing)

This adds support for multiple expressions AND'ed together in a metric threshold alert.

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@Zacqary Zacqary added Feature:Alerting Feature:Metrics UI Metrics UI feature Team:Infra Monitoring UI - DEPRECATED DEPRECATED - Label for the Infra Monitoring UI team. Use Team:obs-ux-infra_services labels Feb 26, 2020
@Zacqary Zacqary requested a review from a team February 26, 2020 22:19
@elasticmachine
Copy link
Contributor

Pinging @elastic/logs-metrics-ui (Team:logs-metrics-ui)

@Zacqary Zacqary force-pushed the 58669-multiple-alert-expressions branch from 02236a6 to 996f7ea Compare February 27, 2020 16:52
@Zacqary Zacqary marked this pull request as ready for review February 27, 2020 16:52
Copy link
Contributor

@phillipb phillipb left a comment

Choose a reason for hiding this comment

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

Looks good. Just a naming change.

timeUnit: schema.string(),
timeSize: schema.number(),
indexPattern: schema.string(),
expressions: schema.arrayOf(
Copy link
Contributor

Choose a reason for hiding this comment

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

We planned to change the name to criteria.

@Zacqary Zacqary added the release_note:skip Skip the PR/issue when compiling release notes label Feb 27, 2020
@Zacqary
Copy link
Contributor Author

Zacqary commented Feb 27, 2020

@elasticmachine merge upstream

@Zacqary
Copy link
Contributor Author

Zacqary commented Feb 27, 2020

@elasticmachine merge upstream

Copy link
Contributor

@phillipb phillipb left a comment

Choose a reason for hiding this comment

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

LGTM

@Zacqary
Copy link
Contributor Author

Zacqary commented Feb 28, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@Zacqary Zacqary merged commit 06ebbb3 into elastic:master Feb 28, 2020
@Zacqary Zacqary deleted the 58669-multiple-alert-expressions branch February 28, 2020 19:12
Zacqary added a commit to Zacqary/kibana that referenced this pull request Feb 28, 2020
elastic#58672)

* Add support for multiple alert expressions

* Rename expressions to criteria

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Zacqary added a commit that referenced this pull request Feb 28, 2020
#58672) (#58925)

* Add support for multiple alert expressions

* Rename expressions to criteria

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 2, 2020
…dex-server-side

* 'master' of github.com:elastic/kibana: (34 commits)
  [Upgrade Assistant] Remove "boom" from reindex service (elastic#58715)
  [data] Clean up QueryStringInput unit tests (elastic#58704)
  [SIEM] Detection Fix typo in Adobe Hijack Persistence rule (elastic#58804)
  Restores [SIEM][CASE] Init Configure Case Page (elastic#58121) (elastic#58924)
  Skips additional failing Ingest Manager integration tests
  Skips failing Ingest Manager integration tests
  Move dev tools styles to NP (elastic#58855)
  change to have kibana --ssl cli option use more recent certs (elastic#57933)
  disable failing suite (elastic#58942)
  Don't start pollEsNodesVersion unless someone subscribes (elastic#56923)
  Do not write UUID file during optimize process (elastic#58899)
  [Endpoint] Task/add nav bar (elastic#58604)
  [Metric Alerts] Add backend support for multiple expressions per alert  (elastic#58672)
  [Metrics Alerts] Fix alerting on a rate aggregation (elastic#58789)
  disable flaky suite (elastic#55953)
  Revert "[SIEM] apollo@3 (elastic#51926)" and "[SIEM][CASE] Init Confi… (elastic#58806)
  [resubmit] Prep agg types for new platform (elastic#58893)
  [Lens] Allow number formatting within Lens (elastic#56253)
  [Autocomplete] Use settings from config rather than UI settings (elastic#58784)
  Improve action and trigger types (elastic#58657)
  ...

# Conflicts:
#	x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature:Alerting Feature:Metrics UI Metrics UI feature release_note:skip Skip the PR/issue when compiling release notes Team:Infra Monitoring UI - DEPRECATED DEPRECATED - Label for the Infra Monitoring UI team. Use Team:obs-ux-infra_services v7.7.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Metric Alerts] Add backend support for multiple expressions per alert
4 participants