diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-16 23:28:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-16 23:28:02 +0000 |
| commit | 969414948079797b8949cd6ec4ee3f2f30cbd347 (patch) | |
| tree | 762e2e62813ef336cf83138dd9eb626fcf194cbc | |
| parent | 14ef775c6ea849964d9afa03575a415687d9b51c (diff) | |
| parent | e20fe5eaa5eb6c46f815ce7295ecdcf67a4cd042 (diff) | |
| download | kolla-969414948079797b8949cd6ec4ee3f2f30cbd347.tar.gz kolla-969414948079797b8949cd6ec4ee3f2f30cbd347.zip | |
Merge "Install Fluentd Prometheus plugin out of the box"
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | releasenotes/notes/add-fluentd-prometheus-plugin-b5c626db667c5675.yaml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index e32c9c394..c330ab878 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 000000000..3decf3623 --- /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. |