Merge pull request #84 from jgeusebroek/master

Remove legacy options

README.md

@@ -76,7 +76,7 @@ Specifying an output. The default is set to localhost, you'll have to specify th
 	      - urls = ["http://localhost:8086"]
 	      - database = "telegraf"
         tagpass:
-          - diskmetrics = ["true"]
+          - cpu = ["cpu0"]
 
 The config will be printed line by line into the configuration, so you could also use:
 
@@ -130,8 +130,6 @@ There is an option to delete extra-plugin files in /etc/telegraf/telegraf.d if t
 Telegraf plugin options:
 
 * `tags` An k/v tags to apply to a specific input's measurements. Can be used on any stage for better filtering for example in outputs.
-* `pass`: An array of strings that is used to filter metrics generated by the current plugin. Each string in the array is tested as a prefix against metric names and if it matches, the metric is emitted.
-* `drop`: The inverse of pass, if a metric name matches, it is not emitted.
 * `tagpass`: (added in Telegraf 0.1.5) tag names and arrays of strings that are used to filter metrics by the current plugin. Each string in the array is tested as an exact match against the tag name, and if it matches the metric is emitted.
 * `tagdrop`: (added in Telegraf 0.1.5) The inverse of tagpass. If a tag matches, the metric is not emitted. This is tested on metrics that have passed the tagpass test.
 * `interval`: How often to gather this metric. Normal plugins use a single global interval, but if one particular plugin should be run less or more often, you can configure that here.
@@ -141,8 +139,8 @@ An example might look like this:
 	telegraf_plugins_default:
 	  - plugin: disk
 	    interval: 12
-            tags:
-                - diskmetrics = "true"
+        tags:
+          - diskmetrics = "true"
 	    tagpass:
 	      - fstype = [ "ext4", "xfs" ]
     	  - path = [ "/opt", "/home" ]

templates/etc-opt-telegraf-telegraf.conf.j2

@@ -66,25 +66,6 @@
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
-{% for items in item.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-
 
 {% endfor %}
 {% endif %}

templates/telegraf-extra-plugin.conf.j2

@@ -27,18 +27,6 @@
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.value.pass is defined and item.value.pass is iterable %}
-[{{ item.value.plugin | default(item.key) }}.pass]
-{% for items in item.value.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.drop is defined and item.value.drop is iterable %}
-[{{ item.value.plugin | default(item.key) }}.drop]
-{% for items in item.value.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
 {% if item.value.objects is defined and item.value.objects is iterable %}
 {% for object in item.value.objects %}
 [[inputs.{{ item.value.plugin | default(item.key) }}.object]]
@@ -49,9 +37,3 @@
   IncludeTotal = {{ object.total | default(false) | string | lower }}
 {% endfor %}
 {% endif %}
-{% if item.value.specifications is defined and item.value.specifications is iterable %}
-[[{{item.value.plugin | default(item.key)}}.specifications]]
-{% for items in item.value.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}

templates/telegraf.conf.j2

@@ -94,18 +94,6 @@
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
 {% if item.objects is defined and item.objects is iterable %}
 {% for object in item.objects %}
 [[inputs.{{ item.plugin }}.object]]
@@ -116,12 +104,6 @@
   IncludeTotal = {{ object.total | default(false) | string | lower }}
 {% endfor %}
 {% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
-{% for items in item.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}
 {% endfor %}
 {% endif %}