diff --git a/Vagrantfile b/Vagrantfile
index 4f9ff6d..d944ada 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,6 +45,17 @@ Vagrant.configure("2") do |config|
# Convenience
yum install -y vim
+ # Install rsyslog
+ yum install -y rsyslog
+ systemctl start rsyslog
+ systemctl -q enable rsyslog
+
+ # Add rsyslog forwarding option if it does not exist
+ if ! grep -q "127.0.0.1:5140" /etc/rsyslog.conf; then
+ echo "*.* @127.0.0.1:5140" >> /etc/rsyslog.conf
+ systemctl restart rsyslog
+ fi
+
# Install td-agent
cp /vagrant/td-agent.repo /etc/yum.repos.d/
yum check-update
@@ -132,17 +143,6 @@ Vagrant.configure("2") do |config|
systemctl start httpd
systemctl -q enable httpd
- # Install rsyslog
- yum install -y rsyslog
- systemctl start rsyslog
- systemctl -q enable rsyslog
-
- # Add rsyslog forwarding option if it does not exist
- if ! grep -q "127.0.0.1:5140" /etc/rsyslog.conf; then
- echo "*.* @127.0.0.1:5140" >> /etc/rsyslog.conf
- systemctl restart rsyslog
- fi
-
# Configure td-agent
cp /vagrant/td-agent.conf /etc/td-agent/td-agent.conf
mkdir -p /var/log/containers
diff --git a/docker-compose.yml b/docker-compose.yml
index 709a089..e2704eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,12 +24,24 @@ services:
- "traefik.enable=true"
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
+ logging:
+ driver: "fluentd"
+ options:
+ fluentd-address: "tcp://127.0.0.1:24224"
+ fluentd-async-connect: "true"
+ tag: traefik
mongo:
image: mongo:4.2.2
restart: always
networks:
- graylog
+ logging:
+ driver: "fluentd"
+ options:
+ fluentd-address: "tcp://127.0.0.1:24224"
+ fluentd-async-connect: "true"
+ tag: graylog.db
elasticsearch:
image: elasticsearch:6.8.6
@@ -45,6 +57,12 @@ services:
hard: -1
networks:
- graylog
+ logging:
+ driver: "fluentd"
+ options:
+ fluentd-address: "tcp://127.0.0.1:24224"
+ fluentd-async-connect: "true"
+ tag: graylog.elasticsearch
graylog:
image: graylog/graylog:3.2.2
@@ -76,6 +94,12 @@ services:
- 12201:12201
# GELF UDP
- 12201:12201/udp
+ logging:
+ driver: "fluentd"
+ options:
+ fluentd-address: "tcp://127.0.0.1:24224"
+ fluentd-async-connect: "true"
+ tag: graylog
networks:
traefik-net:
diff --git a/td-agent-server.conf b/td-agent-server.conf
index c3e7373..a029c7f 100644
--- a/td-agent-server.conf
+++ b/td-agent-server.conf
@@ -9,6 +9,17 @@
ca_private_key_passphrase test
+
+
+
+
@type parser
key_name message
diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml
index 58229ae..352b94a 100644
--- a/wordpress/docker-compose.yml
+++ b/wordpress/docker-compose.yml
@@ -11,6 +11,12 @@ services:
MYSQL_USER: wordpress
MYSQL_PASSWORD: Password1
MYSQL_RANDOM_ROOT_PASSWORD: '1'
+ logging:
+ driver: "fluentd"
+ options:
+ fluentd-address: "tcp://127.0.0.1:24224"
+ fluentd-async-connect: "true"
+ tag: devel.kris.db
wordpress:
depends_on: