Skip to content

Include additional fields for summary column#213687

Merged
thomheymann merged 4 commits intoelastic:mainfrom
thomheymann:196513-include-additional-fields-for-summary-column
Mar 13, 2025
Merged

Include additional fields for summary column#213687
thomheymann merged 4 commits intoelastic:mainfrom
thomheymann:196513-include-additional-fields-for-summary-column

Conversation

@thomheymann
Copy link
Contributor

@thomheymann thomheymann commented Mar 10, 2025

Resolves #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)

@thomheymann thomheymann marked this pull request as ready for review March 12, 2025 07:59
@thomheymann thomheymann requested review from a team as code owners March 12, 2025 07:59
@elastic elastic deleted a comment from elasticmachine Mar 12, 2025
@thomheymann thomheymann added the release_note:skip Skip the PR/issue when compiling release notes label Mar 12, 2025
@thomheymann thomheymann requested a review from yngrdyn March 12, 2025 11:51
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

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 959.1KB 959.6KB +532.0B
unifiedDocViewer 204.8KB 204.7KB -82.0B
total +450.0B

History

Copy link
Contributor

@yngrdyn yngrdyn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, well tested and neat solution 🚀

Copy link
Contributor

@akowalska622 akowalska622 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✅

@thomheymann thomheymann merged commit 37c88f9 into elastic:main Mar 13, 2025
9 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 9.0

https://github.com/elastic/kibana/actions/runs/13833481430

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
9.0 Backport failed because of merge conflicts

You might need to backport the following PRs to 9.0:
- [Discover] Exclude Elasticsearch metadata fields from Display in Content Column (#213255)

Manual backport

To create the backport manually run:

node scripts/backport --pr 213687

Questions ?

Please refer to the Backport tool documentation

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 14, 2025
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

@gbamparop
Copy link
Contributor

@thomheymann this should just be backported to 8.19 right?

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

4 similar comments
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Mar 22, 2025
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)
```
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

1 similar comment
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

1 similar comment
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 213687 locally

thomheymann added a commit to thomheymann/kibana that referenced this pull request Mar 31, 2025
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
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

thomheymann added a commit to thomheymann/kibana that referenced this pull request Mar 31, 2025
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
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

4 similar comments
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@gbamparop
Copy link
Contributor

@thomheymann shall we get the 9.0 backport closed and carry on with 8.x?

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

10 similar comments
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.
cc: @thomheymann

2 similar comments
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.
cc: @thomheymann

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.
cc: @thomheymann

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes v8.19.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[One Discover] include additional fields for summary column

6 participants