Fix merge issue

update the README with the latest v0.13 - v1.1 agent settings

.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
+- pip install molecule ansible docker-py
 
 script:
+- molecule --version
+- ansible --version
 - molecule test
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -5,6 +5,18 @@ Below an overview of all changes in the releases.
 
 Version (Release date)
 
+0.6.0 (2017-01-02)
+
+  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!))
+  * Do "become" for the steps that require root access on Debian #10 (By pull request: Ismael (Thanks!))
+  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #11 (By pull request: Ismael (Thanks!))
+  * Removed imports #12
+  * Fixing molecule #15
+  * set telegraf hostname in defaults. #13 (By pull request: romainbureau (Thanks!))
+  * use version_compare filter … #14 (By pull request: lhoss (Thanks!))
+  * support missing agent settings upto telegraf v1.1 #16 (By pull request: lhoss (Thanks!))
+  * update the README with the latest v0.13 - v1.1 agent settings #17 (By pull request: lhoss (Thanks!))
+
 0.5.1 (2016-08-24)
 
   * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!))

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:
 
@@ -117,6 +125,10 @@ The following have contributed to this Ansible role:
 
   * aferrari-technisys
   * stvnwrgs
+  * lhoss
+  * thecodeassassin
+  * Ismael
+  * romainbureau
 
 # Molecule
 

defaults/main.yml

@@ -3,6 +3,7 @@
 
 #telegraf_agent_version: 0.10.1
 telegraf_agent_version: 1.0.0
+telegraf_agent_hostname: "{{ ansible_fqdn }}"
 telegraf_agent_version_sub_l: _beta2
 telegraf_agent_version_sub_u: -beta2
 telegraf_agent_interval: 10
@@ -11,6 +12,16 @@ telegraf_agent_round_interval: True
 telegraf_agent_flush_interval: 10
 telegraf_agent_flush_jitter: 0
 
+#v0.13 settings (not sure if supported in older version):
+telegraf_agent_collection_jitter: 0
+telegraf_agent_metric_batch_size: 1000
+telegraf_agent_metric_buffer_limit: 10000
+telegraf_agent_quiet: False
+
+#v1.1 settings:
+telegraf_agent_logfile: ""
+telegraf_agent_omit_hostname: False
+
 telegraf_agent_rpm_url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_l }}.x86_64.rpm
 telegraf_agent_deb_url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_u }}_amd64.deb
 

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/Debian.yml

@@ -13,6 +13,7 @@
     name: "apt-transport-https"
     state: present
   when: not apt_https_transport.stat.exists
+  become: yes
   tags:
     - telegraf
     - packages
@@ -21,25 +22,38 @@
   apt_key:
     url: "https://repos.influxdata.com/influxdb.key"
     state: present
+  become: yes
   tags:
     - telegraf
     - packages
 
+- name: Add Influxdb repository (using LSB).
+  apt_repository:
+    repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable"
+    filename: "influxdb"
+    state: present
+  tags:
+    - telegraf
+    - packages
+  when: ansible_lsb is defined
+
 - name: Add Influxdb repository.
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
     filename: "influxdb"
     state: present
+  become: yes
   tags:
     - telegraf
     - packages
+  when: ansible_lsb is not defined
 
 - name: "Install telegraf package | Debian"
   action: apt
           name=telegraf
           state=installed
   notify: "Restart Telegraf"
-  sudo: yes
+  become: yes
   tags:
   - telegraf
   - packages

tasks/main.yml

@@ -9,10 +9,6 @@
   include: "Debian.yml"
   when: ansible_os_family == "Debian"
 
-- name: "Set fact by remove the dots from version"
-  set_fact:
-    telegraf_ver: "{{ telegraf_agent_version.replace('.','') }}"
-
 - name: "Copy the template for versions < 0.10.0"
   template:
     src: etc-opt-telegraf-telegraf.conf.j2
@@ -20,8 +16,8 @@
     owner: root
     group: root
     mode: 0644
-  when: telegraf_ver < 100
-  sudo: yes
+  become: yes
+  when: telegraf_agent_version|version_compare('0.10.0', '<')
   notify: "Restart Telegraf"
 
 - name: "Copy the template for versions >= 0.10.0"
@@ -31,8 +27,8 @@
     owner: root
     group: root
     mode: 0644
-  when: telegraf_ver >= 100
-  sudo: yes
+  become: yes
+  when: telegraf_agent_version|version_compare('0.10.0', '>=')
   notify: "Restart Telegraf"
 
 - name: "Copy telegraf extra plugins"
@@ -41,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"

templates/telegraf.conf.j2

@@ -11,10 +11,20 @@
 [agent]
     interval = "{{ telegraf_agent_interval }}s"
     debug = {{ telegraf_agent_debug | lower }}
-    hostname = "{{ ansible_fqdn }}"
+    hostname = "{{ telegraf_agent_hostname }}"
     round_interval = {{ telegraf_agent_round_interval | lower }}
     flush_interval = "{{ telegraf_agent_flush_interval }}s"
     flush_jitter = "{{ telegraf_agent_flush_jitter }}s"
+{% if telegraf_agent_version|version_compare('0.13', '>=') %}
+    collection_jitter = "{{ telegraf_agent_collection_jitter }}s"
+    metric_batch_size = {{ telegraf_agent_metric_batch_size }}
+    metric_buffer_limit = {{ telegraf_agent_metric_buffer_limit }}
+    quiet = {{ telegraf_agent_quiet | lower }}
+{% endif %}
+{% if telegraf_agent_version|version_compare('1.1', '>=') %}
+    logfile = "{{ telegraf_agent_logfile }}"
+    omit_hostname = {{ telegraf_agent_omit_hostname | lower }}
+{% endif %}
 
 ###############################################################################
 #                                  OUTPUTS                                    #
@@ -75,4 +85,4 @@
 {% endfor %}
 {% endif %}
 {% endfor %}
-{% endif %}
+{% endif %}

tests/test_docker.py

@@ -1,3 +1,7 @@
+from testinfra.utils.ansible_runner import AnsibleRunner
+
+testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
+
 
 def test_telegraf_running_and_enabled(Service, SystemInfo):
     telegraf = Service("telegraf")