Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure APM agent config file path respects CWD #52880

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Conversation

watson
Copy link
Contributor

@watson watson commented Dec 12, 2019

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.js file, 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 strikethroughs to 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 accessibility

For maintainers

@watson watson added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.6.0 labels Dec 12, 2019
@watson watson self-assigned this Dec 12, 2019
Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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. 👍

@watson
Copy link
Contributor Author

watson commented Dec 12, 2019

@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.

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@watson watson merged commit 0279eb7 into elastic:master Dec 12, 2019
@watson watson deleted the apm-fix2 branch December 12, 2019 15:05
watson added a commit to watson/kibana that referenced this pull request Dec 12, 2019
timductive pushed a commit to timductive/kibana that referenced this pull request Dec 16, 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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes v7.6.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants