Merge pull request #47 from dj-wasabi/prepare_090

Updating to 0.9.0

.travis.yml

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

CHANGELOG.md

@@ -5,6 +5,23 @@ Below an overview of all changes in the releases.
 
 Version (Release date)
 
+0.9.0 (2018-05-06)
+
+  * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!))
+  * Fix markdown #41 (By pull request: Angristan (Thanks!))
+  * Allow to override RedHat release version #43 (By pull request: tszym (Thanks!))
+  * Improved comments, split up role, moved tags and added defaults #45 (By pull request: boxrick (Thanks!))
+  * Fix Travis Tests #42
+  * Convert the telegraf_plugins_extra varaible to a hash so that we can … #46 (By pull request: tjend (Thanks!))
+
+0.8.0 (2017-10-30)
+
+  * Updating to Molecule V2
+  * Test if LSB codename exists before using it #35 (By pull request: tszym (Thanks!))
+  * Remove useless packages on RedHat. fix #28 #36 (By pull request: tszym (Thanks!))
+  * Fix extra plugins by file / Change apt source filename / Change tags by global_tags #37 (By pull request: aarnaud (Thanks!))
+  * Use telegra_global_tags for oldest telegraf versions #38 (By pull request: tszym (Thanks!))
+
 0.7.0 (2017-02-23)
 
   * Replace action by modules #26 (By pull request: tszym (Thanks!))

README.md

@@ -36,6 +36,8 @@ The following parameters can be set for the Telegraf agent:
 * `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_aws_tags`: Configure AWS ec2 tags into Telegraf tags section Default: `False`
+* `telegraf_agent_aws_tags_prefix`: Define a prefix for AWS ec2 tags. Default: `""`
 * `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)
@@ -47,7 +49,7 @@ Full agent settings reference: https://github.com/influxdata/telegraf/blob/maste
 
 You can set tags for the host running telegraf:
 
-	telegraf_agent_tags:
+	telegraf_global_tags:
 	  - tag_name: some_name
 	    tag_value: some_value
 
@@ -68,7 +70,7 @@ The config will be printed line by line into the configuration, so you could als
 
 and it will be printed in the configuration file.
 
-There are two properties which are the same, but are used differently. Those are:
+There are two properties which are similar, but are used differently. Those are:
 
 * `telegraf_plugins_default`
 * `telegraf_plugins_extra`
@@ -88,11 +90,11 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 
 Every telegraf agent has these as a 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:
+The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. It is a hash instead of a list, so that you can merge values from multiple var files together. Following is an example for using this parameter for MySQL database servers:
 
 	cat group_vars/mysql_database
 	telegraf_plugins_extra:
-		- plugin: mysql
+		mysql:
 		  config:
 		  	- servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"]
 
@@ -129,15 +131,28 @@ No dependencies
       roles:
          - { role: dj-wasabi.telegraf }
 
-##Contributors
+## Contributors
+
 The following have contributed to this Ansible role:
 
-  * aferrari-technisys
+ * Thomas Szymanski
-  * stvnwrgs
+ * Alejandro
-  * lhoss
+ * Slawomir Skowron
-  * thecodeassassin
+ * Ismael
-  * Ismael
+ * Laurent Hoss
-  * romainbureau
+ * Anthony ARNAUD
+ * Rick Box
+ * Emerson Knapp
+ * gaelL
+ * Steven Wirges
+ * zend0
+ * Angristan
+ * Olivier Boukili
+ * Romain BUREAU
+ * TheCodeAssassin
+ * tjend
+
+Thank you all!
 
 ## Molecule
 

defaults/main.yml

@@ -1,26 +1,27 @@
 ---
 # defaults file for ansible-telegraf
 
-#telegraf_agent_version: 0.10.1
+telegraf_agent_version: 1.4.0
-telegraf_agent_version: 1.0.0
 telegraf_agent_hostname: "{{ ansible_fqdn }}"
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
 telegraf_agent_round_interval: True
 telegraf_agent_flush_interval: 10
 telegraf_agent_flush_jitter: 0
+telegraf_agent_aws_tags: False
+telegraf_agent_aws_tags_prefix: ""
 
-#v0.13 settings (not sure if supported in older version):
+# 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:
+# v1.1 settings:
 telegraf_agent_logfile: ""
 telegraf_agent_omit_hostname: False
 
-telegraf_agent_tags:
+telegraf_global_tags: []
 
 telegraf_agent_output:
   - type: influxdb
@@ -29,6 +30,7 @@ telegraf_agent_output:
       - database = "telegraf"
       - precision = "s"
 
+# defaults - /etc/telegraf/telegraf.conf
 telegraf_plugins_default:
   - plugin: cpu
     config:
@@ -40,5 +42,11 @@ telegraf_plugins_default:
   - plugin: system
   - plugin: swap
   - plugin: netstat
+  - plugin: processes
+  - plugin: kernel
 
-telegraf_plugins_extra:
+# extra configuration - /etc/telegraf/telegraf.d/*
+telegraf_plugins_extra: {}
+
+# RedHat specific settings for convenience
+telegraf_redhat_releasever: "$releasever"

meta/main.yml

@@ -6,15 +6,15 @@ galaxy_info:
   license: license BSD
   min_ansible_version: 1.2
   platforms:
-  - name: EL
+    - name: EL
-    versions:
+      versions:
-     - all
+        - all
-  - name: Ubuntu
+    - name: Ubuntu
-    versions:
+      versions:
-    - all
+        - all
-  - name: Debian
+    - name: Debian
-    versions:
+      versions:
-    - all
+        - all
   categories:
-   - monitoring
+    - monitoring
-dependencies: []
+dependencies: []

molecule.yml

@@ -1,24 +0,0 @@
----
-ansible:
-  playbook: playbook.yml
-
-driver:
-  name: docker
-
-verifier:
-  name: testinfra
-
-docker:
-  containers:
-  - name: telegraf-centos
-    ansible_groups:
-      - group1
-    image: milcom/centos7-systemd
-    image_version: latest
-    privileged: True
-  - name: telegraf-debian
-    ansible_groups:
-      - group2
-    image: maint/debian-systemd
-    image_version: latest
-    privileged: True

molecule/default/Dockerfile.j2

@@ -0,0 +1,7 @@
+FROM {{ item.image }}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python python-devel python2-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi

molecule/default/INSTALL.rst

@@ -0,0 +1,46 @@
+*******
+Install
+*******
+
+This set of playbooks have specific dependencies on Ansible due to the modules
+being used.
+
+Requirements
+============
+
+* Ansible 2.2
+* Docker Engine
+* docker-py
+
+Install OS dependencies on CentOS 7
+
+.. code-block:: bash
+
+  $ sudo yum install -y epel-release
+  $ sudo yum install -y gcc python-pip python-devel openssl-devel
+  # If installing Molecule from source.
+  $ sudo yum install libffi-devel git
+
+Install OS dependencies on Ubuntu 16.x
+
+.. code-block:: bash
+
+  $ sudo apt-get update
+  $ sudo apt-get install -y python-pip libssl-dev docker-engine
+  # If installing Molecule from source.
+  $ sudo apt-get install -y libffi-dev git
+
+Install OS dependencies on Mac OS
+
+.. code-block:: bash
+
+  $ brew install python
+  $ brew install git
+
+Install using pip:
+
+.. code-block:: bash
+
+  $ sudo pip install ansible
+  $ sudo pip install docker-py
+  $ sudo pip install molecule --pre

molecule/default/create.yml

@@ -0,0 +1,47 @@
+---
+- name: Create
+  hosts: localhost
+  connection: local
+  gather_facts: False
+#  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
+  vars:
+    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
+    molecule_ephemeral_directory: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}"
+    molecule_scenario_directory: "{{ lookup('env', 'MOLECULE_SCENARIO_DIRECTORY') }}"
+    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
+  tasks:
+    - name: Create Dockerfiles from image names
+      template:
+        src: "{{ molecule_scenario_directory }}/Dockerfile.j2"
+        dest: "{{ molecule_ephemeral_directory }}/Dockerfile_{{ item.image | regex_replace('[^a-zA-Z0-9_]', '_') }}"
+      with_items: "{{ molecule_yml.platforms }}"
+      register: platforms
+
+    - name: Discover local Docker images
+      docker_image_facts:
+        name: "molecule_local/{{ item.item.name }}"
+      with_items: "{{ platforms.results }}"
+      register: docker_images
+
+    - name: Build an Ansible compatible image
+      docker_image:
+        path: "{{ molecule_ephemeral_directory }}"
+        name: "molecule_local/{{ item.item.image }}"
+        dockerfile: "{{ item.item.dockerfile | default(item.invocation.module_args.dest) }}"
+        force: "{{ item.item.force | default(True) }}"
+      with_items: "{{ platforms.results }}"
+      when: platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0
+
+    - name: Create molecule instance(s)
+      docker_container:
+        name: "{{ item.name }}"
+        hostname: "{{ item.name }}"
+        image: "molecule_local/{{ item.image }}"
+        state: started
+        recreate: False
+        log_driver: none
+        command: "{{ item.command | default('sleep infinity') }}"
+        privileged: "{{ item.privileged | default(omit) }}"
+        volumes: "{{ item.volumes | default(omit) }}"
+        capabilities: "{{ item.capabilities | default(omit) }}"
+      with_items: "{{ molecule_yml.platforms }}"

molecule/default/destroy.yml

@@ -0,0 +1,16 @@
+---
+- name: Destroy
+  hosts: localhost
+  connection: local
+  gather_facts: False
+  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
+  vars:
+    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
+    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
+  tasks:
+    - name: Destroy molecule instance(s)
+      docker_container:
+        name: "{{ item.name }}"
+        state: absent
+        force_kill: "{{ item.force_kill | default(True) }}"
+      with_items: "{{ molecule_yml.platforms }}"

molecule/default/molecule.yml

@@ -0,0 +1,28 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+
+platforms:
+  - name: telegraf-centos
+    image: milcom/centos7-systemd
+    privileged: True
+  - name: telegraf-debian
+    image: maint/debian-systemd
+    privileged: True
+
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/tests/test_default.py

@@ -1,6 +1,9 @@
-from testinfra.utils.ansible_runner import AnsibleRunner
+import os
 
-testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
 def test_telegraf_running_and_enabled(Service, SystemInfo):

molecule/default/yaml-lint.yml

@@ -0,0 +1,9 @@
+---
+
+extends: default
+
+rules:
+  line-length:
+    max: 120
+    level: warning
+  truthy: disable

tasks/Debian.yml

@@ -4,9 +4,6 @@
   stat:
     path: /usr/lib/apt/methods/https
   register: apt_https_transport
-  tags:
-    - telegraf
-    - packages
 
 - name: Install APT HTTPS transport.
   apt:
@@ -14,47 +11,32 @@
     state: present
   when: not apt_https_transport.stat.exists
   become: yes
-  tags:
-    - telegraf
-    - packages
 
-- name: Download Influxdb apt key.
+- name: Download Telegraf apt key.
   apt_key:
     url: "https://repos.influxdata.com/influxdb.key"
     state: present
   become: yes
-  tags:
-    - telegraf
-    - packages
 
-- name: Add Influxdb repository (using LSB).
+- name: Add Telegraf repository (using LSB).
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable"
-    filename: "influxdb"
+    filename: "telegraf"
     state: present
   become: yes
-  tags:
+  when: ansible_lsb is defined and ansible_lsb.codename is defined
-    - telegraf
-    - packages
-  when: ansible_lsb is defined
 
-- name: Add Influxdb repository.
+- name: Add Telegraf repository.
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
-    filename: "influxdb"
+    filename: "telegraf"
     state: present
   become: yes
-  tags:
+  when: ansible_lsb is not defined or ansible_lsb.codename is not defined
-    - telegraf
-    - packages
-  when: ansible_lsb is not defined
 
 - name: "Install telegraf package | Debian"
   apt:
-    name: telegraf
+    name: "telegraf"
     state: installed
   notify: "Restart Telegraf"
   become: yes
-  tags:
-  - telegraf
-  - packages

tasks/RedHat.yml

@@ -1,35 +1,11 @@
 ---
-
+# description: RedHat specific installation
-- name: "Enable EPEL"
-  yum:
-    name: epel-release
-    state: installed
-
-- name: "Installing some dependencies"
-  yum:
-    name: "{{ item }}"
-    state: installed
-  with_items:
-    - python-pip
-    - python-devel
-    - gcc
-    - libffi-devel
-    - openssl-devel
-
-- name: "Installing PIP dependensies"
-  pip:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - urllib3
-    - pyopenssl
-    - ndg-httpsclient
 
 - name: "Add yum repository | RedHat"
   yum_repository:
     name: influxdb
     description: InfluxDB Repository - RHEL $releasever
-    baseurl: https://repos.influxdata.com/rhel/$releasever/$basearch/stable
+    baseurl: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
     gpgcheck: yes
     gpgkey: https://repos.influxdata.com/influxdb.key
 

tasks/configure.yml

@@ -0,0 +1,51 @@
+---
+# description: Configure telegraf and get all relevent ec2 information
+
+- name: Retrieve ec2 facts
+  ec2_facts:
+  when: telegraf_agent_aws_tags
+
+- name: Retrieve all ec2 tags on the instance
+  ec2_tag:
+    region: '{{ ansible_ec2_placement_region }}'
+    resource: '{{ ansible_ec2_instance_id }}'
+    state: list
+  when: telegraf_agent_aws_tags
+  register: ec2_tags
+
+- name: "Copy the template for versions < 0.10.0"
+  template:
+    src: etc-opt-telegraf-telegraf.conf.j2
+    dest: /etc/opt/telegraf/telegraf.conf
+    owner: telegraf
+    group: telegraf
+    mode: 0640
+  become: yes
+  when: telegraf_agent_version|version_compare('0.10.0', '<')
+  notify: "Restart Telegraf"
+
+- name: "Copy the template for versions >= 0.10.0"
+  template:
+    src: telegraf.conf.j2
+    dest: /etc/telegraf/telegraf.conf
+    owner: telegraf
+    group: telegraf
+    mode: 0640
+  become: yes
+  when: telegraf_agent_version|version_compare('0.10.0', '>=')
+  notify: "Restart Telegraf"
+
+- name: "Copy telegraf extra plugins"
+  template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: "/etc/telegraf/telegraf.d/{{ item.value.filename | default(item.key) }}.conf"
+    owner: telegraf
+    group: telegraf
+    mode: 0640
+  with_dict: "{{ telegraf_plugins_extra }}"
+  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable"
+  become: yes
+  notify: "Restart Telegraf"
+
+- name: "Force restart service after reread config"
+  meta: flush_handlers

tasks/main.yml

@@ -8,36 +8,9 @@
 - name: "Install the correct repository"
   include: "Debian.yml"
   when: ansible_os_family == "Debian"
+  tags:
+    - telegraf
+    - packages
 
-- name: "Copy the template for versions < 0.10.0"
+- name: "Configure telegraf"
-  template:
+  include: "configure.yml"
-    src: etc-opt-telegraf-telegraf.conf.j2
-    dest: /etc/opt/telegraf/telegraf.conf
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  become: yes
-  when: telegraf_agent_version|version_compare('0.10.0', '<')
-  notify: "Restart Telegraf"
-
-- name: "Copy the template for versions >= 0.10.0"
-  template:
-    src: telegraf.conf.j2
-    dest: /etc/telegraf/telegraf.conf
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  become: yes
-  when: telegraf_agent_version|version_compare('0.10.0', '>=')
-  notify: "Restart Telegraf"
-
-- name: "Copy telegraf extra plugins"
-  template:
-    src: "telegraf-extra-plugin.conf.j2"
-    dest: "/etc/telegraf/telegraf.d/extra-plugins.conf"
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable"
-  become: yes
-  notify: "Restart Telegraf"

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

@@ -1,12 +1,18 @@
-# Telegraf configuration
+### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
 
 [tags]
-{% if telegraf_agent_tags is defined and telegraf_agent_tags is iterable %}
+{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %}
-{% for item in telegraf_agent_tags %}
+{% for item in telegraf_global_tags %}
     {{ item.tag_name }} = "{{ item.tag_value }}"
 {% endfor %}
 {% endif %}
 
+{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
+{% for key, value in ec2_tags.tags.iteritems()%}
+   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+{% endfor %}
+{% endif %}
+
 # Configuration for telegraf itself
 [agent]
     interval = "{{ telegraf_agent_interval }}s"

templates/telegraf-extra-plugin.conf.j2

@@ -1,49 +1,47 @@
-{% if telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable %}
+### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
-{% for item in telegraf_plugins_extra %}
+
-[[inputs.{{ item.plugin }}]]
+[[inputs.{{ item.key }}]]
-{% if item.interval is defined %}
+{% if item.value.interval is defined %}
-    interval = "{{ item.interval }}s"
+    interval = "{{ item.value.interval }}s"
 {% endif %}
-{% if item.config is defined and item.config is iterable %}
+{% if item.value.config is defined and item.value.config is iterable %}
-{% for items in item.config %}
+{% for items in item.value.config %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.tags is defined and item.tags is iterable %}
+{% if item.value.tags is defined and item.value.tags is iterable %}
-[inputs.{{ item.plugin }}.tags]
+[inputs.{{ item.key }}.tags]
-{% for items in item.tags %}
+{% for items in item.value.tags %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.tagpass is defined and item.tagpass is iterable %}
+{% if item.value.tagpass is defined and item.value.tagpass is iterable %}
-[{{ item.plugin }}.tagpass]
+[{{ item.key }}.tagpass]
-{% for items in item.tagpass %}
+{% for items in item.value.tagpass %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.tagdrop is defined and item.tagdrop is iterable %}
+{% if item.value.tagdrop is defined and item.value.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
+[{{ item.key }}.tagdrop]
-{% for items in item.tagdrop %}
+{% for items in item.value.tagdrop %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
+{% if item.value.pass is defined and item.value.pass is iterable %}
-[{{ item.plugin }}.pass]
+[{{ item.key }}.pass]
-{% for items in item.pass %}
+{% for items in item.value.pass %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.drop is defined and item.drop is iterable %}
+{% if item.value.drop is defined and item.value.drop is iterable %}
-[{{ item.plugin }}.drop]
+[{{ item.key }}.drop]
-{% for items in item.drop %}
+{% for items in item.value.drop %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
+{% if item.value.specifications is defined and item.value.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
+[[{{item.key}}.specifications]]
-{% for items in item.specifications %}
+{% for items in item.value.specifications %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% endfor %}
-{% endif %}

templates/telegraf.conf.j2

@@ -1,12 +1,18 @@
-# Telegraf configuration
+### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
 
-[tags]
+[global_tags]
-{% if telegraf_agent_tags is defined and telegraf_agent_tags is iterable %}
+{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %}
-{% for item in telegraf_agent_tags %}
+{% for item in telegraf_global_tags %}
     {{ item.tag_name }} = "{{ item.tag_value }}"
 {% endfor %}
 {% endif %}
 
+{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
+{% for key, value in ec2_tags.tags.iteritems()%}
+   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+{% endfor %}
+{% endif %}
+
 # Configuration for telegraf agent
 [agent]
     interval = "{{ telegraf_agent_interval }}s"

tests/inventory

@@ -1,6 +0,0 @@
-localhost
-[group1]
-telegraf-centos
-
-[group2]
-telegraf-debian

tests/test.yml

@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - ansible-zabbix-agent