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

CloudWatch: Fix alerting for queries with Id (using GetMetricData) #17899

Merged
merged 1 commit into from Aug 5, 2019

Conversation

alex-berger
Copy link
Contributor

What this PR does / why we need it:

This commit addresses half of #13749 by making sure GetMetricData works for alerting. Math Expressions (compound metrics) will still not work for alerting, this would require a bigger refactoring of Grafana's alerting service. However, with this commit at least alerting for basic metrics with non empty query Id will work.

Which issue(s) this PR fixes:

Fixes half of #13749

Special notes for your reviewer:

@CLAassistant
Copy link

CLAassistant commented Jul 3, 2019

CLA assistant check
All committers have signed the CLA.

… works for alerting. Math Expressions (compound metrics) will still not work for alerting, this would require a bigger refactoring of Grafana's alerting service. However, with this commit at least alerting will work for basic metrics with non empty query Id.
@torkelo
Copy link
Member

torkelo commented Jul 3, 2019

@mtanda any change for a quick review?

@mtanda
Copy link
Collaborator

mtanda commented Jul 5, 2019

@alex-berger Thanks for trying to fix CloudWatch alerting.
I tested your change, and confirm it works!

@alex-berger
Copy link
Contributor Author

@torkelo is there any chance this PR could make it into 6.3.0?

@vanwho
Copy link

vanwho commented Jul 31, 2019

everyone would be ecstatic if so! please help bring us closer to escaping cloudwatch alerts

@marefr marefr changed the title CloudWatch: fix alerting for queries with Id (using GetMetricData) CloudWatch: Fix alerting for queries with Id (using GetMetricData) Aug 5, 2019
@marefr marefr merged commit 4e1e220 into grafana:master Aug 5, 2019
@marefr marefr added this to the 6.4 milestone Aug 5, 2019
@marefr
Copy link
Member

marefr commented Aug 5, 2019

Thank you for contributing to Grafana! This fix is targeted to be included in v6.4.

ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 6, 2019
* grafana/master: (40 commits)
  MSSQL: Change connectionstring to URL format to fix using passwords with semicolon (grafana#18384)
  CloudWatch: Fix alerting for queries with Id (using GetMetricData) (grafana#17899)
  Chore: Update strictNullChecks error limit (grafana#18387)
  Chore: Fixes some strict errors (grafana#18381)
  Graph: Improved graph tick decimals logic arround significant digits (grafana#18370)
  CI: Added metric to track strict null erros (grafana#18379)
  Auth: Do not search for the user twice (grafana#18366)
  grafana/toolkit: improve CI task (grafana#18189)
  Alerting: Also include configured AlertRuleTags in Webhooks  (grafana#18233)
  Loki: Apply start parameter to speed up test query (grafana#18266)
  Docs: Changelog 6.3.0 beta4 (grafana#18359)
  Select: Fixes issue where ToggleButtonGroup overlapped DataSourcePicker in Firefox (grafana#18361)
  SignIn: Update redirect on reroute (grafana#18360)
  Gauge/BarGauge: Support decimals for min/max toFloatOrUndefined (grafana#18368)
  FieldDisplay: Return field defaults when there are no data (grafana#18357)
  Auth: introduce more tests for middleware module (grafana#18365)
  Docs: updated latest.json (grafana#18363)
  LDAP: nitpicks (grafana#18309)
  Docs: mention unsupported versions of PostgreSQL (grafana#18307)
  Navigation: Fixed double settings menus (grafana#18349)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 6, 2019
* grafana/master:
  MSSQL: Change connectionstring to URL format to fix using passwords with semicolon (grafana#18384)
  CloudWatch: Fix alerting for queries with Id (using GetMetricData) (grafana#17899)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 6, 2019
* grafana/master: (49 commits)
  backend: null.Float NaN -> null for json marshal (grafana#18284)
  Frontend: adds folder name in home dash choose menu (grafana#18346)
  TestData: Query variable support (nested + glob queries)  (grafana#18413)
  Update latest.json (grafana#18417)
  docs: release 6.3 (grafana#18416)
  Changelog 6.3.0 (grafana#18414)
  PanelLinks: Fix render issue when there is no panel description (grafana#18408)
  e2e tests: Make pageObjects mandatory (grafana#18406)
  Documentation: document the "Mixed" Data Source (grafana#18398)
  Explore: Moves GraphSeriesXY and DisplayValue to grafana/data (grafana#18400)
  Explore: Fixes incorrect handling of utc in timeEpic (grafana#18386)
  Postgres: Add support for scram sha 256 authentication (grafana#18397)
  Update behind_proxy.md with linkback to nginx.com (grafana#18150)
  Do not set SameSite for OAuth cookie if cookie_samesite is None (grafana#18392)
  Gauge/BarGauge: Rewrite of how migrations are applied (grafana#18375)
  MSSQL: Change connectionstring to URL format to fix using passwords with semicolon (grafana#18384)
  CloudWatch: Fix alerting for queries with Id (using GetMetricData) (grafana#17899)
  Chore: Update strictNullChecks error limit (grafana#18387)
  Chore: Fixes some strict errors (grafana#18381)
  Graph: Improved graph tick decimals logic arround significant digits (grafana#18370)
  ...
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants