Ensure APM agent config file path respects CWD#52880
Merged
watson merged 1 commit intoelastic:masterfrom Dec 12, 2019
Merged
Conversation
vigneshshanmugam
approved these changes
Dec 12, 2019
Member
vigneshshanmugam
left a comment
There was a problem hiding this comment.
Do we need this change since already changed this behaviour with the RUM PR? https://github.com/elastic/kibana/pull/44281/files#diff-814dededa10718c19854c89d2c560f80R36
Approving this PR since we don't want to have a breaking behaviour till we land the other one. 👍
Contributor
Author
|
@vigneshshanmugam If #44281 was merged already then no, we wouldn't need this PR. But this is currently breaking when they try to install a snapshot of 7.x in Cloud, which is why I wanted to get this in ASAP. I know this is going to cause merge conflicts for your PR, sorry about that. |
Contributor
💚 Build SucceededTo update your PR or re-run it, just comment with: |
watson
added a commit
to watson/kibana
that referenced
this pull request
Dec 12, 2019
watson
added a commit
that referenced
this pull request
Dec 12, 2019
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Dec 30, 2019
…aved-objects * upstream/master: (134 commits) [Dashboard] Add visualization from dasbhoard empty screen (elastic#52670) Print out agent debugging links during CI (elastic#52812) Add babel-plugin-styled-components to webpack config (elastic#52862) [Console] Fix load from remote (elastic#52814) Ensure APM agent config file path respects CWD (elastic#52880) [Watcher] Removed overwritten property (elastic#49998) [Data Plugin]: Remove `export *` for common code from public/server index files (elastic#52821) Hide stderr git output during APM agent configuration (elastic#52878) Polish migration.md (elastic#52764) Change ajax_stream to use new-line delimited JSON (elastic#52797) Stabilize dashboard save modal functional test (elastic#52761) [Discover] Place tooltip at bottom of filter button (elastic#52720) Disable/enable filter with click+shift on a filter badge (elastic#52751) [APM] Make client-side routes static (elastic#52574) [Maps] Get basic structure of NP client shim in place (elastic#52551) update chromedriver to 79 (elastic#52784) [DOCS] Adds example of assigning roles in Reporting (elastic#52757) Add instructions for setting up remote clusters needed for CCS and CCR (elastic#52796) [docs] max-old-space-size (elastic#52310) [Monitoring] Fix 7.5 cloud test issues (elastic#51781) ...
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
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
If you started Kibana from a different working directory than the root of the Kibana folder, it would not be able to load the
config/apm.jsfile, which in turn would result in the APM agent using the default config options instead of the config options from the config file.This would mean that it would be activated by default trying to send APM data to localhost:8200, which normally doesn't exist, which in turn would mean a lot of log messages complaining about this.
Checklist
Use
strikethroughsto remove checklist items you don't feel are applicable to this PR.- [ ] This was checked for cross-browser compatibility, including a check against IE11- [ ] Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support- [ ] Documentation was added for features that require explanation or tutorials- [ ] Unit or functional tests were updated or added to match the most common scenarios- [ ] This was checked for keyboard-only and screenreader accessibilityFor maintainers
- [ ] This includes a feature addition or change that requires a release note and was labeled appropriately