Fix collect_aggregates_only option type (#9473)

* Fix collect_aggregates_only option type * Use anyOf * Sync spec and models * Sync models
DataDog · Jun 7, 2021 · d356312 · d356312
1 parent 57a4b0a
commit d356312
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/haproxy/assets/configuration/spec.yaml b/haproxy/assets/configuration/spec.yaml
@@ -40,8 +40,10 @@ files:
         NOTE: This only takes effect when `use_prometheus` is set to `false`.
     - name: collect_aggregates_only
       value:
+        anyOf:
+          - type: boolean
+          - type: string
         example: true
-        type: boolean
       description: |
         This parameter instructs the check to collect metrics only from the aggregate frontend/backend
         status lines from the stats output instead of for each backend. With this parameter set to false the agent

diff --git a/haproxy/datadog_checks/haproxy/config_models/defaults.py b/haproxy/datadog_checks/haproxy/config_models/defaults.py
@@ -57,7 +57,7 @@ def instance_collate_status_tags_per_host(field, value):
 
 
 def instance_collect_aggregates_only(field, value):
-    return True
+    return get_default_field_value(field, value)
 
 
 def instance_collect_status_metrics(field, value):

diff --git a/haproxy/datadog_checks/haproxy/config_models/instance.py b/haproxy/datadog_checks/haproxy/config_models/instance.py
@@ -66,7 +66,7 @@ class Config:
     bearer_token_auth: Optional[bool]
     bearer_token_path: Optional[str]
     collate_status_tags_per_host: Optional[bool]
-    collect_aggregates_only: Optional[bool]
+    collect_aggregates_only: Optional[Union[bool, str]]
     collect_status_metrics: Optional[bool]
     collect_status_metrics_by_host: Optional[bool]
     connect_timeout: Optional[float]

diff --git a/haproxy/datadog_checks/haproxy/data/conf.yaml.example b/haproxy/datadog_checks/haproxy/data/conf.yaml.example
@@ -72,7 +72,7 @@ instances:
     #
     # status_check: false
 
-    ## @param collect_aggregates_only - boolean - optional - default: true
+    ## @param collect_aggregates_only - boolean or string - optional - default: true
     ## This parameter instructs the check to collect metrics only from the aggregate frontend/backend
     ## status lines from the stats output instead of for each backend. With this parameter set to false the agent
     ## collects data for each backend but ignores the aggregated data for backends. Because some metrics are only