From 29dd72180b81ebf80149b8ac924c91ed01d09384 Mon Sep 17 00:00:00 2001
From: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
Date: Fri, 4 Aug 2023 13:06:52 +0200
Subject: [PATCH] [Azure][container_service] Add missing azure dimensions to
 the kube_pod_status_phase and kube_pod_status_ready metrics (#7245)

* Add missing azure dimensions to the kube_pod_status_phase and kube_pod_status_ready metrics

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* fix pr url

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
---
 packages/azure_metrics/changelog.yml          |  5 ++
 .../agent/stream/stream.yml.hbs               | 57 +++++++++++++++++--
 packages/azure_metrics/manifest.yml           |  2 +-
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/packages/azure_metrics/changelog.yml b/packages/azure_metrics/changelog.yml
index 8f3d6a862933..24b4d00b5163 100644
--- a/packages/azure_metrics/changelog.yml
+++ b/packages/azure_metrics/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.0.18"
+  changes:
+    - description: Add missing azure dimensions to the kube_pod_status_phase and kube_pod_status_ready metrics
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/7245
 - version: "1.0.17"
   changes:
     - description: Add dimension and metric_type metadata to the container_instance datastream
diff --git a/packages/azure_metrics/data_stream/container_service/agent/stream/stream.yml.hbs b/packages/azure_metrics/data_stream/container_service/agent/stream/stream.yml.hbs
index 9ac3a4ace24b..2f0eda75a2d3 100644
--- a/packages/azure_metrics/data_stream/container_service/agent/stream/stream.yml.hbs
+++ b/packages/azure_metrics/data_stream/container_service/agent/stream/stream.yml.hbs
@@ -43,13 +43,28 @@ resources:
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
-          - name: ["kube_pod_status_ready", "kube_pod_status_phase"]
+          - name: ["kube_pod_status_ready"]
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
             dimensions:
             - name: "pod"
-              value: "*"        
+              value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "condition"
+              value: "*"
+          - name: ["kube_pod_status_phase"]
+            namespace: "Microsoft.ContainerService/managedClusters"
+            ignore_unsupported: true
+            timegrain: "PT5M"
+            dimensions:
+            - name: "pod"
+              value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "phase"
+              value: "*"
     {{/each}}
 {{/if}}
 {{#if resource_ids}}
@@ -71,13 +86,28 @@ resources:
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
-          - name: ["kube_pod_status_ready", "kube_pod_status_phase"]
+          - name: ["kube_pod_status_ready"]
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
             dimensions:
             - name: "pod"
               value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "condition"
+              value: "*"
+          - name: ["kube_pod_status_phase"]
+            namespace: "Microsoft.ContainerService/managedClusters"
+            ignore_unsupported: true
+            timegrain: "PT5M"
+            dimensions:
+            - name: "pod"
+              value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "phase"
+              value: "*"
     {{/each}}
 {{/if}}
 
@@ -105,12 +135,27 @@ resources:
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
-          - name: ["kube_pod_status_ready", "kube_pod_status_phase"]
+          - name: ["kube_pod_status_ready"]
             namespace: "Microsoft.ContainerService/managedClusters"
             ignore_unsupported: true
             timegrain: "PT5M"
             dimensions:
             - name: "pod"
-              value: "*"          
+              value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "condition"
+              value: "*"
+          - name: ["kube_pod_status_phase"]
+            namespace: "Microsoft.ContainerService/managedClusters"
+            ignore_unsupported: true
+            timegrain: "PT5M"
+            dimensions:
+            - name: "pod"
+              value: "*"
+            - name: "namespace"
+              value: "*"
+            - name: "phase"
+              value: "*"
     {{/unless}}
-{{/unless}}
\ No newline at end of file
+{{/unless}}
diff --git a/packages/azure_metrics/manifest.yml b/packages/azure_metrics/manifest.yml
index 9f9e2d929a3f..19572461850d 100644
--- a/packages/azure_metrics/manifest.yml
+++ b/packages/azure_metrics/manifest.yml
@@ -1,6 +1,6 @@
 name: azure_metrics
 title: Azure Resource Metrics
-version: 1.0.17
+version: 1.0.18
 release: ga
 description: Collect metrics from Azure resources with Elastic Agent.
 type: integration