From 4a0d92fa97dd58b70529a2edfc0f513e7bfda67f Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <krislamo@uga.edu>
Date: Wed, 4 Mar 2020 11:28:29 -0500
Subject: [PATCH] Remove fluentd container and minor reorganization

---
 Vagrantfile                          |  3 ++-
 docker-compose.yml                   | 12 ------------
 fluentd/Dockerfile                   | 10 ----------
 fluentd/fluent.conf => td-agent.conf |  0
 4 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 fluentd/Dockerfile
 rename fluentd/fluent.conf => td-agent.conf (100%)

diff --git a/Vagrantfile b/Vagrantfile
index e00e6ce..62c80e2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,7 +37,8 @@ Vagrant.configure("2") do |config|
     cp --update /vagrant/td-agent.repo /etc/yum.repos.d/
     yum check-update
     yum install -y td-agent
-    systemctl start td-agent
+    cp /vagrant/td-agent.conf /etc/td-agent/td-agent.conf
+    systemctl restart td-agent
     systemctl -q enable td-agent
 
     # Convenience
diff --git a/docker-compose.yml b/docker-compose.yml
index ec29a40..709a089 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,18 +25,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
-  fluentd:
-    build: ./fluentd
-    restart: always
-    volumes:
-      - /var/log:/var/log/hostlogs
-    networks:
-      - graylog
-    ports:
-      - 24224:24224
-      - 24224:24224/udp
-      - 5140:5140/udp
-
   mongo:
     image: mongo:4.2.2
     restart: always
diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile
deleted file mode 100644
index 2f1e645..0000000
--- a/fluentd/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM fluent/fluentd:v1.9.0-debian-1.0
-USER root
-RUN apt-get update \
- && apt-get -y install --no-install-recommends wget \
- && rm -rf /var/lib/apt/lists/*
-RUN gem install fluent-plugin-rewrite-tag-filter
-RUN gem install gelf
-RUN cd /fluentd/plugins \
- && wget -q https://raw.githubusercontent.com/emsearcy/fluent-plugin-gelf/master/lib/fluent/plugin/out_gelf.rb
-COPY fluent.conf /fluentd/etc/
diff --git a/fluentd/fluent.conf b/td-agent.conf
similarity index 100%
rename from fluentd/fluent.conf
rename to td-agent.conf