[Ingest Manager] Copy changes (#70828)
* update overview page * remove streams column from config table * fleet name chanegs * remove unused component * update translations
This commit is contained in:
parent
94a18fda5d
commit
2eb0896415
7 changed files with 7 additions and 47 deletions
|
@ -314,7 +314,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
|
||||||
title: i18n.translate(
|
title: i18n.translate(
|
||||||
'xpack.ingestManager.createPackageConfig.stepDefinePackageConfigTitle',
|
'xpack.ingestManager.createPackageConfig.stepDefinePackageConfigTitle',
|
||||||
{
|
{
|
||||||
defaultMessage: 'Define your integration',
|
defaultMessage: 'Configure integration',
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
status: !packageInfo || !agentConfig ? 'disabled' : undefined,
|
status: !packageInfo || !agentConfig ? 'disabled' : undefined,
|
||||||
|
|
|
@ -10,7 +10,6 @@ import {
|
||||||
EuiInMemoryTable,
|
EuiInMemoryTable,
|
||||||
EuiInMemoryTableProps,
|
EuiInMemoryTableProps,
|
||||||
EuiBadge,
|
EuiBadge,
|
||||||
EuiTextColor,
|
|
||||||
EuiContextMenuItem,
|
EuiContextMenuItem,
|
||||||
EuiButton,
|
EuiButton,
|
||||||
EuiFlexGroup,
|
EuiFlexGroup,
|
||||||
|
@ -23,7 +22,6 @@ import { useCapabilities, useLink } from '../../../../../hooks';
|
||||||
import { useConfigRefresh } from '../../hooks';
|
import { useConfigRefresh } from '../../hooks';
|
||||||
|
|
||||||
interface InMemoryPackageConfig extends PackageConfig {
|
interface InMemoryPackageConfig extends PackageConfig {
|
||||||
streams: { total: number; enabled: number };
|
|
||||||
inputTypes: string[];
|
inputTypes: string[];
|
||||||
packageName?: string;
|
packageName?: string;
|
||||||
packageTitle?: string;
|
packageTitle?: string;
|
||||||
|
@ -72,30 +70,11 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
|
||||||
}
|
}
|
||||||
|
|
||||||
const dsInputTypes: string[] = [];
|
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);
|
dsInputTypes.sort(stringSortAscending);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...packageConfig,
|
...packageConfig,
|
||||||
streams,
|
|
||||||
inputTypes: dsInputTypes,
|
inputTypes: dsInputTypes,
|
||||||
packageName: packageConfig.package?.name ?? '',
|
packageName: packageConfig.package?.name ?? '',
|
||||||
packageTitle: packageConfig.package?.title ?? '',
|
packageTitle: packageConfig.package?.title ?? '',
|
||||||
|
@ -175,23 +154,6 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
|
||||||
return namespace ? <EuiBadge color="hollow">{namespace}</EuiBadge> : '';
|
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"> / {streams.total}</EuiTextColor>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: i18n.translate(
|
name: i18n.translate(
|
||||||
'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle',
|
'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle',
|
||||||
|
|
|
@ -245,7 +245,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
|
||||||
{
|
{
|
||||||
field: 'config_id',
|
field: 'config_id',
|
||||||
name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', {
|
name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', {
|
||||||
defaultMessage: 'Configuration',
|
defaultMessage: 'Agent config',
|
||||||
}),
|
}),
|
||||||
render: (configId: string, agent: Agent) => {
|
render: (configId: string, agent: Agent) => {
|
||||||
const configName = agentConfigs.find((p) => p.id === configId)?.name;
|
const configName = agentConfigs.find((p) => p.id === configId)?.name;
|
||||||
|
@ -445,7 +445,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
|
||||||
>
|
>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id="xpack.ingestManager.agentList.configFilterText"
|
id="xpack.ingestManager.agentList.configFilterText"
|
||||||
defaultMessage="Configs"
|
defaultMessage="Agent config"
|
||||||
/>
|
/>
|
||||||
</EuiFilterButton>
|
</EuiFilterButton>
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
|
||||||
{
|
{
|
||||||
field: 'config_id',
|
field: 'config_id',
|
||||||
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', {
|
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', {
|
||||||
defaultMessage: 'Config',
|
defaultMessage: 'Agent config',
|
||||||
}),
|
}),
|
||||||
render: (configId: string) => {
|
render: (configId: string) => {
|
||||||
const config = agentConfigs.find((c) => c.id === configId);
|
const config = agentConfigs.find((c) => c.id === configId);
|
||||||
|
|
|
@ -36,7 +36,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
|
||||||
<h2>
|
<h2>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id="xpack.ingestManager.overviewPageConfigurationsPanelTitle"
|
id="xpack.ingestManager.overviewPageConfigurationsPanelTitle"
|
||||||
defaultMessage="Configurations"
|
defaultMessage="Agent configurations"
|
||||||
/>
|
/>
|
||||||
</h2>
|
</h2>
|
||||||
</EuiTitle>
|
</EuiTitle>
|
||||||
|
@ -55,7 +55,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
|
||||||
<EuiDescriptionListTitle>
|
<EuiDescriptionListTitle>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id="xpack.ingestManager.overviewConfigTotalTitle"
|
id="xpack.ingestManager.overviewConfigTotalTitle"
|
||||||
defaultMessage="Total configs"
|
defaultMessage="Total available"
|
||||||
/>
|
/>
|
||||||
</EuiDescriptionListTitle>
|
</EuiDescriptionListTitle>
|
||||||
<EuiDescriptionListDescription>
|
<EuiDescriptionListDescription>
|
||||||
|
@ -64,7 +64,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
|
||||||
<EuiDescriptionListTitle>
|
<EuiDescriptionListTitle>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id="xpack.ingestManager.overviewPackageConfigTitle"
|
id="xpack.ingestManager.overviewPackageConfigTitle"
|
||||||
defaultMessage="Total integrations used"
|
defaultMessage="Configured integrations"
|
||||||
/>
|
/>
|
||||||
</EuiDescriptionListTitle>
|
</EuiDescriptionListTitle>
|
||||||
<EuiDescriptionListDescription>
|
<EuiDescriptionListDescription>
|
||||||
|
|
|
@ -8154,7 +8154,6 @@
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "データソース",
|
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "データソース",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間",
|
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合",
|
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "ストリーム",
|
|
||||||
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "データソース",
|
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "データソース",
|
||||||
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定",
|
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定",
|
||||||
"xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:",
|
"xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:",
|
||||||
|
|
|
@ -8158,7 +8158,6 @@
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "数据源",
|
"xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "数据源",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间",
|
"xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成",
|
"xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成",
|
||||||
"xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "流计数",
|
|
||||||
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "数据源",
|
"xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "数据源",
|
||||||
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置",
|
"xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置",
|
||||||
"xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",
|
"xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",
|
||||||
|
|
Loading…
Reference in a new issue