diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 501b4b86e..d9a521d83 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -532,7 +532,7 @@ kolla_enable_etcd: "no"
 kolla_enable_fluentd: "yes"
 kolla_enable_freezer: "no"
 kolla_enable_gnocchi: "no"
-kolla_enable_grafana: "no"
+kolla_enable_grafana: "{{ kolla_enable_monasca | bool }}"
 kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitty | bool }}"
diff --git a/releasenotes/notes/enable-grafana-with-monasca-497d686e95d89242.yaml b/releasenotes/notes/enable-grafana-with-monasca-497d686e95d89242.yaml
new file mode 100644
index 000000000..bb199cb85
--- /dev/null
+++ b/releasenotes/notes/enable-grafana-with-monasca-497d686e95d89242.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Enables deployment of Grafana when Monasca is enabled, as a replacement for
+    the retired ``monasca-grafana`` image. See `story 2009717
+    <https://storyboard.openstack.org/#!/story/2009717>`__ for details.
+