[APM] APM-Fleet integration version check & upgrade message #115297
Merged
Conversation
This file contains 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
ogupte
added
release_note:enhancement
auto-backport
|
Pinging @elastic/apm-ui (Team:apm) |
|
@elasticmachine merge upstream |
|
@elasticmachine merge upstream |
cauemarcondes
approved these changes
Oct 18, 2021
Comment on lines
286
to
375
| function SuccessfulMigrationCard() { | ||
| return ( | ||
| <EuiCard | ||
| icon={<EuiIcon size="xxl" type="checkInCircleFilled" color="success" />} | ||
| title={i18n.translate('xpack.apm.settings.schema.success.title', { | ||
| defaultMessage: 'Elastic Agent successfully setup!', | ||
| })} | ||
| description={i18n.translate( | ||
| 'xpack.apm.settings.schema.success.description', | ||
| { | ||
| defaultMessage: | ||
| 'Your APM integration is now setup and ready to receive data from your currently instrumented agents. Feel free to review the policies applied to your integtration.', | ||
| } | ||
| )} | ||
| footer={<CardFooter />} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| function UpgradeAvailableCard({ | ||
| apmPackagePolicyId, | ||
| }: { | ||
| apmPackagePolicyId: string | undefined; | ||
| }) { | ||
| const upgradeApmPackagePolicyHref = | ||
| useUpgradeApmPackagePolicyHref(apmPackagePolicyId); | ||
|
|
||
| return ( | ||
| <EuiCard | ||
| icon={<EuiIcon size="xxl" type="alert" color="warning" />} | ||
| title={i18n.translate( | ||
| 'xpack.apm.settings.schema.upgradeAvailable.title', | ||
| { | ||
| defaultMessage: 'APM integration upgrade available!', | ||
| } | ||
| )} | ||
| description={ | ||
| <FormattedMessage | ||
| id="xpack.apm.settings.upgradeAvailable.description" | ||
| defaultMessage="Although your APM integration is setup, a new version of the APM integration is available for upgrade with your fleet policy. {upgradePackagePolicyLink} to get the most out your setup!" | ||
| values={{ | ||
| upgradePackagePolicyLink: ( | ||
| <EuiLink href={upgradeApmPackagePolicyHref}> | ||
| {i18n.translate( | ||
| 'xpack.apm.settings.schema.upgradeAvailable.upgradePackagePolicyLink', | ||
| { defaultMessage: 'Upgrade your APM integration' } | ||
| )} | ||
| </EuiLink> | ||
| ), | ||
| }} | ||
| /> | ||
| } | ||
| footer={<CardFooter />} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| function CardFooter() { | ||
| const fleetCloudAgentPolicyHref = useFleetCloudAgentPolicyHref(); | ||
|
|
||
| return ( | ||
| <div> | ||
| <EuiButton href={fleetCloudAgentPolicyHref}> | ||
| {i18n.translate( | ||
| 'xpack.apm.settings.schema.success.viewIntegrationInFleet.buttonText', | ||
| { defaultMessage: 'View the APM integration in Fleet' } | ||
| )} | ||
| </EuiButton> | ||
| <EuiSpacer size="xs" /> | ||
| <EuiText size="s"> | ||
| <p> | ||
| <FormattedMessage | ||
| id="xpack.apm.settings.schema.success.returnText" | ||
| defaultMessage="or simply return to the {serviceInventoryLink}." | ||
| values={{ | ||
| serviceInventoryLink: ( | ||
| <APMLink path="/services"> | ||
| {i18n.translate( | ||
| 'xpack.apm.settings.schema.success.returnText.serviceInventoryLink', | ||
| { defaultMessage: 'Service inventory' } | ||
| )} | ||
| </APMLink> | ||
| ), | ||
| }} | ||
| /> | ||
| </p> | ||
| </EuiText> | ||
| </div> | ||
| ); | ||
| } |
There was a problem hiding this comment.
Maybe you could break this file down by creating separate components for these components?
| @@ -189,13 +191,34 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({ | |||
| }, | |||
| }); | |||
|
|
|||
| const devRoute = createApmServerRoute({ | |||
| endpoint: 'GET /internal/apm/fleet/dev', | |||
There was a problem hiding this comment.
By reading the endpoint internal/apm/fleet/dev, doesn't say much about what it will return. Maybe you could improve its name?
There was a problem hiding this comment.
oh whoops i was suppose to take this one out. it was just for my own development/testing
|
@elasticmachine merge upstream |
sorenlouv
reviewed
Oct 18, 2021
| @@ -92,7 +92,7 @@ const fleetAgentsRoute = createApmServerRoute({ | |||
| }); | |||
|
|
|||
| const saveApmServerSchemaRoute = createApmServerRoute({ | |||
| endpoint: 'POST /internal/apm/fleet/apm_server_schema', | |||
| endpoint: 'POST /api/apm/fleet/apm_server_schema', | |||
There was a problem hiding this comment.
Good call. This should be considered public
sorenlouv
approved these changes
Oct 18, 2021
💚 Build SucceededMetrics [docs]Module Count
Async chunks
History
To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 19, 2021
💚 Backport successful
This backport PR will be merged automatically after passing CI. |
kibanamachine
added a commit
that referenced
this pull request
Oct 19, 2021
…#115484) Co-authored-by: Oliver Gupte <[email protected]>
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.
Closes #111829.
Looks up the current APM package policy version associated with the cloud agent policy and checks it against the latest supported stack version defined in the APM UI. If there's a new version is supported, it shows the user an alternate card to with a prompt to upgrade to the latest version.