Updated CHANGELOG; added Gemfile.lock; Added aferrari-technisys as contributor

Update etc-opt-telegraf-telegraf.conf.j2

.kitchen.yml

@@ -1,14 +1,17 @@
 ---
 driver:
   name: docker
+  provision_command: sed -i '/tsflags=nodocs/d' /etc/yum.conf
 
 provisioner:
   name: ansible_playbook
   ansible_yum_repo: "http://mirror.logol.ru/epel/6/x86_64/epel-release-6-8.noarch.rpm"
   hosts: localhost
+  require_chef_for_busser: false
+  require_ruby_for_busser: true
 
 platforms:
-  - name: centos-6.6
+  - name: centos-6.7
 
 verifier:
   ruby_bindir: '/usr/bin' 

CHANGELOG.md

@@ -0,0 +1,36 @@
+dj-wasabi.telegraf
+------------------
+
+Below an overview of all changes in the releases.
+
+Version (Release date)
+
+0.2.0 (2015-11-14)
+
+  * Fixed kitchen test setup
+  * Adding "net" to the telegraf_plugins_default property
+  * Update etc-opt-telegraf-telegraf.conf.j2 #2 (By pull request: aferrari-technisys (Thanks!))
+  * Improvement and upgrade for v0.2.0 of telegraf #1 (By pull request: aferrari-technisys (Thanks!))
+
+0.1.0 (2015-09-23)
+
+  * Updated `telegraf_agent_version` to 0.1.9
+  * Added restart when package is changed (When updated for example)
+  * Added several plugin options:
+    * pass
+    * drop
+    * tagpass
+    * tagdrop
+    * interval
+  * Updated documentation
+  
+
+0.0.2 (2015-09-20)
+
+  * Updated README dus to missing colon
+  * Forgot to update the meta file
+  * Added Changelog file
+
+0.0.1 (2015-09-20)
+
+  * Initial release

Gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    highline (1.7.8)
+    kitchen-ansible (0.0.30)
+      librarian-ansible
+      test-kitchen
+    kitchen-docker (2.3.0)
+      test-kitchen (>= 1.0.0)
+    librarian (0.1.2)
+      highline
+      thor (~> 0.15)
+    librarian-ansible (1.0.6)
+      faraday
+      librarian (~> 0.1.0)
+    mixlib-shellout (2.2.3)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    safe_yaml (1.0.4)
+    test-kitchen (1.4.2)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.7, < 2.10)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  kitchen-ansible
+  kitchen-docker
+  test-kitchen
+
+BUNDLED WITH
+   1.10.6

README.md

@@ -19,11 +19,10 @@ Role Variables
 
 The following parameters can be set for the Telegraf agent:
 
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `0.1.8`
+* `telegraf_agent_version`: The version of Telegraf to install. Default: `0.2.0`
 * `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10`
 * `telegraf_agent_debug`: Setting the Telegraf in debug mode. Default: `False`
-* `telegraf_agent_utc`: Option for outputting data in UTC. Default: `True`
+
-* `telegraf_agent_precision`: Precision to write data at. Valid values for Precision are n, u, ms, s, m, and h. Default: `s`
 
 You can set tags for the host running telegraf:
 
@@ -62,18 +61,38 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 	  - plugin: mem
 	  - plugin: system
 	  - plugin: swap
+	  - plugin: netstat
 
 Every telegraf agent has these as an default configuration.
  
 The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. Following is an example for using this parameter for MySQL database servers:
 
 	cat group_vars/mysql_database
-	telegraf_plugins_extra
+	telegraf_plugins_extra:
 		- plugin: mysql
 		  config:
 		  	- servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"]
 
 
+Telegraf plugin options:
+
+* `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.
+
+An example might look like this:
+
+	telegraf_plugins_default:
+	  - plugin: disk
+	    interval: 12
+	    tagpass:
+	      - fstype = [ "ext4", "xfs" ]
+    	  - path = [ "/opt", "/home" ]
+
+
+
 Dependencies
 ------------
 No dependencies
@@ -85,6 +104,12 @@ Example Playbook
       roles:
          - { role: dj-wasabi.telegraf }
 
+##Contributors
+The following have contributed to this Ansible role:
+
+  * aferrari-technisys
+
+
 Test Kitchen
 ------------
 

defaults/main.yml

@@ -1,11 +1,9 @@
 ---
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 0.1.8
+telegraf_agent_version: 0.2.0
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
-telegraf_agent_utc: True
-telegraf_agent_precision: s
 
 telegraf_agent_tags:
 
@@ -22,7 +20,13 @@ telegraf_plugins_default:
   - plugin: disk
   - plugin: io
   - plugin: mem
+  - plugin: net
   - plugin: system
   - plugin: swap
+  - plugin: netstat
 
 telegraf_plugins_extra:
+  - plugin: procstat
+    specifications:
+      - prefix = "" # optional string to prefix measurements
+      - exe = "java" # the name as pgrep can find

meta/main.yml

@@ -1,139 +1,20 @@
 ---
 galaxy_info:
-  author: your name
+  author: Werner Dijkerman
-  description: 
+  description: Installing and configuring Telegraf
-  company: your company (optional)
+  company:
-  # If the issue tracker for your role is not on github, uncomment the
+  license: license BSD
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
   min_ansible_version: 1.2
-  #
+  platforms:
-  # Below are all platforms currently available. Just uncomment
+  - name: EL
-  # the ones that apply to your role. If you don't see your 
+    versions:
-  # platform on this list, let us know and we'll get it added!
+     - all
-  #
+  - name: Ubuntu
-  #platforms:
+    versions:
-  #- name: EL
+    - all
-  #  versions:
+  - name: Debian
-  #  - all
+    versions:
-  #  - 5
+    - all
-  #  - 6
+  categories:
-  #  - 7
+   - monitoring
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
 dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

tasks/Debian.yml

@@ -10,4 +10,5 @@
   action: apt
           deb=/tmp/telegraf_{{ telegraf_agent_version }}_amd64.deb
           state=installed
+  notify: "Restart Telegraf"
   sudo: yes

tasks/RedHat.yml

@@ -10,4 +10,5 @@
   action: yum
           name=/tmp/telegraf_{{ telegraf_agent_version }}-1.x86_64.rpm
           state=installed
+  notify: "Restart Telegraf"
   sudo: yes

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

@@ -12,8 +12,6 @@
     interval = "{{ telegraf_agent_interval }}s"
     debug = {{ telegraf_agent_debug | lower }}
     hostname = "{{ ansible_fqdn }}"
-    utc = {{ telegraf_agent_utc | lower }}
-    precision = "{{ telegraf_agent_precision }}"
 
 # Configuration for influxdb server to send metrics to
 [outputs]
@@ -30,11 +28,45 @@
 {% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %}
 {% for item in telegraf_plugins_default %}
 [{{ item.plugin }}]
+{% if item.interval is defined %}
+    interval = "{{ item.interval }}s"
+{% endif %}
 {% if item.config is defined and item.config is iterable %}
 {% for items in item.config %}
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[{{ item.plugin }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[{{ item.plugin }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ 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 %}
@@ -42,11 +74,44 @@
 {% if telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable %}
 {% for item in telegraf_plugins_extra %}
 [{{ item.plugin }}]
+{% if item.interval is defined %}
+    interval = "{{ item.interval }}s"
+{% endif %}
 {% if item.config is defined and item.config is iterable %}
 {% for items in item.config %}
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[{{ item.plugin }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[{{ item.plugin }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ 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 %}