diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 9d50f330f..9db28046a 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -343,6 +343,10 @@
 #  (optional) Enable or not Ceph RadosGW binding
 #  Defaults to hiera('ceph_rgw_enabled', false)
 #
+# [*ceph_grafana*]
+#  (optional) Enable or not Ceph Grafana dashboard binding
+#  Defaults to hiera('ceph_grafana-server_enabled', false)
+#
 # [*opendaylight*]
 #  (optional) Enable or not OpenDaylight binding
 #  Defaults to hiera('opendaylight_api_enabled', false)
@@ -380,6 +384,10 @@
 #  (optional) Specify the network ceph_rgw is running on.
 #  Defaults to hiera('ceph_rgw_network', undef)
 #
+# [*ceph_grafana_network*]
+#  (optional) Specify the network ceph_grafana is running on.
+#  Defaults to hiera('ceph_grafana_network', undef)
+#
 # [*cinder_network*]
 #  (optional) Specify the network cinder is running on.
 #  Defaults to hiera('cinder_api_network', undef)
@@ -583,6 +591,8 @@
 #    'zaqar_api_ssl_port' (Defaults to 13888)
 #    'ceph_rgw_port' (Defaults to 8080)
 #    'ceph_rgw_ssl_port' (Defaults to 13808)
+#    'ceph_grafana_port' (Defaults to 3100)
+#    'ceph_grafana_ssl_port' (Defaults to 3100)
 #    'zaqar_ws_port' (Defaults to 9000)
 #    'zaqar_ws_ssl_port' (Defaults to 9000)
 #  * Note that for zaqar's websockets we don't support having a different
@@ -639,6 +649,7 @@ class tripleo::haproxy (
   $aodh                        = hiera('aodh_api_enabled', false),
   $panko                       = hiera('panko_api_enabled', false),
   $barbican                    = hiera('barbican_api_enabled', false),
+  $ceph_grafana                = hiera('ceph_grafana-server_enabled', false),
   $gnocchi                     = hiera('gnocchi_api_enabled', false),
   $mistral                     = hiera('mistral_api_enabled', false),
   $swift_proxy_server          = hiera('swift_proxy_enabled', false),
@@ -678,6 +689,7 @@ class tripleo::haproxy (
   $glance_api_network          = hiera('glance_api_network', undef),
   $gnocchi_network             = hiera('gnocchi_api_network', undef),
   $heat_api_network            = hiera('heat_api_network', undef),
+  $ceph_grafana_network        = hiera('ceph_grafana-server_network', undef),
   $heat_cfn_network            = hiera('heat_api_cfn_network', undef),
   $horizon_network             = hiera('horizon_network', undef),
   $ironic_inspector_network    = hiera('ironic_inspector_network', undef),
@@ -783,6 +795,8 @@ class tripleo::haproxy (
     ceph_rgw_ssl_port => 13808,
     zaqar_ws_port => 9000,
     zaqar_ws_ssl_port => 9000,
+    ceph_grafana_port => 3100,
+    ceph_grafana_ssl_port => 3100,
   }
   $ports = merge($default_service_ports, $service_ports)
 
@@ -1038,6 +1052,21 @@ class tripleo::haproxy (
     }
   }
 
+  if $ceph_grafana {
+    ::tripleo::haproxy::endpoint { 'ceph_grafana':
+      public_virtual_ip => $controller_virtual_ip,
+      internal_ip       => hiera('ceph_grafana-server_vip', $controller_virtual_ip),
+      service_port      => $ports[ceph_grafana_port],
+      ip_addresses      => hiera('ceph_grafana-server_node_ips', $controller_hosts_real),
+      server_names      => hiera('ceph_grafana-server_node_names', $controller_hosts_names_real),
+      mode              => 'http',
+      public_ssl_port   => $ports[ceph_grafana_ssl_port],
+      listen_options    => merge($default_listen_options, { 'option' => [ 'httpchk HEAD /' ] }),
+      service_network   => $ceph_grafana_network,
+      member_options    => union($haproxy_member_options, $internal_tls_member_options),
+    }
+  }
+
   $nova_api_vip = hiera('nova_api_vip', $controller_virtual_ip)
   if $nova_osapi {
     ::tripleo::haproxy::endpoint { 'nova_osapi':
diff --git a/releasenotes/notes/ceph_grafana_endpoint-0e220cb59ee679e0.yaml b/releasenotes/notes/ceph_grafana_endpoint-0e220cb59ee679e0.yaml
new file mode 100644
index 000000000..d01e0686c
--- /dev/null
+++ b/releasenotes/notes/ceph_grafana_endpoint-0e220cb59ee679e0.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds ceph_grafana endpoint and ceph_grafana_port to configure
+    the ceph-dashboard service