diff --git a/tasks/configure.yml b/tasks/configure.yml
index fa237e8f6303ae3f3e94cf3aba37ff38b861387d..4715daf7312510ef1fc2b477e7df1c4c23b3aa33 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -38,6 +38,19 @@
   notify:
     - Restart NetData
 
+- name: Configure Go Plugins
+  template:
+    src: '{{ item }}'
+    dest: /etc/netdata/go.d/{{ item }}
+    owner: netdata
+    group: netdata
+    mode: 0644
+    backup: yes
+  with_items:
+    - fluentd.conf
+  notify:
+    - Restart NetData
+
 - name: Get a list of all health config files
   shell: ls /usr/lib/netdata/conf.d/health.d/*.conf -1
   register: health_list
diff --git a/tasks/install.yml b/tasks/install.yml
index 833e77b77a482409023902833660e9af93c786ea..1713b6857355636aa0486a0bc728311e472abde3 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -29,15 +29,6 @@
     chdir: /opt/{{ netdata_local_archive|default('netdata') }}
   when: netdata_clone.changed or netdata_extract.changed
 
-- name: Install Custom Charts
-  template:
-    src: '{{ item }}.chart.sh'
-    dest: /usr/libexec/netdata/charts.d/{{ item }}.chart.sh
-  with_items:
-    - fluentd_buffer
-  notify:
-    - Restart NetData
-
 - name: Install Custom Alerts
   template:
     src: health/{{ item }}.conf
diff --git a/templates/fluentd.conf b/templates/fluentd.conf
new file mode 100644
index 0000000000000000000000000000000000000000..cd570cdb9a6a8592a9fa12b17f8d3bc000b846ad
--- /dev/null
+++ b/templates/fluentd.conf
@@ -0,0 +1,3 @@
+jobs:
+  - name: local
+    url: http://127.0.0.1:24220
diff --git a/templates/fluentd_buffer.chart.sh b/templates/fluentd_buffer.chart.sh
deleted file mode 100644
index 17ff95009c6271ace4fcfda1e5229e15c42cdb40..0000000000000000000000000000000000000000
--- a/templates/fluentd_buffer.chart.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-fluentd_buffer_update_every=5
-fluentd_buffer_priority=12000
-fluentd_buffer_value1=0
-fluentd_buffer_last=0
-fluentd_buffer_count=0
-
-fluentd_buffer_get() {
-  fluentd_buffer_value1=$(find /var/log/td-agent/buffer -type f | wc -l)
-  return 0
-}
-
-fluentd_buffer_check() {
-  return 0
-}
-
-fluentd_buffer_create() {
-  cat <<EOF
-CHART fluentd_buffer.files '' "Files in buffer" "files" fluentd fluentd.countfiles line $((fluentd_buffer_priority + 1)) $fluentd_buffer_update_every
-DIMENSION countfiles '' absolute 1 1
-EOF
-  return 0
-}
-
-fluentd_buffer_update() {
-  fluentd_buffer_get || return 1
-
-  cat <<VALUESEOF
-BEGIN fluentd_buffer.files $1
-SET countfiles = $fluentd_buffer_value1
-END
-VALUESEOF
-
-  return 0
-}
diff --git a/templates/health/fluentd_buffer.conf b/templates/health/fluentd_buffer.conf
index 7cdc672ebe8ff33dac1a61ef25da230dfc8c64c0..cb7cfd41a2682734a7cac158e9a997b67feb16c2 100644
--- a/templates/health/fluentd_buffer.conf
+++ b/templates/health/fluentd_buffer.conf
@@ -1,5 +1,5 @@
- alarm: fluentd_buffer_files
-    on: fluentd_buffer.files
+ alarm: fluentd_local.buffer_queue_length
+    on: fluentd_local.buffer_queue_length
     os: linux
  hosts: *
 lookup: max -5s unaligned