[Synthetics] quote monitor name to prevent invalid yaml #156210
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:
|
shahzad31
requested changes
May 3, 2023
…quote-monitor-name
…m/dominiqueclarke/kibana into fix/synthetics-quote-monitor-name
…quote-monitor-name
dominiqueclarke
commented
May 8, 2023
| @@ -54,7 +54,7 @@ export default function ({ getService }: FtrProviderContext) { | |||
| }); | |||
| }); | |||
|
|
|||
| it('project monitors - returns a failed monitor when creating integration fails', async () => { | |||
| it.skip('project monitors - returns a failed monitor when creating integration fails', async () => { | |||
There was a problem hiding this comment.
@shahzad31 Now that this bug is fixed, we can't use this for testing. Same below. Any suggestions on how to alternatively force an error?
shahzad31
reviewed
May 8, 2023
| @@ -19,12 +23,12 @@ export const httpFormatters: HTTPFormatMap = { | |||
| [ConfigKey.RESPONSE_BODY_INDEX]: null, | |||
|
@elasticmachine merge upstream |
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]Async chunks
Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
History
To update your PR or re-run it, just comment with: |
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
dominiqueclarke
added a commit
to dominiqueclarke/kibana
that referenced
this pull request
May 8, 2023
## Summary Appropriately quotes monitor names for synthetics integration policies, to ensure that customers can use monitor names that would otherwise break yaml. ### Testing 1. Create a private location 2. Save a monitor with name `[Synthetics] test` to that private location 3. Navigate to the agent policy for that location. Confirm that the integration policy was added to the agent policy, and that the name is correct --------- Co-authored-by: shahzad31 <shahzad31comp@gmail.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit a22561a)
dominiqueclarke
added a commit
that referenced
this pull request
May 8, 2023
… (#157087) # Backport This will backport the following commits from `main` to `8.8`: - [[Synthetics] quote monitor name to prevent invalid yaml (#156210)](#156210) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Dominique Clarke","email":"dominique.clarke@elastic.co"},"sourceCommit":{"committedDate":"2023-05-08T17:13:19Z","message":"[Synthetics] quote monitor name to prevent invalid yaml (#156210)\n\n## Summary\r\n\r\nAppropriately quotes monitor names for synthetics integration policies,\r\nto ensure that customers can use monitor names that would otherwise\r\nbreak yaml.\r\n\r\n### Testing\r\n1. Create a private location\r\n2. Save a monitor with name `[Synthetics] test` to that private location\r\n3. Navigate to the agent policy for that location. Confirm that the\r\nintegration policy was added to the agent policy, and that the name is\r\ncorrect\r\n\r\n---------\r\n\r\nCo-authored-by: shahzad31 <shahzad31comp@gmail.com>\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"a22561a524c73bab055e2a7eb7411cc36158c856","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","Team:uptime","release_note:skip","v8.8.0","v8.9.0"],"number":156210,"url":"https://github.com/elastic/kibana/pull/156210","mergeCommit":{"message":"[Synthetics] quote monitor name to prevent invalid yaml (#156210)\n\n## Summary\r\n\r\nAppropriately quotes monitor names for synthetics integration policies,\r\nto ensure that customers can use monitor names that would otherwise\r\nbreak yaml.\r\n\r\n### Testing\r\n1. Create a private location\r\n2. Save a monitor with name `[Synthetics] test` to that private location\r\n3. Navigate to the agent policy for that location. Confirm that the\r\nintegration policy was added to the agent policy, and that the name is\r\ncorrect\r\n\r\n---------\r\n\r\nCo-authored-by: shahzad31 <shahzad31comp@gmail.com>\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"a22561a524c73bab055e2a7eb7411cc36158c856"}},"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/156210","number":156210,"mergeCommit":{"message":"[Synthetics] quote monitor name to prevent invalid yaml (#156210)\n\n## Summary\r\n\r\nAppropriately quotes monitor names for synthetics integration policies,\r\nto ensure that customers can use monitor names that would otherwise\r\nbreak yaml.\r\n\r\n### Testing\r\n1. Create a private location\r\n2. Save a monitor with name `[Synthetics] test` to that private location\r\n3. Navigate to the agent policy for that location. Confirm that the\r\nintegration policy was added to the agent policy, and that the name is\r\ncorrect\r\n\r\n---------\r\n\r\nCo-authored-by: shahzad31 <shahzad31comp@gmail.com>\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"a22561a524c73bab055e2a7eb7411cc36158c856"}}]}] BACKPORT-->
shahzad31
added a commit
that referenced
this pull request
May 9, 2023
)" This reverts commit a22561a.
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
Appropriately quotes monitor names for synthetics integration policies, to ensure that customers can use monitor names that would otherwise break yaml.
Testing
[Synthetics] testto that private location