From 3f9e3d624949871d4cbe966ad62155898389b3e7 Mon Sep 17 00:00:00 2001
From: Antsiferov Grigory <azr@bakka.su>
Date: Tue, 12 Dec 2017 20:09:42 +0300
Subject: [PATCH] Update collectd.conf.tpl

Add ignore regexps for interface and df plugins to ignore docker trash.
Add selection regexp for disk plugin to include /dev/xvd[az].
Enable StoreRates for write_graphite by default.
---
 sls/collectd/collectd.conf.tpl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sls/collectd/collectd.conf.tpl b/sls/collectd/collectd.conf.tpl
index 681a45d..ceace5d 100644
--- a/sls/collectd/collectd.conf.tpl
+++ b/sls/collectd/collectd.conf.tpl
@@ -382,12 +382,15 @@ LoadPlugin xencpu
   Device "cgroup_root"
   Device "devtmpfs"
   Device "rootfs"
+  Device "/^docker-.+/"
+  Device "/^mapper_docker-.+/"
   IgnoreSelected true
   ReportByDevice true
   ReportInodes true
 </Plugin>
 <Plugin disk>
-  Disk "/^[hs]d[a-z](:?[0-9]+)?$/"
+  Disk "/^[hs]d[a-z]$/"
+  Disk "/^xvd[a-z]$/"
   Disk "/^md[0-9]+$/"
   IgnoreSelected false
 </Plugin>
@@ -440,7 +443,8 @@ LoadPlugin xencpu
 {% endif %}
 
 <Plugin interface>
-# IgnoreSelected false
+  Interface "/^veth/"
+  IgnoreSelected true
 </Plugin>
 
 {% if "ipmi" in configured_plugins %}
@@ -1318,7 +1322,7 @@ LoadPlugin xencpu
     Port "{{ carbon.get('port', '2003') }}"
     Prefix "{{ carbon.get('prefix', 'collectd.') }}"
     Postfix "{{ carbon.get('postfix', '') }}"
-    StoreRates {{ 'true' if carbon.get('store-rates', False) else 'false' }}
+    StoreRates {{ 'true' if carbon.get('store-rates', True) else 'false' }}
     EscapeCharacter "{{ carbon.get('escape-character', '_') }}"
   </Carbon>
   {% endfor %}