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

@@ -5,6 +5,13 @@ 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

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.9`
+* `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,6 +61,7 @@ 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.
  
@@ -104,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.9
+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

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]
@@ -62,6 +60,13 @@
     {{ 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 %}
@@ -101,6 +106,12 @@
     {{ 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 %}
+{% endif %}