diff --git a/telegraf/files/input/_filters.conf b/telegraf/files/input/_filters.conf
index ce01d50..4ddeceb 100644
--- a/telegraf/files/input/_filters.conf
+++ b/telegraf/files/input/_filters.conf
@@ -1,4 +1,4 @@
-{%- for filter in ('namepass', 'namedrop', 'fieldpass', 'fielddrop', 'tagpass', 'tagdrop') %}
+{%- for filter in ('namepass', 'namedrop', 'fieldpass', 'fielddrop') %}
 {%- if values.get(filter) is not none %}
 {{ filter }} = {%- if values[filter] is string %}[ "{{ values[filter] }}" ]{%- else %}{{ values[filter]|json }}{%- endif %}
 {%- endif %}
diff --git a/telegraf/files/input/_tags.conf b/telegraf/files/input/_tags.conf
index 3c16a02..ae97e17 100644
--- a/telegraf/files/input/_tags.conf
+++ b/telegraf/files/input/_tags.conf
@@ -10,3 +10,15 @@
     {{ tag_name }} = "{{ tag_value }}"
   {%- endfor %}
 {%- endif %}
+{%- if values.tagpass is mapping %}
+  [inputs.{{name}}.tagpass]
+  {%- for tag_name, tag_value in values.tagpass.iteritems() %}
+    {{ tag_name }} = {%- if tag_value is string %}[ "{{ tag_value }}" ]{%- else %}{{ tag_value|json }}{%- endif %}
+  {%- endfor %}
+{%- endif %}
+{%- if values.tagdrop is mapping %}
+  [inputs.{{name}}.tagdrop]
+  {%- for tag_name, tag_value in values.tagdrop.iteritems() %}
+    {{ tag_name }} = {%- if tag_value is string %}[ "{{ tag_value }}" ]{%- else %}{{ tag_value|json }}{%- endif %}
+  {%- endfor %}
+{%- endif %}