[Infra UI] Clean up Docker and Kubernetes fields for ECS (#31175)
* [Infra UI] Clean up Docker and Kubernetes fields for ECS * updating tests with latest ecs fields * Fixing documentation
This commit is contained in:
parent
bf0efec8b3
commit
cb3dad1317
6 changed files with 9 additions and 9 deletions
|
@ -10,8 +10,8 @@
|
||||||
|
|
||||||
`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`.
|
`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`.
|
||||||
|
|
||||||
`xpack.infra.sources.default.fields.host`:: Field used to identify hosts. Defaults to `beat.hostname`.
|
`xpack.infra.sources.default.fields.host`:: Field used to identify hosts. Defaults to `host.name`.
|
||||||
|
|
||||||
`xpack.infra.sources.default.fields.container`:: Field used to identify Docker containers. Defaults to `docker.container.name`.
|
`xpack.infra.sources.default.fields.container`:: Field used to identify Docker containers. Defaults to `container.id`.
|
||||||
|
|
||||||
`xpack.infra.sources.default.fields.pod`:: Field used to identify Kubernetes pods. Defaults to `kubernetes.pod.name`.
|
`xpack.infra.sources.default.fields.pod`:: Field used to identify Kubernetes pods. Defaults to `kubernetes.pod.uid`.
|
||||||
|
|
|
@ -94,7 +94,7 @@ export const FieldsConfigurationPanel = ({
|
||||||
id="xpack.infra.sourceConfiguration.containerFieldDescription"
|
id="xpack.infra.sourceConfiguration.containerFieldDescription"
|
||||||
defaultMessage="Field used to identify Docker containers. The recommended value is {defaultValue}."
|
defaultMessage="Field used to identify Docker containers. The recommended value is {defaultValue}."
|
||||||
values={{
|
values={{
|
||||||
defaultValue: <EuiCode>docker.container.id</EuiCode>,
|
defaultValue: <EuiCode>container.id</EuiCode>,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,7 +122,7 @@ export const hostK8sOverview: InfraMetricModelCreator = (timeField, indexPattern
|
||||||
type: InfraMetricModelMetricType.max,
|
type: InfraMetricModelMetricType.max,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'kubernetes.pod.name',
|
field: 'kubernetes.pod.uid',
|
||||||
id: 'card-pod-name',
|
id: 'card-pod-name',
|
||||||
type: InfraMetricModelMetricType.cardinality,
|
type: InfraMetricModelMetricType.cardinality,
|
||||||
},
|
},
|
||||||
|
|
|
@ -31,7 +31,7 @@ export const hostK8sPodCap: InfraMetricModelCreator = (timeField, indexPattern,
|
||||||
id: 'used',
|
id: 'used',
|
||||||
metrics: [
|
metrics: [
|
||||||
{
|
{
|
||||||
field: 'kubernetes.pod.name',
|
field: 'kubernetes.pod.uid',
|
||||||
id: 'avg-pod',
|
id: 'avg-pod',
|
||||||
type: InfraMetricModelMetricType.cardinality,
|
type: InfraMetricModelMetricType.cardinality,
|
||||||
},
|
},
|
||||||
|
|
|
@ -10,7 +10,7 @@ export const defaultSourceConfiguration = {
|
||||||
metricAlias: 'metricbeat-*',
|
metricAlias: 'metricbeat-*',
|
||||||
logAlias: 'filebeat-*,kibana_sample_data_logs*',
|
logAlias: 'filebeat-*,kibana_sample_data_logs*',
|
||||||
fields: {
|
fields: {
|
||||||
container: 'docker.container.id',
|
container: 'container.id',
|
||||||
host: 'host.name',
|
host: 'host.name',
|
||||||
pod: 'kubernetes.pod.uid',
|
pod: 'kubernetes.pod.uid',
|
||||||
tiebreaker: '_doc',
|
tiebreaker: '_doc',
|
||||||
|
|
|
@ -37,7 +37,7 @@ const sourcesTests: KbnTestProvider = ({ getService }) => {
|
||||||
expect(sourceConfiguration.name).to.be('Default');
|
expect(sourceConfiguration.name).to.be('Default');
|
||||||
expect(sourceConfiguration.metricAlias).to.be('metricbeat-*');
|
expect(sourceConfiguration.metricAlias).to.be('metricbeat-*');
|
||||||
expect(sourceConfiguration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
|
expect(sourceConfiguration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
|
||||||
expect(sourceConfiguration.fields.container).to.be('docker.container.id');
|
expect(sourceConfiguration.fields.container).to.be('container.id');
|
||||||
expect(sourceConfiguration.fields.host).to.be('host.name');
|
expect(sourceConfiguration.fields.host).to.be('host.name');
|
||||||
expect(sourceConfiguration.fields.pod).to.be('kubernetes.pod.uid');
|
expect(sourceConfiguration.fields.pod).to.be('kubernetes.pod.uid');
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ const sourcesTests: KbnTestProvider = ({ getService }) => {
|
||||||
expect(configuration.description).to.be('');
|
expect(configuration.description).to.be('');
|
||||||
expect(configuration.metricAlias).to.be('metricbeat-*');
|
expect(configuration.metricAlias).to.be('metricbeat-*');
|
||||||
expect(configuration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
|
expect(configuration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
|
||||||
expect(configuration.fields.container).to.be('docker.container.id');
|
expect(configuration.fields.container).to.be('container.id');
|
||||||
expect(configuration.fields.host).to.be('host.name');
|
expect(configuration.fields.host).to.be('host.name');
|
||||||
expect(configuration.fields.pod).to.be('kubernetes.pod.uid');
|
expect(configuration.fields.pod).to.be('kubernetes.pod.uid');
|
||||||
expect(configuration.fields.tiebreaker).to.be('_doc');
|
expect(configuration.fields.tiebreaker).to.be('_doc');
|
||||||
|
|
Loading…
Reference in a new issue