Resolving Merge Conflicts.
Included Log Aggregators and Log Forwarders as per review comments.
Spins two fluentd forwarder and one each fluentd aggregators-active, fluentd aggregator-standby
Commit to enable Fluentd Clustering in Voltha
https://jira.opencord.org/browse/VOL-214
Resolved merge conflicts .
Change-Id: I9d45f751b4297c707284582e8050a168229f2e5a
diff --git a/compose/docker-compose-fluentd-cluster.yml b/compose/docker-compose-fluentd-cluster.yml
new file mode 100644
index 0000000..c21f37d
--- /dev/null
+++ b/compose/docker-compose-fluentd-cluster.yml
@@ -0,0 +1,60 @@
+version: "3"
+services:
+
+#
+# Deploying a Fluentd cluster using this file assumes that overlay network 'voltha_net'
+# has already been created. To deploy the fluentd cluster, issue the command:
+#
+# docker stack deploy -c docker-compose-fluentd-cluster.yml fluentd
+#
+# This spins up two Fluentd Forwarders and one each Fluentd Aggregator-Active, Fluentd Aggregator-Standby.
+# The forwards listens for voltha components logs on port 23224 and sends them towards Fluentd Aggregator.
+# Fluentd Aggregator writes them to their host mounted disk
+#
+
+ fluentdactv:
+ image: fluent/fluentd
+ deploy:
+ replicas: 1
+ restart_policy:
+ condition: on-failure
+ networks:
+ - voltha-net
+ ports:
+ - "24224"
+ volumes:
+ - "/tmp/fluentd:/fluentd/log"
+
+ fluentdstby:
+ image: fluent/fluentd
+ deploy:
+ replicas: 1
+ restart_policy:
+ condition: on-failure
+ networks:
+ - voltha-net
+ ports:
+ - "24224"
+ volumes:
+ - "/tmp/fluentd:/fluentd/log"
+
+ fluentd:
+ image: cord/fluentd
+ deploy:
+ mode: replicated
+ replicas: 2
+ restart_policy:
+ condition: on-failure
+ environment:
+ SERVICE_24224_NAME: "fluentd-intake"
+ networks:
+ - voltha-net
+ ports:
+ - "24224:24224"
+
+
+networks:
+ voltha-net:
+ external:
+ name: voltha_net
+