Skip to content

Commit

Permalink
Rename apm path in .i18nrc.json into apmOss and revert some imports p…
Browse files Browse the repository at this point in the history
…aths
  • Loading branch information
DianaDerevyankina committed May 18, 2020
1 parent d85152f commit 11c4a2c
Show file tree
Hide file tree
Showing 14 changed files with 348 additions and 347 deletions.
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"visTypeXy": "src/plugins/vis_type_xy",
"visualizations": "src/plugins/visualizations",
"visualize": "src/plugins/visualize",
"apm": "src/plugins/apm_oss"
"apmOss": "src/plugins/apm_oss"
},
"exclude": [
"src/legacy/ui/ui_render/ui_render_mixin.js"
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/apm_oss/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ export function plugin() {
return new ApmOssPlugin();
}
export { ApmOssPluginSetup, ApmOssPluginStart } from './types';

export { APM_STATIC_INDEX_PATTERN_ID } from '../common/index_pattern_constants';
28 changes: 14 additions & 14 deletions src/plugins/apm_oss/server/tutorial/envs/on_prem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ export function onPremInstructions({
return {
instructionSets: [
{
title: i18n.translate('apm.tutorial.apmServer.title', {
title: i18n.translate('apmOss.tutorial.apmServer.title', {
defaultMessage: 'APM Server',
}),
callOut: {
title: i18n.translate('apm.tutorial.apmServer.callOut.title', {
title: i18n.translate('apmOss.tutorial.apmServer.callOut.title', {
defaultMessage: 'Important: Updating to 7.0 or higher',
}),
message: i18n.translate('apm.tutorial.apmServer.callOut.message', {
message: i18n.translate('apmOss.tutorial.apmServer.callOut.message', {
defaultMessage: `Please make sure your APM Server is updated to 7.0 or higher. \
You can also migrate your 6.x data with the migration assistant found in Kibana's management section.`,
}),
Expand All @@ -92,20 +92,20 @@ export function onPremInstructions({
},
],
statusCheck: {
title: i18n.translate('apm.tutorial.apmServer.statusCheck.title', {
title: i18n.translate('apmOss.tutorial.apmServer.statusCheck.title', {
defaultMessage: 'APM Server status',
}),
text: i18n.translate('apm.tutorial.apmServer.statusCheck.text', {
text: i18n.translate('apmOss.tutorial.apmServer.statusCheck.text', {
defaultMessage:
'Make sure APM Server is running before you start implementing the APM agents.',
}),
btnLabel: i18n.translate('apm.tutorial.apmServer.statusCheck.btnLabel', {
btnLabel: i18n.translate('apmOss.tutorial.apmServer.statusCheck.btnLabel', {
defaultMessage: 'Check APM Server status',
}),
success: i18n.translate('apm.tutorial.apmServer.statusCheck.successMessage', {
success: i18n.translate('apmOss.tutorial.apmServer.statusCheck.successMessage', {
defaultMessage: 'You have correctly setup APM Server',
}),
error: i18n.translate('apm.tutorial.apmServer.statusCheck.errorMessage', {
error: i18n.translate('apmOss.tutorial.apmServer.statusCheck.errorMessage', {
defaultMessage:
'No APM Server detected. Please make sure it is running and you have updated to 7.0 or higher.',
}),
Expand All @@ -123,7 +123,7 @@ export function onPremInstructions({
},
},
{
title: i18n.translate('apm.tutorial.apmAgents.title', {
title: i18n.translate('apmOss.tutorial.apmAgents.title', {
defaultMessage: 'APM Agents',
}),
instructionVariants: [
Expand Down Expand Up @@ -165,20 +165,20 @@ export function onPremInstructions({
},
],
statusCheck: {
title: i18n.translate('apm.tutorial.apmAgents.statusCheck.title', {
title: i18n.translate('apmOss.tutorial.apmAgents.statusCheck.title', {
defaultMessage: 'Agent status',
}),
text: i18n.translate('apm.tutorial.apmAgents.statusCheck.text', {
text: i18n.translate('apmOss.tutorial.apmAgents.statusCheck.text', {
defaultMessage:
'Make sure your application is running and the agents are sending data.',
}),
btnLabel: i18n.translate('apm.tutorial.apmAgents.statusCheck.btnLabel', {
btnLabel: i18n.translate('apmOss.tutorial.apmAgents.statusCheck.btnLabel', {
defaultMessage: 'Check agent status',
}),
success: i18n.translate('apm.tutorial.apmAgents.statusCheck.successMessage', {
success: i18n.translate('apmOss.tutorial.apmAgents.statusCheck.successMessage', {
defaultMessage: 'Data successfully received from one or more agents',
}),
error: i18n.translate('apm.tutorial.apmAgents.statusCheck.errorMessage', {
error: i18n.translate('apmOss.tutorial.apmAgents.statusCheck.errorMessage', {
defaultMessage: 'No data has been received from agents yet',
}),
esHitsCheck: {
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/apm_oss/server/tutorial/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import apmIndexPattern from './index_pattern.json';
import { ArtifactsSchema, TutorialsCategory } from '../../../../../src/plugins/home/server';
import { APM_STATIC_INDEX_PATTERN_ID } from '../../common/index_pattern_constants';

const apmIntro = i18n.translate('apm.tutorial.introduction', {
const apmIntro = i18n.translate('apmOss.tutorial.introduction', {
defaultMessage: 'Collect in-depth performance metrics and errors from inside your applications.',
});

Expand Down Expand Up @@ -55,7 +55,7 @@ export const tutorialProvider = ({
dashboards: [
{
id: '8d3ed660-7828-11e7-8c47-65b845b5cfb3',
linkLabel: i18n.translate('apm.tutorial.specProvider.artifacts.dashboards.linkLabel', {
linkLabel: i18n.translate('apmOss.tutorial.specProvider.artifacts.dashboards.linkLabel', {
defaultMessage: 'APM dashboard',
}),
isOverview: true,
Expand All @@ -65,12 +65,12 @@ export const tutorialProvider = ({

return {
id: 'apm',
name: i18n.translate('apm.tutorial.specProvider.name', {
name: i18n.translate('apmOss.tutorial.specProvider.name', {
defaultMessage: 'APM',
}),
category: TutorialsCategory.OTHER,
shortDescription: apmIntro,
longDescription: i18n.translate('apm.tutorial.specProvider.longDescription', {
longDescription: i18n.translate('apmOss.tutorial.specProvider.longDescription', {
defaultMessage:
'Application Performance Monitoring (APM) collects in-depth \
performance metrics and errors from inside your application. \
Expand All @@ -86,7 +86,7 @@ It allows you to monitor the performance of thousands of applications in real ti
onPrem: onPremInstructions(indices),
previewImagePath: '/plugins/apmOss/assets/apm.png',
savedObjects,
savedObjectsInstallMsg: i18n.translate('apm.tutorial.specProvider.savedObjectsInstallMsg', {
savedObjectsInstallMsg: i18n.translate('apmOss.tutorial.specProvider.savedObjectsInstallMsg', {
defaultMessage: 'An APM index pattern is required for some features in the APM UI.',
}),
};
Expand Down
Loading

0 comments on commit 11c4a2c

Please sign in to comment.