diff --git a/ddev/changelog.d/21124.added b/ddev/changelog.d/21124.added new file mode 100644 index 0000000000000..f5e6ea1e47781 --- /dev/null +++ b/ddev/changelog.d/21124.added @@ -0,0 +1 @@ +Bump Datadog Checks Dev requirement in DDEV diff --git a/ddev/pyproject.toml b/ddev/pyproject.toml index 663c9fbf82caf..97dbd7178853d 100644 --- a/ddev/pyproject.toml +++ b/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", diff --git a/rabbitmq/assets/configuration/spec.yaml b/rabbitmq/assets/configuration/spec.yaml index 47540a9165182..ab918cc0ce13c 100644 --- a/rabbitmq/assets/configuration/spec.yaml +++ b/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: diff --git a/rabbitmq/changelog.d/21120.added b/rabbitmq/changelog.d/21120.added new file mode 100644 index 0000000000000..741dee05e3c07 --- /dev/null +++ b/rabbitmq/changelog.d/21120.added @@ -0,0 +1 @@ +Add rabbitmq_user and rabbitmq_pass to rabbitmq conf.yaml.example diff --git a/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py b/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py index 5813965f4b7f8..13f583332acff 100644 --- a/rabbitmq/datadog_checks/rabbitmq/config_models/defaults.py +++ b/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 diff --git a/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py b/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py index 8d350ae0ebbb8..624c9976a157a 100644 --- a/rabbitmq/datadog_checks/rabbitmq/config_models/instance.py +++ b/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 diff --git a/rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example b/rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example index bf5efb7edca3a..b59fdeeef0cdc 100644 --- a/rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example +++ b/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. #