Fix merge issue

.travis.yml

@@ -9,9 +9,12 @@ before_install:
 - sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine
 
 install:
-- pip install molecule ansible
+- pip install molecule ansible docker-py
 
 script:
+- molecule --version
+- ansible --version
 - molecule test
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -27,10 +27,18 @@ The following parameters can be set for the Telegraf agent:
 * `telegraf_agent_rpm_url`: The full path to the RPM file located on a webserver. 
 * `telegraf_agent_deb_url`:  The full path to the DEB file located on a webserver.
 * `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_debug`: Run Telegraf in debug mode. Default: `False`
 * `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True
 * `telegraf_agent_flush_interval`: Default data flushing interval for all outputs. Default: 10
 * `telegraf_agent_flush_jitter`: Jitter the flush interval by a random amount. Default: 0
+* `telegraf_agent_collection_jitter`: Jitter the collection by a random amount. Default: 0 (since v0.13)
+* `telegraf_agent_metric_batch_size`: The agent metric batch size. Default: 1000  (since v0.13)
+* `telegraf_agent_metric_buffer_limit`: The agent metric buffer limit. Default: 10000  (since v0.13)
+* `telegraf_agent_quiet`: Run Telegraf in quiet mode (error messages only). Default: `False` (since v0.13)
+* `telegraf_agent_logfile`: The agent logfile name. Default: '' (means to log to stdout) (since v1.1)
+* `telegraf_agent_omit_hostname`: Do no set the "host" tag in the agent. Default: `False` (since v1.1)
+
+Full agent settings reference: https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration
 
 You can set tags for the host running telegraf:
 

handlers/main.yml

@@ -6,4 +6,4 @@
           name=telegraf
           state=restarted
           enabled=yes
-  sudo: yes
+  become: yes

molecule.yml

@@ -2,6 +2,12 @@
 ansible:
   playbook: playbook.yml
 
+driver:
+  name: docker
+
+verifier:
+  name: testinfra
+
 docker:
   containers:
   - name: telegraf-centos

tasks/main.yml

@@ -16,8 +16,8 @@
     owner: root
     group: root
     mode: 0644
+  become: yes
   when: telegraf_agent_version|version_compare('0.10.0', '<')
-  sudo: yes
   notify: "Restart Telegraf"
 
 - name: "Copy the template for versions >= 0.10.0"
@@ -27,8 +27,8 @@
     owner: root
     group: root
     mode: 0644
+  become: yes
   when: telegraf_agent_version|version_compare('0.10.0', '>=')
-  sudo: yes
   notify: "Restart Telegraf"
 
 - name: "Copy telegraf extra plugins"
@@ -37,8 +37,8 @@
     dest: "/etc/telegraf/telegraf.d/{{ item.plugin }}.conf"
     owner: root
     group: root
-    mode: 644
+    mode: 0644
   with_items: "{{ telegraf_plugins_extra }}"
   when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable"
-  sudo: yes
+  become: yes
   notify: "Restart Telegraf"