diff --git a/Puppetfile_extras b/Puppetfile_extras
index 67974fae1..a948b6baf 100644
--- a/Puppetfile_extras
+++ b/Puppetfile_extras
@@ -65,10 +65,9 @@ mod 'pacemaker',
   :git => 'https://github.com/openstack/puppet-pacemaker',
   :ref => 'master'
 
-# NOTE(tkajinam): Pinnned due to LP#1862434
 mod 'collectd',
   :git => 'https://github.com/voxpupuli/puppet-collectd',
-  :ref => '25904923910c6e3316d762a1817fc10313b9ca21'
+  :ref => '20494e44a90073273a18fce71f4a602d5b5d0690'
 
 # see https://github.com/rdo-packages/puppet-keepalived-distgit/blob/rpm-master/puppet-keepalived.spec
 mod 'keepalived',
diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp
index 460ea8166..fa5e091cf 100644
--- a/manifests/profile/base/metrics/collectd.pp
+++ b/manifests/profile/base/metrics/collectd.pp
@@ -201,6 +201,11 @@
 #  as the send-to address for communications over the messaging link.
 #  Defaults to {}.
 #
+# [*amqp_send_queue_limit*]
+#  (Optional) Number. Number of data sets to be kept in memory, older sets
+#  will be discarded; if set to undef, this feature is disabled.
+#  Defaults to undef
+#
 # [*qdr_mode*]
 #  (Optional) String. Mode in which the QDR service, to which collectd
 #  should be connected, is running.
@@ -259,6 +264,7 @@ class tripleo::profile::base::metrics::collectd (
   $amqp_instances = {},
   $amqp_retry_delay = undef,
   $amqp_interval = undef,
+  $amqp_send_queue_limit = undef,
   $qdr_mode = hiera('tripleo::profile::base::metrics::qdr::router_mode', 'edge'),
   $service_names = hiera('service_names', []),
   $collectd_manage_repo = false,
@@ -341,17 +347,18 @@ class tripleo::profile::base::metrics::collectd (
       }
     } elsif !empty($amqp_host) {
       class { 'collectd::plugin::amqp1':
-        ensure         => 'present',
-        manage_package => true,
-        transport      => $amqp_transport_name,
-        host           => $amqp_host,
-        port           => $amqp_port,
-        user           => $amqp_user,
-        password       => $amqp_password,
-        address        => $amqp_address,
-        instances      => $amqp_instances,
-        retry_delay    => $amqp_retry_delay,
-        interval       => $amqp_interval,
+        ensure           => 'present',
+        manage_package   => true,
+        transport        => $amqp_transport_name,
+        host             => $amqp_host,
+        port             => $amqp_port,
+        user             => $amqp_user,
+        password         => $amqp_password,
+        address          => $amqp_address,
+        instances        => $amqp_instances,
+        retry_delay      => $amqp_retry_delay,
+        interval         => $amqp_interval,
+        send_queue_limit => $amqp_send_queue_limit,
       }
     } elsif !empty($gnocchi_server) or !empty($gnocchi_keystone_auth_url) {
       if !empty($gnocchi_server) {