From 8a8bbb57a433870131b7c3d449fb10368141c165 Mon Sep 17 00:00:00 2001
From: DeForest Richards <deforest.richards@datadoghq.com>
Date: Thu, 2 Jan 2025 13:06:00 -0700
Subject: [PATCH] Add Annotations v2 for control plane configuration

---
 istio/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/istio/README.md b/istio/README.md
index 2d657017a5b0c..93fa7f77fa531 100644
--- a/istio/README.md
+++ b/istio/README.md
@@ -65,6 +65,9 @@ Customize this file with any additional configurations. See the [sample istio.d/
 ##### Control plane configuration
 To monitor the Istio control plane and report the `mixer`, `galley`, `pilot`, and `citadel` metrics, you must configure the Agent to monitor the `istiod` deployment. In Istio v1.5 or later, apply the following pod annotations for the deployment `istiod` in the `istio-system` namespace:
 
+<!-- xxx tabs xxx -->
+<!-- xxx tab "Annotations v1" xxx -->
+
 ```yaml
 ad.datadoghq.com/discovery.checks: |
   {
@@ -79,6 +82,26 @@ ad.datadoghq.com/discovery.checks: |
   }
 ```
 
+<!-- xxz tab xxx -->
+<!-- xxx tab "Annotations v2" xxx -->
+
+**Note**: Annotations v2 is supported for Agent v7.36+.
+
+```yaml
+ad.datadoghq.com/<CONTAINER_IDENTIFIER>.checks: |
+  {
+    "Istio": {
+      "istiod_endpoint": "http://%%host%%:15014/metrics",
+      "use_openmetrics": "true"
+    }
+  }
+```
+
+<!-- xxz tab xxx -->
+<!-- xxz tabs xxx -->
+
+
+
 This annotation specifies the container `discovery` to match the default container name of the Istio container in this pod. Replace this annotation `ad.datadoghq.com/<CONTAINER_NAME>.checks` with the name (`.spec.containers[i].name`) of your Istio container if yours differs.
 
 The method for applying these annotations varies depending on the [Istio deployment strategy (Istioctl, Helm, Operator)][22] used. Consult the Istio documentation for the proper method to apply these pod annotations. See the [sample istio.d/conf.yaml][8] for all available configuration options.