Skip to content

Commit

Permalink
Edit text strings for Ingest Manager Overview and Add data pages (#74818
Browse files Browse the repository at this point in the history
) (#75514)

* Edit Ingest Manager text strings in Overview and Add Data pages

* Add fixes from review

* remove blank line

* Change configurations to policies

* Remove "configuration" from text

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
dedemorton and elasticmachine authored Aug 20, 2020
1 parent 8df6abb commit 3c27f55
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.feedbackText"
defaultMessage="We encourage you to read our {docsLink} or to ask questions and send feedback in our {forumLink}."
defaultMessage="Read our {docsLink} or go to our {forumLink} for questions or feedback."
values={{
docsLink: (
<EuiLink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ systemctl start elastic-agent`;
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.descriptionText"
defaultMessage="From the agent’s directory, run the appropriate commands to enroll and start an Elastic Agent. You can reuse these commands to setup agents on more than one machine. Be sure to run the enrollment steps as a user with Administrator privilege on the system."
defaultMessage="From the agent directory, run these commands to enroll and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
/>
</EuiText>
<EuiSpacer size="l" />
Expand Down Expand Up @@ -83,19 +83,19 @@ systemctl start elastic-agent`;
</h4>
</EuiTitle>
<EuiSpacer size="s" />
<EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
<CommandCode>{macOsLinuxTarCommand}</CommandCode>
</EuiCodeBlock>
<EuiSpacer size="s" />
<EuiText color="subdued" size="s">
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.macLinuxTarInstructions"
defaultMessage="You will need to run {command} if the agent’s system reboots."
defaultMessage="The {command} command runs the agent in the foreground. If the agent's host reboots, you'll need to run the command again."
values={{
command: <EuiCode>./elastic-agent run</EuiCode>,
}}
/>
</EuiText>
<EuiSpacer size="s" />
<EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
<CommandCode>{macOsLinuxTarCommand}</CommandCode>
</EuiCodeBlock>
</>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
id: 'disabled',
disabled: true,
label: i18n.translate('xpack.ingestManager.settings.autoUpgradeDisabledLabel', {
defaultMessage: 'Manually manage agent binary versions. Requires Gold license.',
defaultMessage:
'Manually manage agent binary versions. Requires a Gold subscription.',
}),
},
]}
Expand Down Expand Up @@ -167,7 +168,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
{
defaultMessage:
'Automatically update integrations to the latest version to receive the latest assets. Agent policies may need to be updated in order to use new features.',
'Automatically update integrations to the latest version to get the latest assets. You might need to update agent policies to use new features.',
}
),
},
Expand Down Expand Up @@ -210,7 +211,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiText color="subdued" size="s">
<FormattedMessage
id="xpack.ingestManager.settings.globalOutputDescription"
defaultMessage="The global output is applied to all agent policies and specifies where data is sent."
defaultMessage="Specify where to send data. These settings are applied to all Elastic Agent policies."
/>
</EuiText>
<EuiSpacer size="m" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
>
<FormattedMessage
id="xpack.ingestManager.appNavigation.sendFeedbackButton"
defaultMessage="Send Feedback"
defaultMessage="Send feedback"
/>
</EuiButtonEmpty>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiTab isSelected={mode === 'managed'} onClick={() => setMode('managed')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.enrollFleetTabLabel"
defaultMessage="Enroll with Fleet"
defaultMessage="Enroll in Fleet"
/>
</EuiTab>
<EuiTab isSelected={mode === 'standalone'} onClick={() => setMode('standalone')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel"
defaultMessage="Standalone mode"
defaultMessage="Run standalone"
/>
</EuiTab>
</EuiTabs>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.managedDescription"
defaultMessage="Whether you need one agent or thousands, Fleet makes it easy to centrally manage and deploy updates to your agents. Follow the instructions below to download and enroll an Elastic Agent with Fleet."
defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
/>
</EuiText>
<EuiSpacer size="l" />
Expand All @@ -72,7 +72,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
<>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
defaultMessage="Fleet needs to be set up before agents can be enrolled. {link}"
defaultMessage="Before enrolling agents, set up Fleet. {link}"
values={{
link: (
<EuiLink href={getHref('fleet')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription"
defaultMessage="Copy this policy and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the policy file so that it uses your actual Elasticsearch credentials."
defaultMessage="Copy this policy to the {fileName} on the host where the Elastic Agent is installed. Modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of {fileName} to use your Elasticsearch credentials."
values={{
fileName: <EuiCode>elastic-agent.yml</EuiCode>,
ESUsernameVariable: <EuiCode>ES_USERNAME</EuiCode>,
Expand Down Expand Up @@ -129,7 +129,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepRunAgentDescription"
defaultMessage="From the agent’s directory, run the following command to start the agent."
defaultMessage="From the agent directory, run these commands to enroll and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
/>
<EuiSpacer size="m" />
<EuiCodeBlock fontSize="m">{RUN_INSTRUCTIONS}</EuiCodeBlock>
Expand Down Expand Up @@ -157,7 +157,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
defaultMessage="After starting the agent, the agent should begin sending data. You can view this data on Ingest Manager’s datasets page."
defaultMessage="The agent should begin sending data. Go to Datasets to view your data."
/>
</EuiText>
</>
Expand All @@ -170,7 +170,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.standaloneDescription"
defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their policy. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
defaultMessage="Run an Elastic Agent standalone to configure and update the agent manually on the host where the agent is installed."
/>
</EuiText>
<EuiSpacer size="l" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import { AgentPolicy } from '../../../../types';
export const DownloadStep = () => {
return {
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle', {
defaultMessage: 'Download the Elastic Agent',
defaultMessage: 'Download the Elastic Agent to your host',
}),
children: (
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.downloadDescription"
defaultMessage="Download the Elastic Agent on your host’s machine. You can access the agent binaries and their verification signatures from the Elastic Agent download page."
defaultMessage="You can download the agent binaries and their verification signatures from the Elastic Agent download page."
/>
</EuiText>
<EuiSpacer size="l" />
Expand All @@ -33,7 +33,7 @@ export const DownloadStep = () => {
>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.downloadLink"
defaultMessage="Go to elastic.co/downloads"
defaultMessage="Go to download page"
/>
</EuiButton>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
<p>
<FormattedMessage
id="xpack.ingestManager.overviewPageSubtitle"
defaultMessage="Central management for Elastic Agents and agent policies."
defaultMessage="Manage Elastic Agents and their policies in a central location."
/>
</p>
</EuiText>
Expand Down

0 comments on commit 3c27f55

Please sign in to comment.