Fix metrics option type for legacy OpenMetrics config spec (#9318)

* Fix for #9317: Fix incorrect validation spec for istio integration * update specs Co-authored-by: John Ejike-Nwogu <[email protected]> Co-authored-by: Ofek Lev <[email protected]>
DataDog · May 12, 2021 · 23b5f36 · 23b5f36
1 parent 4727cd3
commit 23b5f36
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py b/amazon_msk/datadog_checks/amazon_msk/config_models/instance.py
@@ -3,7 +3,7 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from __future__ import annotations
 
-from typing import Any, Mapping, Optional, Sequence
+from typing import Any, Mapping, Optional, Sequence, Union
 
 from pydantic import BaseModel, root_validator, validator
 
@@ -86,7 +86,7 @@ class Config:
     label_to_hostname: Optional[str]
     labels_mapper: Optional[Mapping[str, Any]]
     log_requests: Optional[bool]
-    metrics: Optional[Sequence[str]]
+    metrics: Optional[Sequence[Union[str, Mapping[str, str]]]]
     min_collection_interval: Optional[float]
     namespace: Optional[str]
     node_exporter_port: Optional[int]

diff --git a/coredns/datadog_checks/coredns/data/conf.yaml.example b/coredns/datadog_checks/coredns/data/conf.yaml.example
@@ -60,7 +60,7 @@ instances:
     tags:
       - dns-pod:%%host%%
 
-    ## @param metrics - list of strings - optional
+    ## @param metrics - (list of string or mapping) - optional
     ## List of metrics to be fetched from the prometheus endpoint, if there's a
     ## value it'll be renamed. This list should contain at least one metric.
     #

diff --git a/..._dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics_legacy.yaml b/..._dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics_legacy.yaml
@@ -21,7 +21,11 @@
       - memory:mem
       - io
     items:
-      type: string
+      anyOf:
+      - type: string
+      - type: object
+        additionalProperties:
+          type: string
 - name: prometheus_metrics_prefix
   description: Removes a given <PREFIX> from exposed Prometheus metrics.
   value:

diff --git a/istio/datadog_checks/istio/config_models/instance.py b/istio/datadog_checks/istio/config_models/instance.py
@@ -3,7 +3,7 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from __future__ import annotations
 
-from typing import Any, Mapping, Optional, Sequence
+from typing import Any, Mapping, Optional, Sequence, Union
 
 from pydantic import BaseModel, root_validator, validator
 
@@ -87,7 +87,7 @@ class Config:
     label_to_hostname: Optional[str]
     labels_mapper: Optional[Mapping[str, Any]]
     log_requests: Optional[bool]
-    metrics: Optional[Sequence[str]]
+    metrics: Optional[Sequence[Union[str, Mapping[str, str]]]]
     min_collection_interval: Optional[float]
     mixer_endpoint: Optional[str]
     namespace: Optional[str]

diff --git a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
@@ -55,7 +55,7 @@ instances:
     #
     namespace: service
 
-    ## @param metrics - list of strings - required
+    ## @param metrics - (list of string or mapping) - required
     ## List of metrics to be fetched from the prometheus endpoint, if there's a
     ## value it'll be renamed. This list should contain at least one metric.
     #