diff --git a/manifests/site.pp b/manifests/site.pp
index 35f0257a03..4547c85b89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -199,6 +199,7 @@ node 'puppetdb01.openstack.org' {
 # Node-OS: trusty
 node 'graphite.openstack.org' {
   $statsd_hosts = ['git.openstack.org',
+                   'firehose01.openstack.org',
                    'logstash.openstack.org',
                    'nodepool.openstack.org',
                    'nl01.openstack.org',
@@ -530,6 +531,7 @@ node /^firehose\d+\.openstack\.org$/ {
     imap_hostname       => hiera('lpmqtt_imap_server'),
     imap_username       => hiera('lpmqtt_imap_username'),
     imap_password       => hiera('lpmqtt_imap_password'),
+    statsd_host         => 'graphite.openstack.org',
   }
 }
 
diff --git a/modules.env b/modules.env
index ac04c9a476..b037cdb44a 100644
--- a/modules.env
+++ b/modules.env
@@ -129,6 +129,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mailman"]="origi
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mediawiki"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-meetbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mosquitto"]="origin/master"
+INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mqtt_statsd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mysql_backup"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-nodepool"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-odsreg"]="origin/master"
diff --git a/modules/openstack_project/manifests/firehose.pp b/modules/openstack_project/manifests/firehose.pp
index 2949f43d02..1eadf8e6f6 100644
--- a/modules/openstack_project/manifests/firehose.pp
+++ b/modules/openstack_project/manifests/firehose.pp
@@ -26,6 +26,7 @@ class openstack_project::firehose (
   $mqtt_hostname = 'firehose.openstack.org',
   $mqtt_password,
   $mqtt_username = 'infra',
+  $statsd_host,
   $ca_file,
   $cert_file,
   $key_file,
@@ -99,4 +100,10 @@ class openstack_project::firehose (
     imap_use_ssl  => false,
     imap_delete_old => true,
   }
+
+  include mqtt_statsd
+  class {'mqtt_statsd::server':
+    mqtt_hostname   => $mqtt_hostname,
+    statsd_hostname => $statsd_host,
+  }
 }