From e0175350ae7785becb0807f230a755b0712e624a Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Wed, 5 Feb 2020 10:20:14 +0000
Subject: [PATCH] Install Fluentd Prometheus plugin out of the box

This plugin [1,2] supports a number of use cases which are likely
to be useful out of the box to users enabling either Monasca or
Prometheus:

1. As a system admin I want to monitor the status of Fluentd
   to ensure that it is functioning normally.
2. As a system admin I want to know the time to response for
   calls made to endpoints defined in HAProxy.

[1] https://docs.fluentd.org/deployment/monitoring-prometheus
[2] https://github.com/fluent/fluent-plugin-prometheus

Change-Id: I9790cd6c9d142a4a3ced6d5c9a9af621c3892eb0
(cherry picked from commit e20fe5eaa5eb6c46f815ce7295ecdcf67a4cd042)
---
 docker/fluentd/Dockerfile.j2                                 | 1 +
 .../add-fluentd-prometheus-plugin-b5c626db667c5675.yaml      | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/add-fluentd-prometheus-plugin-b5c626db667c5675.yaml

diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index e32c9c394a..c330ab878a 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -87,6 +87,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
         'fluent-plugin-grep',
         'fluent-plugin-grok-parser',
         'fluent-plugin-parser',
+        'fluent-plugin-prometheus',
         'fluent-plugin-rewrite-tag-filter',
     ] %}
 {% endif %}
diff --git a/releasenotes/notes/add-fluentd-prometheus-plugin-b5c626db667c5675.yaml b/releasenotes/notes/add-fluentd-prometheus-plugin-b5c626db667c5675.yaml
new file mode 100644
index 0000000000..3decf3623f
--- /dev/null
+++ b/releasenotes/notes/add-fluentd-prometheus-plugin-b5c626db667c5675.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The Prometheus plugin is now installed into the Fluentd container by
+    default.