From 265407db2dcd9efdd81a064c65422050aa5cd464 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Wed, 5 Jul 2023 11:38:15 +0300 Subject: [PATCH 1/5] adding deployment condition status --- packages/kubernetes/changelog.yml | 7 ++++++- .../data_stream/state_deployment/fields/fields.yml | 10 ++++++++++ packages/kubernetes/docs/kube-state-metrics.md | 2 ++ packages/kubernetes/manifest.yml | 5 +++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml index 88d8a31d516..029541c5eae 100644 --- a/packages/kubernetes/changelog.yml +++ b/packages/kubernetes/changelog.yml @@ -1,9 +1,14 @@ # newer versions go on top +- version: "1.44.0" + changes: + - description: Adding kube-state-metrics kubernetes.deployment.status + type: enhancement + link: https://github.com/elastic/integrations/pull/6821 - version: "1.43.1" changes: - description: Updating index pattern for adHocDataviews for CCS use case type: enhancement - link: https://github.com/elastic/integrations/pull/6933 + link: https://github.com/elastic/integrations/pull/693 - version: "1.43.0" changes: - description: Expand index pattern for adHocDataviews for CCS use case diff --git a/packages/kubernetes/data_stream/state_deployment/fields/fields.yml b/packages/kubernetes/data_stream/state_deployment/fields/fields.yml index 51b6abb87e7..69d4ec687a6 100644 --- a/packages/kubernetes/data_stream/state_deployment/fields/fields.yml +++ b/packages/kubernetes/data_stream/state_deployment/fields/fields.yml @@ -5,6 +5,16 @@ type: boolean description: | Kubernetes deployment paused status + - name: status + type: group + fields: + - name: available + type: keyword + description: | + Deployment Available Condition status (true, false or unknown) + - name: progressing + type: keyword + description: Deployment Progresing Condition status (true, false or unknown) - name: replicas type: group fields: diff --git a/packages/kubernetes/docs/kube-state-metrics.md b/packages/kubernetes/docs/kube-state-metrics.md index 67bf7a33e7a..d43c101d5dc 100644 --- a/packages/kubernetes/docs/kube-state-metrics.md +++ b/packages/kubernetes/docs/kube-state-metrics.md @@ -800,6 +800,8 @@ An example event for `state_deployment` looks as following: | kubernetes.deployment.replicas.desired | Deployment number of desired replicas (spec) | integer | gauge | | kubernetes.deployment.replicas.unavailable | Deployment unavailable replicas | integer | gauge | | kubernetes.deployment.replicas.updated | Deployment updated replicas | integer | gauge | +| kubernetes.deployment.status.available | Deployment Available Condition status (true, false or unknown) | keyword | | +| kubernetes.deployment.status.progressing | Deployment Progresing Condition status (true, false or unknown) | keyword | | | kubernetes.labels.\* | Kubernetes labels map | object | | | kubernetes.namespace | Kubernetes namespace | keyword | | | kubernetes.namespace_labels.\* | Kubernetes namespace labels map | object | | diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index 6720bd91808..1252845d2b3 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -1,7 +1,8 @@ format_version: 2.9.0 name: kubernetes title: Kubernetes -version: 1.43.1 +version: 1.44.0 +license: basic description: Collect logs and metrics from Kubernetes clusters with Elastic Agent. type: integration categories: @@ -9,7 +10,7 @@ categories: - containers - kubernetes conditions: - kibana.version: "^8.8.0" + kibana.version: "^8.10.0" screenshots: - src: /img/metricbeat_kubernetes_overview.png title: Metricbeat Kubernetes Overview From 90dab682303c53d2fc21af949c7e4b2ce82fec22 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Wed, 5 Jul 2023 13:19:58 +0300 Subject: [PATCH 2/5] updating changelog --- packages/kubernetes/changelog.yml | 2 +- packages/kubernetes/manifest.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml index 029541c5eae..1a70cb91d54 100644 --- a/packages/kubernetes/changelog.yml +++ b/packages/kubernetes/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "1.44.0" changes: - - description: Adding kube-state-metrics kubernetes.deployment.status + - description: Introducing kubernetes.deployment.status.* metrics type: enhancement link: https://github.com/elastic/integrations/pull/6821 - version: "1.43.1" diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index 1252845d2b3..d5882d6237d 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -10,7 +10,11 @@ categories: - containers - kubernetes conditions: +<<<<<<< HEAD kibana.version: "^8.10.0" +======= + kibana.version: "^8.8.2" +>>>>>>> c12d41183 (updating changelog) screenshots: - src: /img/metricbeat_kubernetes_overview.png title: Metricbeat Kubernetes Overview From b64cd9814752f616c5ca7e4b9ed7bbd85911e790 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Wed, 5 Jul 2023 14:10:57 +0300 Subject: [PATCH 3/5] reverting kibana version --- packages/kubernetes/manifest.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index d5882d6237d..1252845d2b3 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -10,11 +10,7 @@ categories: - containers - kubernetes conditions: -<<<<<<< HEAD kibana.version: "^8.10.0" -======= - kibana.version: "^8.8.2" ->>>>>>> c12d41183 (updating changelog) screenshots: - src: /img/metricbeat_kubernetes_overview.png title: Metricbeat Kubernetes Overview From 274062afb8480450de32aefa5d6bffb22cd1bd98 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Tue, 5 Sep 2023 13:08:02 +0300 Subject: [PATCH 4/5] fixing conflicts --- packages/kubernetes/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml index 1a70cb91d54..54c8990499b 100644 --- a/packages/kubernetes/changelog.yml +++ b/packages/kubernetes/changelog.yml @@ -8,7 +8,7 @@ changes: - description: Updating index pattern for adHocDataviews for CCS use case type: enhancement - link: https://github.com/elastic/integrations/pull/693 + link: https://github.com/elastic/integrations/pull/6933 - version: "1.43.0" changes: - description: Expand index pattern for adHocDataviews for CCS use case From 41e888aedbef5cc3e4fac5e2c81783cc764199e8 Mon Sep 17 00:00:00 2001 From: Andreas Gkizas Date: Tue, 5 Sep 2023 13:24:36 +0300 Subject: [PATCH 5/5] Removing license from kubernetes/manifest.yml --- packages/kubernetes/manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index 1252845d2b3..9d8a81c1a0a 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -2,7 +2,6 @@ format_version: 2.9.0 name: kubernetes title: Kubernetes version: 1.44.0 -license: basic description: Collect logs and metrics from Kubernetes clusters with Elastic Agent. type: integration categories: