Merge branch 'telegraf-1.15' into 'master'

Temporarily disable inputs.filecount in telegraf

See merge request !392

roles/telegraf/tasks/main.yml

@@ -85,6 +85,21 @@
   tags:
     - configuration
 
+# Commented out by KW 13th Oct 2020 - will restore shortly
+#- name: Install filecount plugin for /home counts
+#  template:
+#    src: inputs.filecount.conf.j2
+#    dest: /etc/telegraf/telegraf.d/inputs.filecount.conf
+#    owner: telegraf
+#    group: telegraf
+#    mode: '640'
+#  notify:
+#    - "restart telegraf"
+#  become: true
+#  become_user: root
+#  tags:
+#    - configuration
+
 - name: Install multifile plugin for mlx hw_counters
   template:
     src: inputs.multifile_mlx.conf.j2

roles/telegraf/templates/inputs.filecount.conf

+# Read metrics about the number of files in /home
+[[inputs.filecount]]
+  directories = ["/home"]
+  recursive = false
+  regular_only = false
+  interval = "60s"
\ No newline at end of file

roles/telegraf/templates/telegraf.conf.j2

@@ -119,13 +119,6 @@
   # Uncomment the following line if you do not need disk serial numbers.
   # skip_serial_number = true
 
-# Read metrics about the number of files in /home
-[[inputs.filecount]]
-  directories = ["/home"]
-  recursive = false
-  regular_only = false
-  interval = "60s"
-
 # Collect statistics about itself
 [[inputs.internal]]
  ## If true, collect telegraf memory stats.