Update the envoy and istio specs to more descriptive (#21866)

* spec update to make clear that these options should be used separately

* spec sync

* changelog

Author: steveny91

envoy/assets/configuration/spec.yaml

@@ -21,7 +21,8 @@ files:
         It must be accessible:
         https://www.envoyproxy.io/docs/envoy/latest/operations/admin
         Add a `?usedonly` on the end if you wish to ignore
-        unused metrics instead of reporting them as `0`.
+        unused metrics instead of reporting them as `0`. Cannot be used in combination with `openmetrics_endpoint`
+        in the same instance.
 
         Note: see the configuration options specific to this option here,
         https://github.com/DataDog/integrations-core/blob/7.33.x/envoy/datadog_checks/envoy/data/conf.yaml.example

envoy/changelog.d/21866.fixed

@@ -0,0 +1 @@
+Update the envoy and istio specs to more descriptive of restrictions

envoy/datadog_checks/envoy/data/conf.yaml.example

@@ -55,7 +55,8 @@ instances:
     ## It must be accessible:
     ## https://www.envoyproxy.io/docs/envoy/latest/operations/admin
     ## Add a `?usedonly` on the end if you wish to ignore
-    ## unused metrics instead of reporting them as `0`.
+    ## unused metrics instead of reporting them as `0`. Cannot be used in combination with `openmetrics_endpoint`
+    ## in the same instance.
     ##
     ## Note: see the configuration options specific to this option here,
     ## https://github.com/DataDog/integrations-core/blob/7.33.x/envoy/datadog_checks/envoy/data/conf.yaml.example

istio/assets/configuration/spec.yaml

@@ -11,7 +11,7 @@ files:
           description: |
             Use the OpenMetrics V2 implementation for more features and better performance.
             This implementation is only available for Istio >= 1.5, and should be used with 
-            `istiod_endpoint` and/or `istio_mesh_endpoint`.
+            `istiod_endpoint` or `istio_mesh_endpoint`.
           value:
             example: true
             display_default: false
@@ -20,14 +20,15 @@ files:
         - name: istiod_endpoint
           description: |
             Collect mixer, galley, pilot, and citadel metrics available from the istiod deployment.
-            Only available for Istio >= v1.5.
+            Only available for Istio >= v1.5. Cannot be used in combination with `istio_mesh_endpoint` in the same instance.
           value:
             display_default: null
             example: http://istiod.istio-system:15014/metrics
             type: string
         - name: istio_mesh_endpoint
           description: |
             To enable Istio metrics you must specify the url exposing the API.
+            Cannot be used in combination with `istiod_endpoint` in the same instance.
             Note for RHEL and SUSE users: due to compatibility issues, the check does not make use of
             the CPP extension to process Protocol buffer messages coming from the api. Depending
             on the metrics volume, the check may run very slowly.
@@ -83,7 +84,7 @@ files:
         description: |
           Use the OpenMetrics V2 implementation for more features and better performance.
           This implementation is only available for Istio >= 1.5, and should be used with 
-          `istiod_endpoint` and/or `istio_mesh_endpoint`.
+          `istiod_endpoint` or `istio_mesh_endpoint`.
         value:
           example: true
           display_default: false

istio/changelog.d/21866.fixed

@@ -0,0 +1 @@
+Update the envoy and istio specs to more descriptive of restrictions

istio/datadog_checks/istio/data/auto_conf.yaml

@@ -19,7 +19,7 @@ instances:
     ## @param use_openmetrics - boolean - optional - default: false
     ## Use the OpenMetrics V2 implementation for more features and better performance.
     ## This implementation is only available for Istio >= 1.5, and should be used with 
-    ## `istiod_endpoint` and/or `istio_mesh_endpoint`.
+    ## `istiod_endpoint` or `istio_mesh_endpoint`.
     #
     # use_openmetrics: true
 

istio/datadog_checks/istio/data/conf.yaml.example

@@ -48,18 +48,19 @@ instances:
     ## @param use_openmetrics - boolean - optional - default: false
     ## Use the OpenMetrics V2 implementation for more features and better performance.
     ## This implementation is only available for Istio >= 1.5, and should be used with 
-    ## `istiod_endpoint` and/or `istio_mesh_endpoint`.
+    ## `istiod_endpoint` or `istio_mesh_endpoint`.
     #
   - use_openmetrics: true
 
     ## @param istiod_endpoint - string - optional
     ## Collect mixer, galley, pilot, and citadel metrics available from the istiod deployment.
-    ## Only available for Istio >= v1.5.
+    ## Only available for Istio >= v1.5. Cannot be used in combination with `istio_mesh_endpoint` in the same instance.
     #
     # istiod_endpoint: http://istiod.istio-system:15014/metrics
 
     ## @param istio_mesh_endpoint - string - optional
     ## To enable Istio metrics you must specify the url exposing the API.
+    ## Cannot be used in combination with `istiod_endpoint` in the same instance.
     ## Note for RHEL and SUSE users: due to compatibility issues, the check does not make use of
     ## the CPP extension to process Protocol buffer messages coming from the api. Depending
     ## on the metrics volume, the check may run very slowly.