[Uptime] [Synthetics integration] Ensure that proxy url is not overwritten#99944
Merged
dominiqueclarke merged 1 commit intoelastic:masterfrom May 13, 2021
Conversation
Contributor
|
Pinging @elastic/uptime (Team:uptime) |
Contributor
💚 Build SucceededMetrics [docs]Async chunks
Unknown metric groupsReferences to deprecated APIs
To update your PR or re-run it, just comment with: |
justinkambic
approved these changes
May 13, 2021
Contributor
justinkambic
left a comment
There was a problem hiding this comment.
I pulled this down and tested vs. master and the proxy was populated by the fix branch.
LGTM!
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
May 13, 2021
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
May 13, 2021
Contributor
gmmorris
added a commit
to chrisronline/kibana
that referenced
this pull request
May 14, 2021
* master: (27 commits) Disable contextMenu when event is not event.kind=event (elastic#100027) Updates the monorepo-packages list (elastic#100096) Removes circular deps for lists in tooling and bumps down byte limit for lists (elastic#100082) [Security Solutions] Breaks down the io-ts packages to decrease plugin size (elastic#100058) fix-typo: Use of `than` instead of `then` (elastic#100030) [Fleet] Fix error when searching for keys whose names have spaces (elastic#100056) [Workplace Search] Fix bug when transitioning to personal dashboard (elastic#100061) [index pattern field editor] Update runtime field painless docs url (elastic#100014) [QA] Switch tests to use importExport - visualize (elastic#98063) [Canvas] Remove unused legacy autocomplete component (elastic#99215) Re-enable formerly flaky shareable test (elastic#98826) [Uptime] [Synthetics Integration] ensure that proxy url is not overwritten (elastic#99944) [Security Solutions][Lists] Trims down list plugin size by breaking out the exception builder into chunks by using react lazy loading (elastic#99989) [Uptime] Increase debounce and add immediate submit to `useQueryBar` (elastic#99675) chore(NA): moving @kbn/docs-utils into bazel (elastic#100051) [Enterprise Search] Fix SchemaFieldTypeSelect axe issues (elastic#100035) Remove outdated comment about schema validation not working (it does work now). (elastic#100055) Rename alert status OK to Recovered and fix some UX issues around disabling a rule while being in an error state (elastic#98135) [Fleet] Do not use async method in plugin setup|start (elastic#100033) Skip flaky functional test suite ...
yctercero
pushed a commit
to yctercero/kibana
that referenced
this pull request
May 25, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Fixes #99907
This fix ensures that proxy_url is properly applied to the outputted Synthetics policy.
All the fields names for the synthetics integration are mapped to their eventual name in the package policy. These values are stored in a central object with each field name as a key. This central object is created by combining objects from various contexts, including the
HTTPAdvancedFieldsand theTCPAdvancedFieldscontexts, among others. We then map over this object to build out the integration policy object.The problem comes in when field names from these contexts are shared, causing one to potentially overwrite the other. In this case,
proxy_urlexists as a field both withinHTTPAdvancedFieldsandTCPAdvancedFields.This PR provides a fix by separating out the proxy url value when building the central config object, and ensure that it's mapped to the proper value based on monitor type.
This issue I believe highlights a larger issue of managing the config centrally. In the future, a refactor should be considered to allow managing separate config objects for each of the monitor types, preventing overlap.