diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 26793263e9..6ba56c7b3a 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -395,7 +395,6 @@ monasca_api_port: "8070"
 monasca_log_api_port: "{{ monasca_api_port }}"
 monasca_agent_forwarder_port: "17123"
 monasca_agent_statsd_port: "8125"
-monasca_grafana_server_port: "3001"
 
 murano_api_port: "8082"
 
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index a5cdbecd19..55e714b63f 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -409,9 +409,6 @@ monasca-agent
 [monasca-api:children]
 monasca
 
-[monasca-grafana:children]
-monasca
-
 [monasca-log-persister:children]
 monasca
 
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 4a73218aa9..5ddc48da3e 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -417,9 +417,6 @@ monasca-agent
 [monasca-api:children]
 monasca
 
-[monasca-grafana:children]
-monasca
-
 [monasca-log-persister:children]
 monasca
 
diff --git a/ansible/monasca_cleanup.yml b/ansible/monasca_cleanup.yml
index 8efb510150..11c50a7c95 100644
--- a/ansible/monasca_cleanup.yml
+++ b/ansible/monasca_cleanup.yml
@@ -2,7 +2,6 @@
 - name: Cleanup unused Monasca services
   hosts:
     - monasca-api
-    - monasca-grafana
     - monasca-log-persister
     - monasca-log-metrics
     - monasca-thresh
diff --git a/ansible/roles/common/templates/conf/input/00-global.conf.j2 b/ansible/roles/common/templates/conf/input/00-global.conf.j2
index 8b4afa5951..d4469c71b7 100644
--- a/ansible/roles/common/templates/conf/input/00-global.conf.j2
+++ b/ansible/roles/common/templates/conf/input/00-global.conf.j2
@@ -4,7 +4,6 @@
   @type tail
   path {% for service in fluentd_enabled_input_openstack_services %}/var/log/kolla/{{ service }}/*.log{% if not loop.last %},{% endif %}{% endfor %}
   exclude_path ["/var/log/kolla/monasca/agent*.log",
-                "/var/log/kolla/monasca/grafana.log",
                 "/var/log/kolla/monasca/monasca-api.log",
                 "/var/log/kolla/neutron/dnsmasq.log",
                 "/var/log/kolla/ironic/dnsmasq.log",
diff --git a/ansible/roles/common/templates/conf/input/09-monasca.conf.j2 b/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
index 1ae2b94681..cc58d1b0d2 100644
--- a/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
+++ b/ansible/roles/common/templates/conf/input/09-monasca.conf.j2
@@ -8,14 +8,3 @@
   format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} \S+) \| (?<log_level>\S+) \| (?<programname>\S+) \| (?<Payload>.*)$/
   time_key Timestamp
 </source>
-
-<source>
-  @type tail
-  path /var/log/kolla/monasca/grafana.log
-  pos_file /var/run/td-agent/monasca-grafana.pos
-  tag infra.*
-  format multiline
-  format_firstline /^t=\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{4} lvl=\S+ msg=.*$/
-  format1 /^t=(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{4}) lvl=(?<log_level>\S+) msg=(?<Payload>.*)$/
-  time_key Timestamp
-</source>
diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml
index e47ab7aa0b..0ffd6da76a 100644
--- a/ansible/roles/monasca/defaults/main.yml
+++ b/ansible/roles/monasca/defaults/main.yml
@@ -78,26 +78,6 @@ monasca_services:
     image: "{{ monasca_agent_image_full }}"
     volumes: "{{ monasca_agent_forwarder_default_volumes + monasca_agent_forwarder_extra_volumes }}"
     dimensions: "{{ monasca_agent_dimensions }}"
-  # TODO(dszumski): Remove monasca-grafana entry here and all other references after the
-  # Xena release. It exists here to support cleanup operations.
-  monasca-grafana:
-    container_name: monasca_grafana
-    group: monasca-grafana
-    enabled: false
-    image: "{{ monasca_grafana_image_full }}"
-    volumes: "{{ monasca_grafana_default_volumes + monasca_grafana_extra_volumes }}"
-    dimensions: "{{ monasca_grafana_dimensions }}"
-    haproxy:
-      monasca_grafana_server:
-        enabled: "{{ enable_monasca }}"
-        mode: "http"
-        external: false
-        port: "{{ monasca_grafana_server_port }}"
-      monasca_grafana_server_external:
-        enabled: "{{ enable_monasca }}"
-        mode: "http"
-        external: true
-        port: "{{ monasca_grafana_server_port }}"
 
 ####################
 # Databases
@@ -244,10 +224,6 @@ monasca_persister_image: "{{ docker_registry ~ '/' if docker_registry else '' }}
 monasca_persister_tag: "{{ monasca_tag }}"
 monasca_persister_image_full: "{{ monasca_persister_image }}:{{ monasca_persister_tag }}"
 
-monasca_grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ monasca_install_type }}-monasca-grafana"
-monasca_grafana_tag: "{{ monasca_tag }}"
-monasca_grafana_image_full: "{{ monasca_grafana_image }}:{{ monasca_grafana_tag }}"
-
 monasca_agent_dimensions: "{{ default_container_dimensions }}"
 monasca_api_dimensions: "{{ default_container_dimensions }}"
 monasca_log_api_dimensions: "{{ default_container_dimensions }}"
@@ -256,7 +232,6 @@ monasca_log_metrics_dimensions: "{{ default_container_dimensions }}"
 monasca_thresh_dimensions: "{{ default_container_dimensions }}"
 monasca_notification_dimensions: "{{ default_container_dimensions }}"
 monasca_persister_dimensions: "{{ default_container_dimensions }}"
-monasca_grafana_dimensions: "{{ default_container_dimensions }}"
 
 monasca_agent_collector_default_volumes:
   - "{{ node_config_directory }}/monasca-agent-collector/:{{ container_config_directory }}/:ro"
@@ -308,11 +283,6 @@ monasca_persister_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla"
-monasca_grafana_default_volumes:
-  - "{{ node_config_directory }}/monasca-grafana/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
 
 monasca_extra_volumes: "{{ default_extra_volumes }}"
 monasca_agent_collector_extra_volumes: "{{ monasca_extra_volumes }}"
@@ -324,7 +294,6 @@ monasca_log_metrics_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_thresh_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_notification_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_persister_extra_volumes: "{{ monasca_extra_volumes }}"
-monasca_grafana_extra_volumes: "{{ monasca_extra_volumes }}"
 
 ####################
 # OpenStack
diff --git a/ansible/site.yml b/ansible/site.yml
index 3a41f7ad18..a2ede492d4 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -890,7 +890,6 @@
     - monasca-agent-forwarder
     - monasca-agent-statsd
     - monasca-api
-    - monasca-grafana
     - monasca-log-persister
     - monasca-log-metrics
     - monasca-thresh
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index b14aa468a2..3e662b5ea8 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -473,9 +473,6 @@ monasca-agent
 [monasca-api:children]
 monasca
 
-[monasca-grafana:children]
-monasca
-
 [monasca-log-persister:children]
 monasca