diff --git a/ansible/roles/common/templates/conf/output/00-local.conf.j2 b/ansible/roles/common/templates/conf/output/00-local.conf.j2
index f9753eb9d61d82a7115a545101404613432557fb..22597cb40135291cfc9b9229abfa82ea40f6aa3a 100644
--- a/ansible/roles/common/templates/conf/output/00-local.conf.j2
+++ b/ansible/roles/common/templates/conf/output/00-local.conf.j2
@@ -40,6 +40,9 @@
        domain_id default
        project_name {{ monasca_control_plane_project }}
        message_field_name Payload
+       buffer_type file
+       buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_swift_facility }}.*
+       max_retry_wait 1800s
     </store>
 {% endif %}
 </match>
@@ -88,6 +91,9 @@
        domain_id default
        project_name {{ monasca_control_plane_project }}
        message_field_name Payload
+       buffer_type file
+       buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_haproxy_facility }}.*
+       max_retry_wait 1800s
     </store>
 {% endif %}
 </match>
diff --git a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2 b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
index dad304e6c12e33e1bfacf2b016401334282872e8..88039b43604c01cc4f7f370eec47d4dfcf30b8eb 100644
--- a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
+++ b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
@@ -10,5 +10,8 @@
        domain_id default
        project_name {{ monasca_control_plane_project }}
        message_field_name Payload
+       buffer_type file
+       buffer_path /var/lib/fluentd/data/monasca.buffer/openstack.*
+       max_retry_wait 1800s
     </store>
 </match>
diff --git a/releasenotes/notes/enable-buffering-to-file-for-monasca-logs-88ca66cc4d6cda3b.yaml b/releasenotes/notes/enable-buffering-to-file-for-monasca-logs-88ca66cc4d6cda3b.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..48ec8f11297ebcc89ef8ef0c02e49bcb2d0cce1d
--- /dev/null
+++ b/releasenotes/notes/enable-buffering-to-file-for-monasca-logs-88ca66cc4d6cda3b.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Fluentd now buffers logs locally to file when the Monasca API is
+    unreachable.