[Synthetics] adjust monitor status rule location logic #156432
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
dominiqueclarke
added
release_note:skip
|
Pinging @elastic/uptime (Team:uptime) |
shahzad31
reviewed
May 3, 2023
x-pack/plugins/synthetics/server/alert_rules/status_rule/status_rule_executor.ts
Outdated
Show resolved
Hide resolved
…s_rule_executor.ts
…com:dominiqueclarke/kibana into fix/synthetics-monitor-status-rule-location
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
History
To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
May 3, 2023
## Summary Resolves elastic#156223 In previous stack versions, the label was not saved to the saved object. This ensures that alerting works both for those early versions as well current versions, by adjusting the logic to consider both the location.label and location.id in alerting logic. ### Testing 1. Create a new oblt-cli cluster and connect to the synthetics service, locally or via the dev environment 2. Checkout v8.5.3 3. Create a monitor. Make sure it's down and wait for the first down check 4. Check out this branch 5. Navigate to Observabillity alerts. Ensure that an alert is generated for the monitor. You may have to wait a few minutes. --------- Co-authored-by: Shahzad <[email protected]> (cherry picked from commit 77cebee)
💚 All backports created successfully
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
May 3, 2023
#156546) # Backport This will backport the following commits from `main` to `8.8`: - [[Synthetics] adjust monitor status rule location logic (#156432)](#156432) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Dominique Clarke","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-05-03T13:41:19Z","message":"[Synthetics] adjust monitor status rule location logic (#156432)\n\n## Summary\r\n\r\nResolves https://github.com/elastic/kibana/issues/156223\r\n\r\nIn previous stack versions, the label was not saved to the saved object.\r\n\r\nThis ensures that alerting works both for those early versions as well\r\ncurrent versions, by adjusting the logic to consider both the\r\nlocation.label and location.id in alerting logic.\r\n\r\n### Testing\r\n\r\n1. Create a new oblt-cli cluster and connect to the synthetics service,\r\nlocally or via the dev environment\r\n2. Checkout v8.5.3\r\n3. Create a monitor. Make sure it's down and wait for the first down\r\ncheck\r\n4. Check out this branch\r\n5. Navigate to Observabillity alerts. Ensure that an alert is generated\r\nfor the monitor. You may have to wait a few minutes.\r\n\r\n---------\r\n\r\nCo-authored-by: Shahzad <[email protected]>","sha":"77cebee6f754d8bbd439008f8c8466bceebd54ac","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:uptime","release_note:skip","v8.8.0","v8.9.0"],"number":156432,"url":"https://github.com/elastic/kibana/pull/156432","mergeCommit":{"message":"[Synthetics] adjust monitor status rule location logic (#156432)\n\n## Summary\r\n\r\nResolves https://github.com/elastic/kibana/issues/156223\r\n\r\nIn previous stack versions, the label was not saved to the saved object.\r\n\r\nThis ensures that alerting works both for those early versions as well\r\ncurrent versions, by adjusting the logic to consider both the\r\nlocation.label and location.id in alerting logic.\r\n\r\n### Testing\r\n\r\n1. Create a new oblt-cli cluster and connect to the synthetics service,\r\nlocally or via the dev environment\r\n2. Checkout v8.5.3\r\n3. Create a monitor. Make sure it's down and wait for the first down\r\ncheck\r\n4. Check out this branch\r\n5. Navigate to Observabillity alerts. Ensure that an alert is generated\r\nfor the monitor. You may have to wait a few minutes.\r\n\r\n---------\r\n\r\nCo-authored-by: Shahzad <[email protected]>","sha":"77cebee6f754d8bbd439008f8c8466bceebd54ac"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/156432","number":156432,"mergeCommit":{"message":"[Synthetics] adjust monitor status rule location logic (#156432)\n\n## Summary\r\n\r\nResolves https://github.com/elastic/kibana/issues/156223\r\n\r\nIn previous stack versions, the label was not saved to the saved object.\r\n\r\nThis ensures that alerting works both for those early versions as well\r\ncurrent versions, by adjusting the logic to consider both the\r\nlocation.label and location.id in alerting logic.\r\n\r\n### Testing\r\n\r\n1. Create a new oblt-cli cluster and connect to the synthetics service,\r\nlocally or via the dev environment\r\n2. Checkout v8.5.3\r\n3. Create a monitor. Make sure it's down and wait for the first down\r\ncheck\r\n4. Check out this branch\r\n5. Navigate to Observabillity alerts. Ensure that an alert is generated\r\nfor the monitor. You may have to wait a few minutes.\r\n\r\n---------\r\n\r\nCo-authored-by: Shahzad <[email protected]>","sha":"77cebee6f754d8bbd439008f8c8466bceebd54ac"}}]}] BACKPORT--> Co-authored-by: Dominique Clarke <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Resolves #156223
In previous stack versions, the label was not saved to the saved object.
This ensures that alerting works both for those early versions as well current versions, by adjusting the logic to consider both the location.label and location.id in alerting logic.
Testing