From 99876a52b75bd1a4e17e4822e73d00ce0cc2cb77 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 6 Sep 2022 16:04:14 +0200 Subject: [PATCH 1/2] add and fix dimention fields Signed-off-by: Tetiana Kravchenko --- packages/kubernetes/changelog.yml | 5 +++++ .../kubernetes/data_stream/container/fields/base-fields.yml | 1 + .../data_stream/container_logs/fields/base-fields.yml | 2 ++ packages/kubernetes/data_stream/pod/fields/base-fields.yml | 2 ++ .../data_stream/state_container/fields/base-fields.yml | 1 + .../data_stream/state_cronjob/fields/base-fields.yml | 1 + .../data_stream/state_daemonset/fields/base-fields.yml | 1 + .../kubernetes/data_stream/state_job/fields/base-fields.yml | 2 ++ .../state_persistentvolumeclaim/fields/base-fields.yml | 1 + .../kubernetes/data_stream/state_pod/fields/base-fields.yml | 1 + .../data_stream/state_replicaset/fields/base-fields.yml | 5 +++-- .../data_stream/state_resourcequota/fields/base-fields.yml | 1 + .../data_stream/state_service/fields/base-fields.yml | 1 + .../data_stream/state_statefulset/fields/base-fields.yml | 3 ++- .../kubernetes/data_stream/volume/fields/base-fields.yml | 1 + packages/kubernetes/manifest.yml | 2 +- 16 files changed, 26 insertions(+), 4 deletions(-) diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml index 742905f13ef..052fe86c3e4 100644 --- a/packages/kubernetes/changelog.yml +++ b/packages/kubernetes/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.23.1" + changes: + - description: Add missing dimension fields + type: enhancement + link: https://github.com/elastic/integrations/pull/4081 - version: "1.23.0" changes: - description: Add fields to audit logs data stream diff --git a/packages/kubernetes/data_stream/container/fields/base-fields.yml b/packages/kubernetes/data_stream/container/fields/base-fields.yml index 66d39b2accb..78eca29e0cc 100644 --- a/packages/kubernetes/data_stream/container/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/container/fields/base-fields.yml @@ -31,6 +31,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/container_logs/fields/base-fields.yml b/packages/kubernetes/data_stream/container_logs/fields/base-fields.yml index 6d0ce857f3e..393dff1e806 100644 --- a/packages/kubernetes/data_stream/container_logs/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/container_logs/fields/base-fields.yml @@ -40,6 +40,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace @@ -74,6 +75,7 @@ Kubernetes node UID - name: namespace_uid + dimension: true type: keyword description: > Kubernetes namespace UID diff --git a/packages/kubernetes/data_stream/pod/fields/base-fields.yml b/packages/kubernetes/data_stream/pod/fields/base-fields.yml index 06bb3d2c714..907af218e57 100644 --- a/packages/kubernetes/data_stream/pod/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/pod/fields/base-fields.yml @@ -31,6 +31,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace @@ -79,6 +80,7 @@ Kubernetes node UID - name: namespace_uid + dimension: true type: keyword description: > Kubernetes namespace UID diff --git a/packages/kubernetes/data_stream/state_container/fields/base-fields.yml b/packages/kubernetes/data_stream/state_container/fields/base-fields.yml index 66d39b2accb..78eca29e0cc 100644 --- a/packages/kubernetes/data_stream/state_container/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_container/fields/base-fields.yml @@ -31,6 +31,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_cronjob/fields/base-fields.yml b/packages/kubernetes/data_stream/state_cronjob/fields/base-fields.yml index 331f87f888c..8658c7a6b87 100644 --- a/packages/kubernetes/data_stream/state_cronjob/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_cronjob/fields/base-fields.yml @@ -31,6 +31,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_daemonset/fields/base-fields.yml b/packages/kubernetes/data_stream/state_daemonset/fields/base-fields.yml index d43ffd79646..73a7893bb34 100644 --- a/packages/kubernetes/data_stream/state_daemonset/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_daemonset/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_job/fields/base-fields.yml b/packages/kubernetes/data_stream/state_job/fields/base-fields.yml index fff0dfb5372..298a41f08d9 100644 --- a/packages/kubernetes/data_stream/state_job/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_job/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace @@ -91,6 +92,7 @@ Name of the CronJob to which the Pod belongs - name: container.name + dimension: true type: keyword description: > Kubernetes container name diff --git a/packages/kubernetes/data_stream/state_persistentvolumeclaim/fields/base-fields.yml b/packages/kubernetes/data_stream/state_persistentvolumeclaim/fields/base-fields.yml index d43ffd79646..73a7893bb34 100644 --- a/packages/kubernetes/data_stream/state_persistentvolumeclaim/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_persistentvolumeclaim/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_pod/fields/base-fields.yml b/packages/kubernetes/data_stream/state_pod/fields/base-fields.yml index c99e087c4a6..2dd51e16381 100644 --- a/packages/kubernetes/data_stream/state_pod/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_pod/fields/base-fields.yml @@ -31,6 +31,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_replicaset/fields/base-fields.yml b/packages/kubernetes/data_stream/state_replicaset/fields/base-fields.yml index 9db60548093..d008061f5ff 100644 --- a/packages/kubernetes/data_stream/state_replicaset/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_replicaset/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace @@ -65,13 +66,13 @@ Kubernetes Service selectors map - name: replicaset.name - dimensiont: true + dimension: true type: keyword description: > Kubernetes replicaset name - name: deployment.name - dimensiont: true + dimension: true type: keyword description: > Kubernetes deployment name diff --git a/packages/kubernetes/data_stream/state_resourcequota/fields/base-fields.yml b/packages/kubernetes/data_stream/state_resourcequota/fields/base-fields.yml index d43ffd79646..73a7893bb34 100644 --- a/packages/kubernetes/data_stream/state_resourcequota/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_resourcequota/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_service/fields/base-fields.yml b/packages/kubernetes/data_stream/state_service/fields/base-fields.yml index e9e70d9d3ae..d9575bdab71 100644 --- a/packages/kubernetes/data_stream/state_service/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_service/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/data_stream/state_statefulset/fields/base-fields.yml b/packages/kubernetes/data_stream/state_statefulset/fields/base-fields.yml index b6151d62fbe..0dccc67d510 100644 --- a/packages/kubernetes/data_stream/state_statefulset/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_statefulset/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace @@ -75,7 +76,7 @@ Kubernetes deployment name - name: statefulset.name - dimensions: true + dimension: true type: keyword description: > Kubernetes statefulset name diff --git a/packages/kubernetes/data_stream/volume/fields/base-fields.yml b/packages/kubernetes/data_stream/volume/fields/base-fields.yml index d43ffd79646..73a7893bb34 100644 --- a/packages/kubernetes/data_stream/volume/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/volume/fields/base-fields.yml @@ -29,6 +29,7 @@ Kubernetes pod IP - name: namespace + dimension: true type: keyword description: > Kubernetes namespace diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index d62412063f1..82cb8213859 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: kubernetes title: Kubernetes -version: 1.23.0 +version: 1.23.1 license: basic description: Collect logs and metrics from Kubernetes clusters with Elastic Agent. type: integration From f9e5c6828890a56cc1ce0174ebc593f90ffbd46a Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 6 Sep 2022 16:10:52 +0200 Subject: [PATCH 2/2] fix pr number; remove dimension for container.name Signed-off-by: Tetiana Kravchenko --- packages/kubernetes/changelog.yml | 2 +- .../kubernetes/data_stream/state_job/fields/base-fields.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml index 052fe86c3e4..1a941c42a69 100644 --- a/packages/kubernetes/changelog.yml +++ b/packages/kubernetes/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add missing dimension fields type: enhancement - link: https://github.com/elastic/integrations/pull/4081 + link: https://github.com/elastic/integrations/pull/4144 - version: "1.23.0" changes: - description: Add fields to audit logs data stream diff --git a/packages/kubernetes/data_stream/state_job/fields/base-fields.yml b/packages/kubernetes/data_stream/state_job/fields/base-fields.yml index 298a41f08d9..1c9c17d64e5 100644 --- a/packages/kubernetes/data_stream/state_job/fields/base-fields.yml +++ b/packages/kubernetes/data_stream/state_job/fields/base-fields.yml @@ -92,7 +92,6 @@ Name of the CronJob to which the Pod belongs - name: container.name - dimension: true type: keyword description: > Kubernetes container name