Skip to content

[Kubernetes] Remove extra base fields for state datastreams #8393

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

Merged
constanca-m merged 14 commits into from
Nov 23, 2023
Merged

[Kubernetes] Remove extra base fields for state datastreams #8393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bf8e8c2
Remove extra base fields.
constanca-m Nov 3, 2023
3e76b5f
Remove extra base fields.
constanca-m Nov 3, 2023
c21b005
Remove extra base fields.
constanca-m Nov 3, 2023
86e410c
Remove extra base fields.
constanca-m Nov 3, 2023
53df9da
Fix state_container
constanca-m Nov 3, 2023
f3c4950
Fix state_container
constanca-m Nov 3, 2023
0f6c04a
Update files
constanca-m Nov 3, 2023
3c3f194
Readd node annotations to state_pod
constanca-m Nov 3, 2023
a31555b
Readd namespace annotations to state_pod
constanca-m Nov 3, 2023
2c6ddf0
Update md
constanca-m Nov 3, 2023
bcabc62
Fix fields.
constanca-m Nov 4, 2023
474d246
Fix fields.
constanca-m Nov 4, 2023
10c947e
Add node.hostname again.
constanca-m Nov 21, 2023
74007a7
Merge branch 'main' into remove-base-fields
constanca-m Nov 23, 2023
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
5 changes: 5 additions & 0 deletions packages/kubernetes/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: 1.55.0
changes:
- description: Remove extra base fields from state data streams.
type: enhancement
link: https://github.com/elastic/integrations/pull/8329
- version: 1.54.0
changes:
- description: Expand condition support to remaining inputs
Expand Down
22 changes: 5 additions & 17 deletions packages/kubernetes/data_stream/state_container/fields/base-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
description: >
Kubernetes namespace

- name: namespace_uid
type: keyword
description: >
Kubernetes namespace UID

- name: node.name
type: keyword
description: >
Expand Down Expand Up @@ -77,11 +82,6 @@
description: >
Kubernetes node UID

- name: namespace_uid
type: keyword
description: >
Kubernetes namespace UID

- name: namespace_labels.*
type: object
object_type: keyword
Expand All @@ -96,13 +96,6 @@
description: >
Kubernetes namespace annotations map

- name: selectors.*
Comment thread
constanca-m marked this conversation as resolved.
type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes Service selectors map

- name: replicaset.name
Comment thread
constanca-m marked this conversation as resolved.
type: keyword
description: >
Expand Down Expand Up @@ -137,8 +130,3 @@
type: keyword
description: >
Kubernetes container name

- name: container.image
Comment thread
constanca-m marked this conversation as resolved.
type: keyword
description: >-
Kubernetes container image
56 changes: 0 additions & 56 deletions packages/kubernetes/data_stream/state_cronjob/fields/base-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@
- name: kubernetes
type: group
fields:
- name: pod.name
type: keyword
description: >
Kubernetes pod name

- name: pod.uid
type: keyword
description: >
Kubernetes pod UID

- name: pod.ip
type: ip
description: >
Kubernetes pod IP

- name: namespace
type: keyword
Expand All @@ -46,16 +32,6 @@
description: >
Kubernetes namespace labels map

- name: node.name
type: keyword
description: >
Kubernetes node name

- name: node.hostname
type: keyword
description: >
Kubernetes hostname as reported by the node’s kernel

- name: labels.*
type: object
object_type: keyword
Expand All @@ -69,35 +45,3 @@
object_type_mapping_type: "*"
description: >
Kubernetes annotations map

- name: selectors.*
type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes Service selectors map

- name: replicaset.name
type: keyword
description: >
Kubernetes replicaset name

- name: deployment.name
type: keyword
description: >
Kubernetes deployment name

- name: statefulset.name
type: keyword
description: >
Kubernetes statefulset name

- name: container.name
type: keyword
description: >
Kubernetes container name

- name: container.image
type: keyword
description: >-
Kubernetes container image
56 changes: 0 additions & 56 deletions packages/kubernetes/data_stream/state_daemonset/fields/base-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@
- name: kubernetes
type: group
fields:
- name: pod.name
type: keyword
description: >
Kubernetes pod name

- name: pod.uid
type: keyword
description: >
Kubernetes pod UID

- name: pod.ip
type: ip
description: >
Kubernetes pod IP

- name: namespace
type: keyword
Expand All @@ -46,16 +32,6 @@
description: >
Kubernetes namespace labels map

- name: node.name
type: keyword
description: >
Kubernetes node name

- name: node.hostname
type: keyword
description: >
Kubernetes hostname as reported by the node’s kernel

- name: labels.*
type: object
object_type: keyword
Expand All @@ -69,35 +45,3 @@
object_type_mapping_type: "*"
description: >
Kubernetes annotations map

- name: selectors.*
Copy link
Copy Markdown
Contributor

@gizas gizas Nov 14, 2023

Choose a reason for hiding this comment

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

Selectors should stay here

According to. https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ daemonset can have selectors

Copy link
Copy Markdown
Contributor Author

@constanca-m constanca-m Nov 14, 2023

Choose a reason for hiding this comment

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

Are you sure? @ChrsMark mentioned the implementation PR above

Copy link
Copy Markdown
Contributor

@gizas gizas Nov 23, 2023

Choose a reason for hiding this comment

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

Ok I was thinking that we might need them in the future. But ok as long as only services support that we can remove it

type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes Service selectors map

- name: replicaset.name
type: keyword
description: >
Kubernetes replicaset name

- name: deployment.name
type: keyword
description: >
Kubernetes deployment name

- name: statefulset.name
type: keyword
description: >
Kubernetes statefulset name

- name: container.name
type: keyword
description: >
Kubernetes container name

- name: container.image
type: keyword
description: >-
Kubernetes container image
51 changes: 0 additions & 51 deletions packages/kubernetes/data_stream/state_deployment/fields/base-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@
- name: kubernetes
type: group
fields:
- name: pod.name
type: keyword
description: >
Kubernetes pod name

- name: pod.uid
type: keyword
description: >
Kubernetes pod UID

- name: pod.ip
type: ip
description: >
Kubernetes pod IP

- name: namespace
type: keyword
Expand All @@ -46,16 +32,6 @@
description: >
Kubernetes namespace labels map

- name: node.name
type: keyword
description: >
Kubernetes node name

- name: node.hostname
type: keyword
description: >
Kubernetes hostname as reported by the node’s kernel

- name: labels.*
type: object
object_type: keyword
Expand All @@ -70,35 +46,8 @@
description: >
Kubernetes annotations map

- name: selectors.*
Copy link
Copy Markdown
Contributor

@gizas gizas Nov 14, 2023

Choose a reason for hiding this comment

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

Same for deployment selectors should stay

Copy link
Copy Markdown
Contributor Author

@constanca-m constanca-m Nov 14, 2023

Choose a reason for hiding this comment

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

Here is the comment with the link to the implementation PR that introduces selectors.* only for state_service

Copy link
Copy Markdown
Contributor

@gizas gizas Nov 23, 2023

Choose a reason for hiding this comment

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

ok

type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes Service selectors map

- name: replicaset.name
type: keyword
description: >
Kubernetes replicaset name

- name: deployment.name
dimension: true
type: keyword
description: >
Kubernetes deployment name

- name: statefulset.name
type: keyword
description: >
Kubernetes statefulset name

- name: container.name
type: keyword
description: >
Kubernetes container name

- name: container.image
type: keyword
description: >-
Kubernetes container image
56 changes: 0 additions & 56 deletions packages/kubernetes/data_stream/state_job/fields/base-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@
- name: kubernetes
type: group
fields:
- name: pod.name
type: keyword
description: >
Kubernetes pod name

- name: pod.uid
type: keyword
description: >
Kubernetes pod UID

- name: pod.ip
type: ip
description: >
Kubernetes pod IP

- name: namespace
type: keyword
Expand All @@ -46,16 +32,6 @@
description: >
Kubernetes namespace labels map

- name: node.name
type: keyword
description: >
Kubernetes node name

- name: node.hostname
type: keyword
description: >
Kubernetes hostname as reported by the node’s kernel

- name: labels.*
type: object
object_type: keyword
Expand All @@ -70,28 +46,6 @@
description: >
Kubernetes annotations map

- name: selectors.*
Copy link
Copy Markdown
Contributor

@gizas gizas Nov 14, 2023

Choose a reason for hiding this comment

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

Same should stay

Copy link
Copy Markdown
Contributor Author

@constanca-m constanca-m Nov 14, 2023

Choose a reason for hiding this comment

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

Here is the comment with the link to the implementation PR that introduces selectors.* only for state_service

type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes Service selectors map

- name: replicaset.name
type: keyword
description: >
Kubernetes replicaset name

- name: deployment.name
type: keyword
description: >
Kubernetes deployment name

- name: statefulset.name
type: keyword
description: >
Kubernetes statefulset name

- name: job.name
dimension: true
type: keyword
Expand All @@ -102,13 +56,3 @@
type: keyword
description: >
Name of the CronJob to which the Pod belongs

- name: container.name
type: keyword
description: >
Kubernetes container name

- name: container.image
type: keyword
description: >-
Kubernetes container image
Loading