Skip to content

[8.x] Include additional fields for summary column (#213687)#216506

Merged
thomheymann merged 4 commits intoelastic:8.19from
thomheymann:backport/8.x/pr-213687
Apr 23, 2025
Merged

[8.x] Include additional fields for summary column (#213687)#216506
thomheymann merged 4 commits intoelastic:8.19from
thomheymann:backport/8.x/pr-213687

Conversation

@thomheymann
Copy link
Contributor

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

Resolves elastic#196513

## Summary

Updates fields in Discover summary column.

## Logic

remove

```
cloud.instance.id
orchestrator.namespace
```

In addition we need to implement some logic to have a fallback,
selecting the first field with a value in descending order:

Add fallback mechanism to container.name
```
kubernetes.container.name => k8s.container.name => container.name
```

Add fallback mechanism to host.name
```
kubernetes.node.name => k8s.node.name => host.name
```

Add fallback mechanism to cluster.name
```
orchestrator.cluster.name => k8s.cluster.name
```

Add new fields with fallbacks

```
kubernetes.namespace => (k8s.namespace.name)
kubernetes.pod.name => (k8s.pod.name)

// only one of these will be present in a single doc:
kubernetes.deployment.name => (k8s.deployment.name)
kubernetes.replicaset.name => (k8s.replicaset.name)
kubernetes.statefulset.name => (k8s.statefulset.name)
kubernetes.daemonset.name => (k8s.daemonset.name)
kubernetes.job.name => (k8s.job.name)
kubernetes.cronjob.name => (k8s.cronjob.name)
```

(cherry picked from commit 37c88f9)

# Conflicts:
#	src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/constants.ts
#	src/platform/packages/shared/kbn-discover-utils/src/data_types/logs/utils/get_available_resource_fields.ts
@thomheymann thomheymann added the backport This PR is a backport of another PR label Mar 31, 2025
@thomheymann thomheymann enabled auto-merge (squash) March 31, 2025 15:37
@jbudz jbudz changed the base branch from old-8.x to 8.19 April 18, 2025 19:10
@jbudz jbudz disabled auto-merge April 18, 2025 19:10
@jbudz
Copy link
Contributor

jbudz commented Apr 18, 2025

@thomheymann

I updated the target branch from old-8.x (previously 8.x) to 8.19 to reflect our global branch rename of 8.x to 8.19.

When you have a moment can you double check everything is in order and proceed as usual if so? Feel free to reach out if there's any questions.

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #87 / X-Pack Accessibility Tests - Group 2 Lens Accessibility focus behavior when adding or removing layers should focus the remaining layer when the first is removed

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
discover 991.6KB 992.2KB +592.0B

History

@thomheymann thomheymann enabled auto-merge (squash) April 23, 2025 12:34
@thomheymann thomheymann merged commit cde38d9 into elastic:8.19 Apr 23, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants