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

[Ingest Manager] Copy changes #70828

Merged
merged 5 commits into from
Jul 6, 2020
Merged

[Ingest Manager] Copy changes #70828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e92f8b9
update overview page
neptunian Jul 2, 2020
4862574
remove streams column from config table
neptunian Jul 2, 2020
56558e5
fleet name chanegs
neptunian Jul 2, 2020
c753a62
remove unused component
neptunian Jul 6, 2020
35861ad
update translations
neptunian Jul 6, 2020
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
2 changes: 1 addition & 1 deletion ...ic/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
title: i18n.translate(
'xpack.ingestManager.createPackageConfig.stepDefinePackageConfigTitle',
{
defaultMessage: 'Define your integration',
defaultMessage: 'Configure integration',
}
),
status: !packageInfo || !agentConfig ? 'disabled' : undefined,
Expand Down
38 changes: 0 additions & 38 deletions ...r/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
EuiInMemoryTable,
EuiInMemoryTableProps,
EuiBadge,
EuiTextColor,
EuiContextMenuItem,
EuiButton,
EuiFlexGroup,
Expand All @@ -23,7 +22,6 @@ import { useCapabilities, useLink } from '../../../../../hooks';
import { useConfigRefresh } from '../../hooks';

interface InMemoryPackageConfig extends PackageConfig {
streams: { total: number; enabled: number };
inputTypes: string[];
packageName?: string;
packageTitle?: string;
Expand Down Expand Up @@ -72,30 +70,11 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
}

const dsInputTypes: string[] = [];
const streams = packageConfig.inputs.reduce(
(streamSummary, input) => {
if (!inputTypesValues.includes(input.type)) {
inputTypesValues.push(input.type);
}
if (!dsInputTypes.includes(input.type)) {
dsInputTypes.push(input.type);
}

streamSummary.total += input.streams.length;
streamSummary.enabled += input.enabled
? input.streams.filter((stream) => stream.enabled).length
: 0;

return streamSummary;
},
{ total: 0, enabled: 0 }
);

dsInputTypes.sort(stringSortAscending);

return {
...packageConfig,
streams,
inputTypes: dsInputTypes,
packageName: packageConfig.package?.name ?? '',
packageTitle: packageConfig.package?.title ?? '',
Expand Down Expand Up @@ -175,23 +154,6 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
return namespace ? <EuiBadge color="hollow">{namespace}</EuiBadge> : '';
},
},
{
field: 'streams',
name: i18n.translate(
'xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle',
{
defaultMessage: 'Streams',
}
),
render: (streams: InMemoryPackageConfig['streams']) => {
return (
<>
<EuiTextColor>{streams.enabled}</EuiTextColor>
<EuiTextColor color="subdued">&nbsp;/ {streams.total}</EuiTextColor>
</>
);
},
},
{
name: i18n.translate(
'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle',
Expand Down
4 changes: 2 additions & 2 deletions ...ngest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
{
field: 'config_id',
name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', {
defaultMessage: 'Configuration',
defaultMessage: 'Agent config',
}),
render: (configId: string, agent: Agent) => {
const configName = agentConfigs.find((p) => p.id === configId)?.name;
Expand Down Expand Up @@ -445,7 +445,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
>
<FormattedMessage
id="xpack.ingestManager.agentList.configFilterText"
defaultMessage="Configs"
defaultMessage="Agent config"
/>
</EuiFilterButton>
}
Expand Down
2 changes: 1 addition & 1 deletion ...er/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
{
field: 'config_id',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', {
defaultMessage: 'Config',
defaultMessage: 'Agent config',
}),
render: (configId: string) => {
const config = agentConfigs.find((c) => c.id === configId);
Expand Down
6 changes: 3 additions & 3 deletions ...public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
<h2>
<FormattedMessage
id="xpack.ingestManager.overviewPageConfigurationsPanelTitle"
defaultMessage="Configurations"
defaultMessage="Agent configurations"
/>
</h2>
</EuiTitle>
Expand All @@ -55,7 +55,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewConfigTotalTitle"
defaultMessage="Total configs"
defaultMessage="Total available"
/>
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
Expand All @@ -64,7 +64,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewPackageConfigTitle"
defaultMessage="Total integrations used"
defaultMessage="Configured integrations"
/>
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -8156,7 +8156,6 @@
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "データソース",
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間",
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合",
"xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "ストリーム",
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "データソース",
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定",
"xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:",
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -8160,7 +8160,6 @@
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "数据源",
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间",
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成",
"xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "流计数",
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "数据源",
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置",
"xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",
Expand Down