[7.12] Use the apm-server version everywhere* (#4725)#4822
Merged
axw merged 1 commit intoelastic:7.12from Feb 19, 2021
Merged
Conversation
* publish: parse version to set version_major Instead of hardcoding the major version, parse the full version. * beater: pass apm-server version into root handler Rather than returning the libbeat version from the root/healthcheck handler, inject the apm-server version so it can be returned. Also, in the integration tests use a hard-coded version "1.2.3", so we don't have to change approval files each time we bump the version. This should enable us to automate the version bump. # Conflicts: # beater/api/mux.go # beater/api/root/test_approved/integration/TestRootHandler_AuthorizationMiddleware/Authorized.approved.json # beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json # beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json # beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json # beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json # beater/test_approved_es_documents/TestPublishIntegrationProfileCPUProfile.approved.json # beater/test_approved_es_documents/TestPublishIntegrationProfileCPUProfileMetadata.approved.json # beater/test_approved_es_documents/TestPublishIntegrationProfileHeapProfile.approved.json # beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json # beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json # publish/pub.go
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Steps errors
Expand to view the steps failures
|
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
1 participant
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.
Backports the following commits to 7.12: