Ignore additional interfaces.

Change-Id: I427c27074b33846fe32e70d165c7ce56ae35674b
2016-02-16 13:16:44 -05:00 · 2016-02-16 13:16:44 -05:00 · f05854c417
commit f05854c417
parent c7287d30e2
3 changed files with 7 additions and 12 deletions
--- a/ansible/install/roles/collectd/files/filter.conf
+++ b/ansible/install/roles/collectd/files/filter.conf
@ -1,11 +0,0 @@
-PreCacheChain "PreCache"
-<Chain "PreCache">
-  <Rule "ignore_tap">
-    <Match "regex">
-      Plugin "^interface$"
-      PluginInstance "^tap*"
-    </Match>
-    Target "stop"
-  </Rule>
-    Target "return"
-</Chain>
--- 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
--- 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>