Disable sourcemap upload endpoint when data streams enabled#4735
Merged
jalvz merged 2 commits intoelastic:masterfrom Feb 16, 2021
Merged
Disable sourcemap upload endpoint when data streams enabled#4735jalvz merged 2 commits intoelastic:masterfrom
jalvz merged 2 commits intoelastic:masterfrom
Conversation
axw
requested changes
Feb 16, 2021
Member
axw
left a comment
There was a problem hiding this comment.
Nice catch.
Just one thing with the error message. Generally I'd like to minimise cognitive overhead for users by tailoring the error message to the running configuration.
beater/api/mux.go
Outdated
| "If you are not using the RUM agent, you can safely ignore this error." | ||
| enabled := cfg.RumConfig.IsEnabled() && cfg.RumConfig.SourceMapping.IsEnabled() | ||
| "If you are not using the RUM agent, you can safely ignore this error. " + | ||
| "If you are running APM Server managed by Fleet, you need to upload Sourcemaps directly to Elasticsearch." |
Member
There was a problem hiding this comment.
We know whether or not APM Server is managed by Fleet - can we change the error message based on that knowledge? Saves the user trying to figure out whether source maps are explicitly disabled, or implicitly because data streams are enabled.
Contributor
Author
There was a problem hiding this comment.
I was just being lazy... you got me
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Steps errors
Expand to view the steps failures
|
axw
pushed a commit
to axw/apm-server
that referenced
this pull request
Feb 20, 2021
axw
pushed a commit
to axw/apm-server
that referenced
this pull request
Feb 20, 2021
axw
added a commit
that referenced
this pull request
Feb 20, 2021
axw
added a commit
that referenced
this pull request
Feb 20, 2021
v1v
added a commit
to v1v/apm-server
that referenced
this pull request
Feb 22, 2021
…chemas-to-agents * upstream/master: (111 commits) Introduce metricset.name (elastic#4857) processor/otel: test service.version handling (elastic#4853) docs: Add PHP agent information to shared docs (elastic#4740) Script for faster development workflow (elastic#4731) Update to elastic/beats@1b31c26 (elastic#4763) backport: add 7.12 to .backportrc.json (elastic#4807) backport: enable auto-merge on backport PRs (elastic#4777) Support for Node.js profiles (elastic#4728) docs: readds .NET link (elastic#4764) [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746) ci: set proper parameters for the tar step (elastic#4696) docs: add 7.11.1 release notes (elastic#4727) Disable sourcemap upload endpoint when data streams enabled (elastic#4735) Add service name to dataset field (elastic#4674) Update to elastic/beats@ba423212a660 (elastic#4733) sampling: require a default policy (elastic#4729) processor/otel: add unit test for span status (elastic#4734) Add support for consuming OTLP/gRPC metrics (elastic#4722) [apmpackage] Add config options supported in ESS (elastic#4690) Use the apm-server version everywhere* (elastic#4725) ...
v1v
added a commit
to v1v/apm-server
that referenced
this pull request
Feb 22, 2021
…te-schema-json-1 * upstream/master: (111 commits) Introduce metricset.name (elastic#4857) processor/otel: test service.version handling (elastic#4853) docs: Add PHP agent information to shared docs (elastic#4740) Script for faster development workflow (elastic#4731) Update to elastic/beats@1b31c26 (elastic#4763) backport: add 7.12 to .backportrc.json (elastic#4807) backport: enable auto-merge on backport PRs (elastic#4777) Support for Node.js profiles (elastic#4728) docs: readds .NET link (elastic#4764) [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746) ci: set proper parameters for the tar step (elastic#4696) docs: add 7.11.1 release notes (elastic#4727) Disable sourcemap upload endpoint when data streams enabled (elastic#4735) Add service name to dataset field (elastic#4674) Update to elastic/beats@ba423212a660 (elastic#4733) sampling: require a default policy (elastic#4729) processor/otel: add unit test for span status (elastic#4734) Add support for consuming OTLP/gRPC metrics (elastic#4722) [apmpackage] Add config options supported in ESS (elastic#4690) Use the apm-server version everywhere* (elastic#4725) ...
Member
|
Confirmed with BC2: |
Member
|
Also confirmed that the old message is returned from a standalone APM Server when RUM is disabled: |
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
2 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.
Motivation/summary
If we don't do this, users will see a
202 - Acceptedresponse, but apm-server will fail to index sourcemaps due to lack of permissions.Checklist
How to test these changes
Run apm-server with data streams enabled and send a POST request to
http://localhost:8200/assets/v1/sourcemaps.The request should fail.