diff --git a/.ci/ubuntu/cluster/rmq/21-enable-management-collector.conf b/.ci/ubuntu/cluster/rmq/21-enable-management-collector.conf new file mode 100644 index 0000000..913a49a --- /dev/null +++ b/.ci/ubuntu/cluster/rmq/21-enable-management-collector.conf @@ -0,0 +1,3 @@ +# This file might be required to test with images built from main. +# Images in pivotalrabbitmq/rabbitmq disable the metrics collector by default. +management_agent.disable_metrics_collector = false \ No newline at end of file diff --git a/.ci/ubuntu/cluster/rmq/Dockerfile b/.ci/ubuntu/cluster/rmq/Dockerfile index 6ddf950..a52e7f6 100644 --- a/.ci/ubuntu/cluster/rmq/Dockerfile +++ b/.ci/ubuntu/cluster/rmq/Dockerfile @@ -12,5 +12,6 @@ COPY --chown=rabbitmq:rabbitmq --chmod=0644 enabled_plugins /etc/rabbitmq/enable COPY --chown=rabbitmq:rabbitmq rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf COPY --chown=rabbitmq:rabbitmq rabbitmq.conf /etc/rabbitmq/rabbitmq.conf COPY --chown=rabbitmq:rabbitmq advanced.config /etc/rabbitmq/advanced.config +COPY --chown=rabbitmq:rabbitmq 21-enable-management-collector.conf /etc/rabbitmq/conf.d/21-enable-management-collector.conf EXPOSE 4369 5671 5672 15672 15692 25672 35672-35682 diff --git a/.ci/ubuntu/one-node/21-enable-management-collector.conf b/.ci/ubuntu/one-node/21-enable-management-collector.conf new file mode 100644 index 0000000..26710ae --- /dev/null +++ b/.ci/ubuntu/one-node/21-enable-management-collector.conf @@ -0,0 +1,3 @@ +# This file is required to test with images built from main. +# Images in pivotalrabbitmq/rabbitmq disable the metrics collector by default. +management_agent.disable_metrics_collector = false \ No newline at end of file diff --git a/.ci/ubuntu/one-node/gha-setup.sh b/.ci/ubuntu/one-node/gha-setup.sh index 77e9cee..a4c7efa 100755 --- a/.ci/ubuntu/one-node/gha-setup.sh +++ b/.ci/ubuntu/one-node/gha-setup.sh @@ -90,6 +90,7 @@ function start_rabbitmq --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro" \ --volume "$GITHUB_WORKSPACE/.ci/certs:/etc/rabbitmq/certs:ro" \ --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/advanced.config:/etc/rabbitmq/advanced.config:ro" \ + --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/21-enable-management-collector.conf:/etc/rabbitmq/conf.d/21-enable-management-collector.conf:ro" \ --volume "$GITHUB_WORKSPACE/.ci/ubuntu/log:/var/log/rabbitmq" \ "$rabbitmq_image" } diff --git a/Tests/Management/ManagementTests.cs b/Tests/Management/ManagementTests.cs index 3d0a3a4..b590183 100644 --- a/Tests/Management/ManagementTests.cs +++ b/Tests/Management/ManagementTests.cs @@ -453,6 +453,6 @@ public async Task PurgeQueueShouldReturnErrorForStream() await queueSpec.DeclareAsync(); await PublishAsync(queueSpec, 19); await WaitUntilQueueMessageCount(_queueName, 19); - await Assert.ThrowsAsync(() => queueSpec.PurgeAsync()); + await Assert.ThrowsAsync(queueSpec.PurgeAsync); } }