feat: add cloudwatch & pin elasticsearch

Author: stevehipwell

CHANGELOG.md

@@ -5,38 +5,48 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- ## [Unreleased]
+<!-- ## [Unreleased] - yyyy-MM-dd
 ### Added
 ### Changed
 ### Deprecated
 ### Removed -->
 
+## [v1.14.2] - 2021-10-28
+
+### Added
+
+- New plugin [fluent-plugin-cloudwatch-logs](https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs) (`v0.14.2`).
+
+### Changed
+
+- Pinned _Elasticsearch_ gems to `v7.13.3` to stop it blocking _OpenSearch_.
+
 ## [v1.14.1] - 2021-10-04
 
 ### Changed
 
-- Updated _Fluentd_ image to [v1.14.1](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1141---20210929)
+- Updated _Fluentd_ image to [v1.14.1](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1141---20210929).
 
 ## [v1.14.0] - 2021-08-31
 
 ### Changed
 
-- Updated _Fluentd_ image to [v1.14.0](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1140---20210830)
+- Updated _Fluentd_ image to [v1.14.0](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1140---20210830).
 
 ## [v1.13.3] - 2021-07-27
 
 ### Changed
 
-- Updated _Fluentd_ image to [v1.13.3](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1133---20210727)
+- Updated _Fluentd_ image to [v1.13.3](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1133---20210727).
 
 ## [v1.13.2] - 2021-07-13
 
 ### Changed
 
-- Updated _Fluentd_ image to [v1.13.2](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1132---20210712)
+- Updated _Fluentd_ image to [v1.13.2](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1132---20210712).
 
 ## [v1.13.1] - 2021-07-01
 
 ### Changed
 
-- Updated _Fluentd_ image to [v1.13.1](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1131---20210625)
+- Updated _Fluentd_ image to [v1.13.1](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#release-v1131---20210625).

Dockerfile

@@ -15,9 +15,13 @@ RUN set -eu; \
 RUN set -eu; \
   apk add --no-cache --virtual .build-deps sudo build-base ruby-dev; \
   sudo gem install \
+  elasticsearch-api:7.13.3 \
+  elasticsearch-transport:7.13.3 \
+  elasticsearch:7.13.3 \
   fluent-plugin-aws-elasticsearch-service \
   fluent-plugin-azure-loganalytics \
   fluent-plugin-azurestorage-gen2 \
+  fluent-plugin-cloudwatch-logs \
   fluent-plugin-concat \
   fluent-plugin-datadog \
   fluent-plugin-elasticsearch \

README.md

@@ -1,5 +1,6 @@
 # Fluentd Aggregator
 
+[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/stevehipwell/fluentd-aggregator?sort=semver)](https://hub.docker.com/r/stevehipwell/fluentd-aggregator)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 A [Fluentd](https://www.fluentd.org/) _Docker_ image to be used for log aggregation and based on the official [Fluentd Docker image](https://github.com/fluent/fluentd-docker-image).
@@ -15,10 +16,11 @@ The following plugins have been added to the base image.
 - [fluent-plugin-aws-elasticsearch-service](https://github.com/atomita/fluent-plugin-aws-elasticsearch-service)
 - [fluent-plugin-azure-loganalytics](https://github.com/yokawasa/fluent-plugin-azure-loganalytics)
 - [fluent-plugin-azurestorage-gen2](https://github.com/oleewere/fluent-plugin-azurestorage-gen2)
+- [fluent-plugin-cloudwatch-logs](https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs)
 - [fluent-plugin-concat](https://github.com/fluent-plugins-nursery/fluent-plugin-concat)
 - [fluent-plugin-datadog](https://github.com/DataDog/fluent-plugin-datadog)
 - [fluent-plugin-elasticsearch](https://docs.fluentd.org/output/elasticsearch)
-- [fluent-plugin-grafana-loki](https://github.com/grafana/loki/tree/master/cmd/fluentd)
+- [fluent-plugin-grafana-loki](https://github.com/grafana/loki/tree/main/clients/cmd/fluentd)
 - [fluent-plugin-prometheus](https://github.com/fluent/fluent-plugin-prometheus)
 - [fluent-plugin-record-modifier](https://github.com/repeatedly/fluent-plugin-record-modifier)
 - [fluent-plugin-rewrite-tag-filter](https://github.com/fluent/fluent-plugin-rewrite-tag-filter)