Merge branch 'telegraf-1.15' into 'master'

Update telegraf config to ignore more ethX interfaces in ethtool plugin

See merge request !389

roles/telegraf/tasks/main.yml

@@ -71,6 +71,20 @@
   tags:
     - configuration
 
+- name: Install ethtool plugin for mlx interfaces
+  template:
+    src: inputs.ethtool.conf.j2
+    dest: /etc/telegraf/telegraf.d/inputs.ethtool.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.ethtool.conf.j2

+# Returns ethtool statistics for given interfaces
+[[inputs.ethtool]]
+  interval = "60s"
+  # List of interfaces to pull metrics for
+  # interface_include = ["mlx0", "p1p1"]
+
+  # List of interfaces to ignore when pulling metrics.
+  interface_exclude = ["eth0", "eth00", "eth1", "eth2", "lo", "virbr0", "virbr0-nic"]
\ No newline at end of file

roles/telegraf/templates/telegraf.conf.j2

@@ -119,15 +119,6 @@
   # Uncomment the following line if you do not need disk serial numbers.
   # skip_serial_number = true
 
-# Returns ethtool statistics for given interfaces
-[[inputs.ethtool]]
-  interval = "60s"
-  # List of interfaces to pull metrics for
-  # interface_include = ["mlx0", "p1p1"]
-
-  # List of interfaces to ignore when pulling metrics.
-  interface_exclude = ["eth0", "eth1", "lo", "virbr0", "virbr0-nic"]
-
 # Read metrics about the number of files in /home
 [[inputs.filecount]]
   directories = ["/home"]