Merge "Add Openstack input"
diff --git a/telegraf/files/input/_tags.conf b/telegraf/files/input/_tags.conf
index f03292e..3c16a02 100644
--- a/telegraf/files/input/_tags.conf
+++ b/telegraf/files/input/_tags.conf
@@ -1,3 +1,9 @@
+{%- if values.tagexclude is defined %}
+tagexclude = {%- if values.tagexclude is string %}[ "{{ values.tagexclude }}" ]{%- else %}{{ values.tagexclude|json }}{%- endif %}
+{%- endif %}
+{%- if values.taginclude is defined %}
+taginclude = {%- if values.taginclude is string %}[ "{{ values.taginclude }}" ]{%- else %}{{ values.taginclude|json }}{%- endif %}
+{%- endif %}
{%- if values.tags is mapping %}
[inputs.{{name}}.tags]
{%- for tag_name, tag_value in values.tags.iteritems() %}
diff --git a/telegraf/files/input/mysql.conf b/telegraf/files/input/mysql.conf
index 3566535..3d32300 100644
--- a/telegraf/files/input/mysql.conf
+++ b/telegraf/files/input/mysql.conf
@@ -1,5 +1,6 @@
{%- if values.address is defined %}
[[inputs.mysql]]
servers = [ "{{ values.username }}:{{ values.password }}@{{ values.protocol|default("unix") }}({{ values.address }})/" ]
+ interval_slow = "{{ values.interval_slow|default("15m") }}"
{%- include 'telegraf/files/input/_tags.conf' %}
{%- endif %}