[RAM] Fix snooze scheduler timezone handling #157338
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
# Conflicts: # x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx
|
Pinging @elastic/response-ops (Team:ResponseOps) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
💚 Build Succeeded
Metrics [docs]Async chunks
Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
To update your PR or re-run it, just comment with: |
JiaweiWu
approved these changes
May 16, 2023
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
Zacqary
added a commit
to Zacqary/kibana
that referenced
this pull request
May 17, 2023
## Summary Closes elastic#156535 The Snooze Scheduler was failing to properly save and load snoozes if the user selected a timezone other than the Kibana default. This is because the datepicker only converts timestamp values between UTC and the default Kibana timezone. This PR fixes the issue by offsetting all dates that come in and out of the scheduler UI relative to local time. To test, create a snooze like this on `main` and make sure you select timezone America/Los_Angeles. (If your local timezone is equivalent to America/Los_Angeles, select a different timezone) <img width="426" alt="Screenshot 2023-05-10 at 3 58 57 PM" src="https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d"> On `main`, editing the snooze will (erroneously) display the wrong times: <img width="423" alt="Screenshot 2023-05-10 at 4 03 24 PM" src="https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64"> Repeating this process on this PR's branch will save a snooze with the correct `dtstart` and consequently load the correct snooze time. (cherry picked from commit 213a697)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
May 17, 2023
## Summary Closes elastic#156535 The Snooze Scheduler was failing to properly save and load snoozes if the user selected a timezone other than the Kibana default. This is because the datepicker only converts timestamp values between UTC and the default Kibana timezone. This PR fixes the issue by offsetting all dates that come in and out of the scheduler UI relative to local time. To test, create a snooze like this on `main` and make sure you select timezone America/Los_Angeles. (If your local timezone is equivalent to America/Los_Angeles, select a different timezone) <img width="426" alt="Screenshot 2023-05-10 at 3 58 57 PM" src="https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d"> On `main`, editing the snooze will (erroneously) display the wrong times: <img width="423" alt="Screenshot 2023-05-10 at 4 03 24 PM" src="https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64"> Repeating this process on this PR's branch will save a snooze with the correct `dtstart` and consequently load the correct snooze time. (cherry picked from commit 213a697)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
Zacqary
added a commit
that referenced
this pull request
May 17, 2023
# Backport This will backport the following commits from `main` to `8.8`: - [[RAM] Fix snooze scheduler timezone handling (#157338)](#157338) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Zacqary Adam Xeper","email":"Zacqary@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-05-17T16:41:04Z","message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:ResponseOps","Feature:Alerting/RulesManagement","v8.8.0","v8.9.0"],"number":157338,"url":"https://github.com/elastic/kibana/pull/157338","mergeCommit":{"message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8"}},"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/157338","number":157338,"mergeCommit":{"message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8"}}]}] BACKPORT-->
kibanamachine
added a commit
that referenced
this pull request
May 17, 2023
# Backport This will backport the following commits from `main` to `8.8`: - [[RAM] Fix snooze scheduler timezone handling (#157338)](#157338) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Zacqary Adam Xeper","email":"Zacqary@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-05-17T16:41:04Z","message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:ResponseOps","Feature:Alerting/RulesManagement","v8.9.0","v8.8.1"],"number":157338,"url":"https://github.com/elastic/kibana/pull/157338","mergeCommit":{"message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/157338","number":157338,"mergeCommit":{"message":"[RAM] Fix snooze scheduler timezone handling (#157338)\n\n## Summary\r\n\r\nCloses #156535 \r\n\r\nThe Snooze Scheduler was failing to properly save and load snoozes if\r\nthe user selected a timezone other than the Kibana default. This is\r\nbecause the datepicker only converts timestamp values between UTC and\r\nthe default Kibana timezone.\r\n\r\nThis PR fixes the issue by offsetting all dates that come in and out of\r\nthe scheduler UI relative to local time.\r\n\r\nTo test, create a snooze like this on `main` and make sure you select\r\ntimezone America/Los_Angeles. (If your local timezone is equivalent to\r\nAmerica/Los_Angeles, select a different timezone)\r\n\r\n<img width=\"426\" alt=\"Screenshot 2023-05-10 at 3 58 57 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ab95c47c-30a0-44d5-bd9d-45fdb929193d\">\r\n\r\nOn `main`, editing the snooze will (erroneously) display the wrong\r\ntimes:\r\n\r\n<img width=\"423\" alt=\"Screenshot 2023-05-10 at 4 03 24 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/1445834/ff28ccdd-f491-43ce-87cd-d606c8d71c64\">\r\n\r\nRepeating this process on this PR's branch will save a snooze with the\r\ncorrect `dtstart` and consequently load the correct snooze time.","sha":"213a69739f89bde0fefab284618968a77d1798b8"}},{"branch":"8.8","label":"v8.8.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
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
Closes #156535
The Snooze Scheduler was failing to properly save and load snoozes if the user selected a timezone other than the Kibana default. This is because the datepicker only converts timestamp values between UTC and the default Kibana timezone.
This PR fixes the issue by offsetting all dates that come in and out of the scheduler UI relative to local time.
To test, create a snooze like this on
mainand make sure you select timezone America/Los_Angeles. (If your local timezone is equivalent to America/Los_Angeles, select a different timezone)On
main, editing the snooze will (erroneously) display the wrong times:Repeating this process on this PR's branch will save a snooze with the correct
dtstartand consequently load the correct snooze time.