[pull] master from DataDog:master

ddev/changelog.d/21124.added

@@ -0,0 +1 @@
+Bump Datadog Checks Dev requirement in DDEV

ddev/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "click~=8.1.6",
     "coverage",
     "datadog-api-client==2.20.0",
-    "datadog-checks-dev[cli]~=35.1",
+    "datadog-checks-dev[cli]~=35.2",
     "hatch>=1.8.1",
     "httpx",
     "jsonpointer",

rabbitmq/assets/configuration/spec.yaml

@@ -73,6 +73,16 @@ files:
         value:
           type: string
           example: http://localhost:15672/api/
+      - name: rabbitmq_user
+        description: The username to use for the RabbitMQ Management Plugin
+        value:
+          type: string
+          example: guest
+      - name: rabbitmq_pass
+        description: The password to use for the RabbitMQ Management Plugin
+        value:
+          type: string
+          example: guest
       - name: tag_families
         description: To tag queue "families" based off of regex matching.
         value:

rabbitmq/changelog.d/21120.added

@@ -0,0 +1 @@
+Add rabbitmq_user and rabbitmq_pass to rabbitmq conf.yaml.example

rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py

@@ -96,6 +96,14 @@ def instance_rabbitmq_api_url():
     return 'http://localhost:15672/api/'
 
 
+def instance_rabbitmq_pass():
+    return 'guest'
+
+
+def instance_rabbitmq_user():
+    return 'guest'
+
+
 def instance_request_size():
     return 16
 

rabbitmq/datadog_checks/rabbitmq/config_models/instance.py

@@ -146,6 +146,8 @@ class InstanceConfig(BaseModel):
     queues: Optional[tuple[str, ...]] = None
     queues_regexes: Optional[tuple[str, ...]] = None
     rabbitmq_api_url: Optional[str] = None
+    rabbitmq_pass: Optional[str] = None
+    rabbitmq_user: Optional[str] = None
     raw_line_filters: Optional[tuple[str, ...]] = None
     raw_metric_prefix: Optional[str] = None
     read_timeout: Optional[float] = None

rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example

@@ -684,6 +684,16 @@ instances:
     #
     # rabbitmq_api_url: http://localhost:15672/api/
 
+    ## @param rabbitmq_user - string - optional - default: guest
+    ## The username to use for the RabbitMQ Management Plugin
+    #
+    # rabbitmq_user: guest
+
+    ## @param rabbitmq_pass - string - optional - default: guest
+    ## The password to use for the RabbitMQ Management Plugin
+    #
+    # rabbitmq_pass: guest
+
     ## @param tag_families - boolean - optional - default: false
     ## To tag queue "families" based off of regex matching.
     #