From d505ca46ecfef48729b9b8eca17cfa82d67ce0ca Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 27 Sep 2018 09:17:41 +0000
Subject: [PATCH] Build and install Fluentd Monasca plugin

This is a simple output plugin for Fluentd which can forward logs
to the Monasca Log API.

Partially-Implements: blueprint monasca-containers
Change-Id: I599554052c3cb99ebcbcbc4d7ea1aeb57c573d2e
(cherry picked from commit 11611c67ea449df229fc7e88d3c9b545cf992a87)
---
 docker/fluentd/Dockerfile.j2                     | 16 ++++++++++++++++
 ...onasca-api-from-fluentd-1b653db78a8644e7.yaml |  5 +++++
 2 files changed, 21 insertions(+)
 create mode 100644 releasenotes/notes/support-posting-to-monasca-api-from-fluentd-1b653db78a8644e7.yaml

diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index af2452ac40..a3641ace23 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -15,7 +15,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% set fluentd_packages = [
         'fluentd',
+        'gcc-c++',
         'hostname',
+        'make',
+        'ruby-devel',
         'rubygem-fluent-plugin-elasticsearch',
         'rubygem-fluent-plugin-grok-parser',
         'rubygem-fluent-plugin-kubernetes_metadata_filter',
@@ -28,6 +31,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set fluentd_packages = [
         'g++',
         'make',
+        'ruby',
+        'ruby-dev',
         'td-agent'
     ] %}
 
@@ -69,6 +74,17 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ macros.install_fluent_plugins(fluentd_plugins | customizable("plugins")) }}
 
+# Build and install Fluentd output plugin for Monasca Log API
+ARG monasca_output_plugin_tag=0.0.1
+ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive/$monasca_output_plugin_tag.tar.gz
+ADD $monasca_output_plugin_url /tmp/fluentd-monasca.tar.gz
+RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
+    && cd /tmp/fluentd-monasca-* \
+    && gem build fluentd-monasca-output.gemspec \
+    && gem install fluentd-monasca-output-*.gem \
+    && fluent-gem install fluentd-monasca-output-*.gem \
+    && rm -rf /tmp/fluentd*
+
 {% endblock %}
 
 {% block fluentd_footer %}{% endblock %}
diff --git a/releasenotes/notes/support-posting-to-monasca-api-from-fluentd-1b653db78a8644e7.yaml b/releasenotes/notes/support-posting-to-monasca-api-from-fluentd-1b653db78a8644e7.yaml
new file mode 100644
index 0000000000..2113509ff6
--- /dev/null
+++ b/releasenotes/notes/support-posting-to-monasca-api-from-fluentd-1b653db78a8644e7.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The Monasca output plugin is now installed in the Fluentd container
+    to enable posting logs from Fluentd to the Monasca Log API.