fix(yaml-specs): fix bad indent in prometheus spec (DataDog#21584)

* fix(json-specs): fix bad indent in prometheus spec

* fix(json-specs): regenerate instances

* fix(json-specs): add changelogs

Author: Yqnn

prometheus/assets/configuration/spec.yaml

@@ -142,4 +142,4 @@ files:
         value:
           example: 2000
           type: integer
-    - template: instances/default
+      - template: instances/default

prometheus/changelog.d/21584.fixed

@@ -0,0 +1 @@
+Fix support of common instance options and fix indentation of `conf.yaml.example` file.

prometheus/datadog_checks/prometheus/config_models/defaults.py

@@ -8,6 +8,14 @@
 #     ddev -x validate models -s <INTEGRATION_NAME>
 
 
+def instance_disable_generic_tags():
+    return False
+
+
+def instance_empty_default_hostname():
+    return False
+
+
 def instance_health_service_check():
     return True
 
@@ -16,6 +24,10 @@ def instance_max_returned_metrics():
     return 2000
 
 
+def instance_min_collection_interval():
+    return 15
+
+
 def instance_prometheus_timeout():
     return 10
 

prometheus/datadog_checks/prometheus/config_models/instance.py

@@ -37,28 +37,43 @@ class LabelJoins(BaseModel):
     target_metric: Optional[TargetMetric] = None
 
 
+class MetricPatterns(BaseModel):
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        frozen=True,
+    )
+    exclude: Optional[tuple[str, ...]] = None
+    include: Optional[tuple[str, ...]] = None
+
+
 class InstanceConfig(BaseModel):
     model_config = ConfigDict(
         validate_default=True,
         arbitrary_types_allowed=True,
         frozen=True,
     )
+    disable_generic_tags: Optional[bool] = None
+    empty_default_hostname: Optional[bool] = None
     exclude_labels: Optional[tuple[str, ...]] = None
     health_service_check: Optional[bool] = None
     label_joins: Optional[LabelJoins] = None
     label_to_hostname: Optional[str] = None
     labels_mapper: Optional[MappingProxyType[str, Any]] = None
     max_returned_metrics: Optional[int] = None
+    metric_patterns: Optional[MetricPatterns] = None
     metrics: tuple[Union[MappingProxyType[str, str], str], ...]
+    min_collection_interval: Optional[float] = None
     namespace: str
     prometheus_metrics_prefix: Optional[str] = None
     prometheus_timeout: Optional[int] = None
     prometheus_url: str
     send_histograms_buckets: Optional[bool] = None
     send_monotonic_counter: Optional[bool] = None
+    service: Optional[str] = None
     ssl_ca_cert: Optional[str] = None
     ssl_cert: Optional[str] = None
     ssl_private_key: Optional[str] = None
+    tags: Optional[tuple[str, ...]] = None
     type_overrides: Optional[MappingProxyType[str, Any]] = None
 
     @model_validator(mode='before')

prometheus/datadog_checks/prometheus/data/conf.yaml.example

@@ -117,42 +117,42 @@ instances:
     #
     # max_returned_metrics: 2000
 
-## @param tags - list of strings - optional
-## A list of tags to attach to every metric and service check emitted by this instance.
-##
-## Learn more about tagging at https://docs.datadoghq.com/tagging
-#
-# tags:
-#   - <KEY_1>:<VALUE_1>
-#   - <KEY_2>:<VALUE_2>
-
-## @param service - string - optional
-## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
-##
-## Overrides any `service` defined in the `init_config` section.
-#
-# service: <SERVICE>
+    ## @param tags - list of strings - optional
+    ## A list of tags to attach to every metric and service check emitted by this instance.
+    ##
+    ## Learn more about tagging at https://docs.datadoghq.com/tagging
+    #
+    # tags:
+    #   - <KEY_1>:<VALUE_1>
+    #   - <KEY_2>:<VALUE_2>
 
-## @param min_collection_interval - number - optional - default: 15
-## This changes the collection interval of the check. For more information, see:
-## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval
-#
-# min_collection_interval: 15
+    ## @param service - string - optional
+    ## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
+    ##
+    ## Overrides any `service` defined in the `init_config` section.
+    #
+    # service: <SERVICE>
 
-## @param empty_default_hostname - boolean - optional - default: false
-## This forces the check to send metrics with no hostname.
-##
-## This is useful for cluster-level checks.
-#
-# empty_default_hostname: false
+    ## @param min_collection_interval - number - optional - default: 15
+    ## This changes the collection interval of the check. For more information, see:
+    ## https://docs.datadoghq.com/developers/write_agent_check/#collection-interval
+    #
+    # min_collection_interval: 15
 
-## @param metric_patterns - mapping - optional
-## A mapping of metrics to include or exclude, with each entry being a regular expression.
-##
-## Metrics defined in `exclude` will take precedence in case of overlap.
-#
-# metric_patterns:
-#   include:
-#   - <INCLUDE_REGEX>
-#   exclude:
-#   - <EXCLUDE_REGEX>
+    ## @param empty_default_hostname - boolean - optional - default: false
+    ## This forces the check to send metrics with no hostname.
+    ##
+    ## This is useful for cluster-level checks.
+    #
+    # empty_default_hostname: false
+
+    ## @param metric_patterns - mapping - optional
+    ## A mapping of metrics to include or exclude, with each entry being a regular expression.
+    ##
+    ## Metrics defined in `exclude` will take precedence in case of overlap.
+    #
+    # metric_patterns:
+    #   include:
+    #   - <INCLUDE_REGEX>
+    #   exclude:
+    #   - <EXCLUDE_REGEX>