Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.x] [Ingest Manager] Wording & linking improvements (#76284) #76607

Merged
merged 1 commit into from
Sep 3, 2020
Merged

[7.x] [Ingest Manager] Wording & linking improvements (#76284) #76607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...c/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {
EuiFlyout,
EuiFlyoutBody,
EuiFlyoutHeader,
EuiSpacer,
EuiText,
EuiTitle,
EuiFlexGroup,
EuiFlexItem,
Expand Down Expand Up @@ -44,6 +46,14 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
/>
</h2>
</EuiTitle>
<EuiSpacer size="l" />
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.agentDescription"
defaultMessage="Add Elastic Agents to your hosts to collect data and send it to the Elastic Stack."
/>
</EuiText>
<EuiSpacer size="l" />
<EuiTabs style={{ marginBottom: '-25px' }}>
<EuiTab isSelected={mode === 'managed'} onClick={() => setMode('managed')}>
<FormattedMessage
Expand Down
6 changes: 3 additions & 3 deletions ...ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
<>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
defaultMessage="Before enrolling agents, set up Fleet. {link}"
defaultMessage="Before enrolling agents, {link}."
values={{
link: (
<EuiLink href={getHref('fleet')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.goToFleetButton"
defaultMessage="Go to Fleet."
id="xpack.ingestManager.agentEnrollment.setUpFleetLink"
defaultMessage="set up Fleet"
/>
</EuiLink>
),
Expand Down
16 changes: 14 additions & 2 deletions ...est_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ import {
EuiFlexGroup,
EuiCodeBlock,
EuiCopy,
EuiLink,
} from '@elastic/eui';
import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { AgentPolicy } from '../../../../types';
import { useCore, sendGetOneAgentPolicyFull } from '../../../../hooks';
import { useCore, useLink, sendGetOneAgentPolicyFull } from '../../../../hooks';
import { DownloadStep, AgentPolicySelectionStep } from './steps';
import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../../services';

Expand All @@ -31,6 +32,7 @@ interface Props {
const RUN_INSTRUCTIONS = './elastic-agent run';

export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
const { getHref } = useLink();
const core = useCore();
const { notifications } = core;

Expand Down Expand Up @@ -157,7 +159,17 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
defaultMessage="The agent should begin sending data. Go to data streams to view your data."
defaultMessage="The agent should begin sending data. Go to {link} to view your data."
values={{
link: (
<EuiLink href={getHref('data_streams')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.goToDataStreamsLink"
defaultMessage="data streams"
/>
</EuiLink>
),
}}
/>
</EuiText>
</>
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9132,10 +9132,8 @@
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "スタンドアロンモード",
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "エージェントを登録する前に、フリートを設定する必要があります。{link}",
"xpack.ingestManager.agentEnrollment.flyoutTitle": "エージェントの追加",
"xpack.ingestManager.agentEnrollment.goToFleetButton": "フリートに移動します。",
"xpack.ingestManager.agentEnrollment.managedDescription": "必要なエージェントの数に関係なく、Fleetでは、簡単に一元的に更新を管理し、エージェントにデプロイすることができます。次の手順に従い、Elasticエージェントをダウンロードし、Fleetに登録してください。",
"xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
"xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "エージェントを起動した後、エージェントはデータの送信を開始します。Ingest Managerのデータセットページでは、このデータを確認できます。",
"xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "データを確認",
"xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "エージェント構成を選択",
"xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "この構成をコピーし、Elasticエージェントがインストールされているシステムのファイル{fileName}に置きます。必ず、構成ファイルの{outputSection}セクションで{ESUsernameVariable}と{ESPasswordVariable}を修正し、実際のElasticsearch認証資格情報が使用されるようにしてください。",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9134,10 +9134,8 @@
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "独立模式",
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "注册代理前需要设置 Fleet。{link}",
"xpack.ingestManager.agentEnrollment.flyoutTitle": "添加代理",
"xpack.ingestManager.agentEnrollment.goToFleetButton": "前往 Fleet。",
"xpack.ingestManager.agentEnrollment.managedDescription": "无论是需要一个代理还是需要数以千计的代理，Fleet 允许您轻松地集中管理并部署代理的更新。按照下面的说明下载 Elastic 代理并将代理注册到 Fleet。",
"xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改，则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
"xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "启动代理后，代理应开始发送数据。您可以在采集管理器的数据集页面查看此数据。",
"xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "检查数据",
"xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "选择代理配置",
"xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "在安装 Elastic 代理的系统上复制此配置并将其放入名为 {fileName} 的文件中。切勿忘记修改配置文件中 {outputSection} 部分的{ESUsernameVariable} 和 {ESPasswordVariable}，以便其使用您的实际 Elasticsearch 凭据。",
Expand Down