diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index 0734c92..edaf58b 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -1,6 +1,7 @@
 data_directory_base: /mnt/data
 git_ssh_port: 56287
 elasticsearch_port: 14653
+fluent_forward_port: 24224
 concourse_public_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSVLcr617iJt+hqLFSsOQy1JeueLIAj1eRfuI+KeZAu pim@x260"
 
 nfs_shares:
diff --git a/ansible/roles/monitoring/docker-stack.yml.j2 b/ansible/roles/monitoring/docker-stack.yml.j2
index 7d15a4d..c8639bc 100644
--- a/ansible/roles/monitoring/docker-stack.yml.j2
+++ b/ansible/roles/monitoring/docker-stack.yml.j2
@@ -103,7 +103,7 @@ services:
   fluentd:
     image: git.kun.is/pim/fluentd:1.0.1
     ports:
-      - 24224:24224
+      - {{ fluent_forward_port }}:24224
     configs:
       - source: fluentconf
         target: /fluentd/etc/fluent.conf
diff --git a/ansible/roles/monitoring/elasticsearch.yml.j2 b/ansible/roles/monitoring/elasticsearch.yml.j2
index 7d710c7..ce36414 100644
--- a/ansible/roles/monitoring/elasticsearch.yml.j2
+++ b/ansible/roles/monitoring/elasticsearch.yml.j2
@@ -2,12 +2,18 @@
 apiVersion: 1
 
 datasources:
-  - name: Elasticsearch
+  - name: cpu
     type: elasticsearch
     access: proxy
     url: http://maestro.dmz:14653
     jsonData:
-      # index: '[metrics-]YYYY.MM.DD'
-      interval: Daily
+      index: 'fluentd.cpu'
       timeField: '@timestamp'
 
+  - name: memory
+    type: elasticsearch
+    access: proxy
+    url: http://maestro.dmz:14653
+    jsonData:
+      index: 'fluentd.memory'
+      timeField: '@timestamp'
diff --git a/ansible/roles/monitoring/fluent.conf.j2 b/ansible/roles/monitoring/fluent.conf.j2
index 84895d9..f25f89e 100644
--- a/ansible/roles/monitoring/fluent.conf.j2
+++ b/ansible/roles/monitoring/fluent.conf.j2
@@ -3,14 +3,15 @@
 # This is used by log forwarding and the fluent-cat command
 <source>
   @type forward
-  port 24224
+  port {{ fluent_forward_port }}
 </source>
 
-<match cool.testje>
+<match *>
   @type elasticsearch
   host maestro.dmz
   port {{ elasticsearch_port }}
   include_timestamp true
+  index_name fluentd.${tag}
 </match>
 
 <system>