From f05854c4171ad641461d508320395a3fe07d2816 Mon Sep 17 00:00:00 2001
From: Alex Krzos <akrzos@redhat.com>
Date: Tue, 16 Feb 2016 13:16:44 -0500
Subject: [PATCH] Ignore additional interfaces.

Change-Id: I427c27074b33846fe32e70d165c7ce56ae35674b
---
 ansible/install/roles/collectd/files/filter.conf      | 11 -----------
 ansible/install/roles/collectd/tasks/main.yml         |  1 -
 .../install/roles/collectd/templates/collectd.conf.j2 |  7 +++++++
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 ansible/install/roles/collectd/files/filter.conf

diff --git a/ansible/install/roles/collectd/files/filter.conf b/ansible/install/roles/collectd/files/filter.conf
deleted file mode 100644
index b9335e723..000000000
--- a/ansible/install/roles/collectd/files/filter.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-PreCacheChain "PreCache"
-<Chain "PreCache">
-  <Rule "ignore_tap">
-    <Match "regex">
-      Plugin "^interface$"
-      PluginInstance "^tap*"
-    </Match>
-    Target "stop"
-  </Rule>
-    Target "return"
-</Chain>
diff --git a/ansible/install/roles/collectd/tasks/main.yml b/ansible/install/roles/collectd/tasks/main.yml
index 8d3aafdcd..a891942d0 100644
--- a/ansible/install/roles/collectd/tasks/main.yml
+++ b/ansible/install/roles/collectd/tasks/main.yml
@@ -38,7 +38,6 @@
     group: root
     mode: 0644
   with_items:
-    - filter.conf
     - tail.conf
 
 - name: Copy collectd-redis.sh
diff --git a/ansible/install/roles/collectd/templates/collectd.conf.j2 b/ansible/install/roles/collectd/templates/collectd.conf.j2
index 76f023c31..3e53399f7 100644
--- a/ansible/install/roles/collectd/templates/collectd.conf.j2
+++ b/ansible/install/roles/collectd/templates/collectd.conf.j2
@@ -37,6 +37,13 @@ PreCacheChain "PreCache"
     </Match>
     Target "stop"
   </Rule>
+  <Rule "ignore_interfaces_q">
+    <Match "regex">
+      Plugin "^interface$"
+      PluginInstance "^q.*"
+    </Match>
+    Target "stop"
+  </Rule>
   Target "return"
 </Chain>