Skip to content

Commit

Permalink
[8.6] [APM] Add title in apm settings callout (#145857) (#145915)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.6`:
- [[APM] Add title in apm settings callout
(#145857)](#145857)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Katerina
Patticha","email":"aikaterini.patticha@elastic.co"},"sourceCommit":{"committedDate":"2022-11-21T18:40:38Z","message":"[APM]
Add title in apm settings callout (#145857)\n\n## Summary\r\ncloses
https://github.com/elastic/kibana/issues/145849\r\n\r\nBefore\r\n\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203056193-9e68694e-5492-40eb-9d4f-f44fe8b1fb48.png)\r\n\r\nAfter\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203059940-b24af7bd-a19b-492f-bdcb-ec06e3dc24b5.png)","sha":"40de9eb5e7c13b0c3596a37ee0c1d105dc6148ab","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:APM","release_note:skip","v8.6.0","v8.7.0"],"number":145857,"url":"https://github.com/elastic/kibana/pull/145857","mergeCommit":{"message":"[APM]
Add title in apm settings callout (#145857)\n\n## Summary\r\ncloses
https://github.com/elastic/kibana/issues/145849\r\n\r\nBefore\r\n\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203056193-9e68694e-5492-40eb-9d4f-f44fe8b1fb48.png)\r\n\r\nAfter\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203059940-b24af7bd-a19b-492f-bdcb-ec06e3dc24b5.png)","sha":"40de9eb5e7c13b0c3596a37ee0c1d105dc6148ab"}},"sourceBranch":"main","suggestedTargetBranches":["8.6"],"targetPullRequestStates":[{"branch":"8.6","label":"v8.6.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/145857","number":145857,"mergeCommit":{"message":"[APM]
Add title in apm settings callout (#145857)\n\n## Summary\r\ncloses
https://github.com/elastic/kibana/issues/145849\r\n\r\nBefore\r\n\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203056193-9e68694e-5492-40eb-9d4f-f44fe8b1fb48.png)\r\n\r\nAfter\r\n\r\n![image](https://user-images.githubusercontent.com/3369346/203059940-b24af7bd-a19b-492f-bdcb-ec06e3dc24b5.png)","sha":"40de9eb5e7c13b0c3596a37ee0c1d105dc6148ab"}}]}]
BACKPORT-->

Co-authored-by: Katerina Patticha <aikaterini.patticha@elastic.co>
  • Loading branch information
kibanamachine and kpatticha authored Nov 21, 2022
1 parent 50e50f0 commit ba53e78
Showing 1 changed file with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ export function GeneralSettings() {
return (
<>
<EuiCallOut
title={
title={i18n.translate('xpack.apm.apmSettings.callOutTitle', {
defaultMessage: 'Looking for all settings?',
})}
iconType="search"
>
<p>
<FormattedMessage
id="xpack.apm.apmSettings.kibanaLink"
defaultMessage="The full list of APM options can be found in {link}"
Expand All @@ -82,15 +87,14 @@ export function GeneralSettings() {
})}
>
{i18n.translate('xpack.apm.apmSettings.kibanaLink.label', {
defaultMessage: 'Kibana advanced settings',
defaultMessage: 'Kibana advanced settings.',
})}
</EuiLink>
),
}}
/>
}
iconType="iInCircle"
/>
</p>
</EuiCallOut>
<EuiSpacer />
{apmSettingsKeys.map((settingKey) => {
const editableConfig = settingsEditableConfig[settingKey];
Expand Down

0 comments on commit ba53e78

Please sign in to comment.