Updating to release 0.11.0

Renamed the tojson to to_json

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Help to improve this Ansible role.
+
+---
+
+**Describe the bug**
+<!--- A clear and concise description of what the bug is. -->
+
+**Installation method/version**
+<!--- Please provide the installation method and version of the role. -->
+
+* Github / latest
+* Ansible Galaxy / 1.1.0
+
+**Ansible Version**
+
+```
+<!--- Paste output from "ansible --version" -->
+```
+
+**Targetted hosts**
+Concerns the following OS(es):
+<!--- Pick one below and delete the rest -->
+
+* Ubuntu
+* Debian
+* CentOS
+* Mint
+
+**Expected behavior**
+<!--- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. Configuration of the role/group_vars information etc. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this Ansible role
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.travis.yml

@@ -5,7 +5,8 @@ services:
   - docker
 
 install:
-  - pip install molecule ansible docker==2.7.0
+  - curl -sSlo requirements.txt https://raw.githubusercontent.com/dj-wasabi/ansible-ci-base/master/requirements.txt
+  - pip install -r requirements.txt
 
 script:
   - molecule --version

CHANGELOG.md

@@ -5,6 +5,32 @@ Below an overview of all changes in the releases.
 
 Version (Release date)
 
+0.11.0 (2018-12-11)
+
+  * Added support for plugins being managed exclusively by this playbook #60 (By pull request: gaizeror (Thanks!))
+  * Pin apt key ID #61 (By pull request: tszym (Thanks!))
+  * Wen copying/removing plugins show only plugin name #62 (By pull request: mprasil (Thanks!))
+  * Using base ci requirements.txt #64
+  * telegraf-extra-plugin.conf.j2: fix template typo #65 (By pull request: gaelL (Thanks!))
+  * Some small improvements #66
+  * Want to use latest #67
+  * Added Windows as OS #68
+  * Added support for (Open)Suse #69
+  * Added default pluging if nothing is configured #70
+  * Replace 'ec2_facts' with 'ec2_metadata_facts' to fix a deprecation warning #72 (By pull request: Rylon (Thanks!))
+  * A few enhancements and fixes to windows support #73 (By pull request: jdivy (Thanks!))
+  * Renamed the tojson to to_json #74
+
+0.10.0 (2018-08-12)
+
+  * Updating to telegraf 1.7.3
+  * Fix Deprecation warnings #54
+  * Changed 'include' to 'include_tasks' to remove deprecation warning #53 (By pull request: tjend (Thanks!))
+  * Add option to remove extra plugin config files #52 (By pull request: tjend (Thanks!))
+  * Plugins extra hash allow multiple inputs same type #50 (By pull request: tjend (Thanks!))
+  * Using specific version for tests
+  * Update minimum Ansible version to 2.4
+
 0.9.0 (2018-05-06)
 
   * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!))

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+The Code of Conduct from Ansible found [here](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html) applies to this Ansible role as well.

CONTRIBUTING.md

@@ -0,0 +1,88 @@
+# Contributing to this role
+
+**Table of content**
+
+- [Contributing to this role](#contributing-to-this-role)
+  * [Contributing](#contributing)
+  * [(local) Development](#-local--development)
+    + [Requirements](#requirements)
+    + [Execution](#execution)
+- [Other](#other)
+  * [Virtualenv](#virtualenv)
+  * [Links](#links)
+
+Thank you very much for making time to improve this Ansible role.
+
+## Contributing
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html).
+
+1. Fork the repo
+
+2. Create a branch and apply your changes to this branch.
+
+    a. Make sure you have updated the documentation when adding new variables;
+    
+    b. Don't forget to add/update tests so we can test the functionality during each Pull Request;
+    
+    c. Make sure the tests will succeed.
+
+3. Push the branch to your fork and submit a pull request.
+
+**Note**
+
+Pull Requests that fails during the tests will not be merged.
+
+## Coding Guidelines
+
+Style guides are important because they ensure consistency in the content, look, and feel of a book or a website.
+
+* [Ansible Style Guide](http://docs.ansible.com/ansible/latest/dev_guide/style_guide/)
+* It's "Ansible" when referring to the product and ``ansible`` when referring to the command  line tool, package, etc
+* Playbooks should be written in multi-line YAML with ``key: value``. The form ``key=value`` is only for ``ansible`` ad-hoc, not for ``ansible-playbook``.
+* Tasks should always have a ``name:``
+
+## (local) Development
+
+This role make use of Molecule to test the execution of the role and verificate it. In the root of the repository, a file named `requirements.txt` exists and contains the versions used by the tests.
+
+### Requirements
+
+You can install them with the following command:
+
+```
+pip install -r requirements.txt
+```
+
+Once the dependencies are installed, please install Docker as Molecule is configured in this repository to create Docker containers. See [this](https://docs.docker.com/install/) link to install Docker on your system.
+
+### Execution
+
+Once everything is installed, you can validate your changes by executing:
+```
+molecule test
+```
+
+It should run without any issues.
+
+# Other
+
+## Virtualenv
+
+Suggestion is to create a virtualenv so you won't have issues with other projects.
+
+Some web pages describing for virtual env:
+
+* http://thepythonguru.com/python-virtualenv-guide/
+* https://realpython.com/python-virtual-environments-a-primer/
+* https://www.dabapps.com/blog/introduction-to-pip-and-virtualenv-python/
+
+## Links
+
+[Molecule](https://molecule.readthedocs.io/)
+
+[Ansible](https://www.ansible.com/)
+
+[Molecule V2 with your own role](https://werner-dijkerman.nl/2017/09/05/using-molecule-v2-to-test-ansible-roles/)
+
+**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged. 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Werner Dijkerman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+**Description of PR**
+<!--- Describe what the PR holds -->
+
+**Type of change**
+<!--- Pick one below and delete the rest: -->
+
+Feature Pull Request
+Bugfix Pull Request
+Docs Pull Request
+
+**Fixes an issue**
+<!--- If this PR fixes an issue, please mention it. -->

README.md

@@ -14,8 +14,21 @@ Design goals are to have a minimal memory footprint with a plugin system so that
 
 ## Requirements
 
+### Operating systems
+This role will work on the following operating systems:
 
-No requirements. (Yes, an Influxdb server somewhere on the network will help though ;-) )
+ * Red Hat
+ * Debian
+ * Ubuntu
+ * Windows (Best effort)
+ * (Open)Suse
+
+So, you'll need one of those operating systems.. :-)
+Please sent Pull Requests or suggestions when you want to use this role for other Operating systems.
+
+### InfluxDB
+
+You'll need an InfluxDB instance running somewhere on your network.
 
 ## Upgrade
 ### 0.7.0
@@ -24,13 +37,15 @@ There was an issue:
 
     If I configure a telegraf_plugins_extra, run ansible, delete the plugin and run ansible again, the plugin stays on the machine.
 
-
-
 ## Role Variables
 
+### Overall variables
+
 The following parameters can be set for the Telegraf agent:
 
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.0.0`
+* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.9.0`
+* `telegraf_agent_package`: The name of the Telegraf package. Default: `telegraf`
+* `telegraf_agent_package_state`: If the package should be `present` or `latest`. When set to `latest`, `telegraf_agent_version` will be ignored. Default: `present`
 * `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10`
 * `telegraf_agent_debug`: Run Telegraf in debug mode. Default: `False`
 * `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True
@@ -70,6 +85,18 @@ The config will be printed line by line into the configuration, so you could als
 
 and it will be printed in the configuration file.
 
+## Windows specific Variables
+
+**NOTE**
+
+_Supporting Windows is an best effort (I don't have the possibility to either test/verify changes on the various amount of available Windows instances). PR's specific to Windows will almost immediately be merged, unless some one is able to provide a Windows test mechanism via Travis for Pull Requests._
+
+* `telegraf_win_install_dir`: The directory where Telegraf will be installed.
+* `telegraf_win_logfile`: The location to the logfile of Telegraf.
+* `telegraf_win_include`: The directory that will contain all plugin configuration.
+
+## Extra information
+
 There are two properties which are similar, but are used differently. Those are:
 
 * `telegraf_plugins_default`
@@ -98,6 +125,7 @@ The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific t
 		  config:
 		  	- servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"]
 
+There is an option to delete extra-plugin files in /etc/telegraf/telegraf.d if they weren't generated by this playbook with `telegraf_plugins_extra_exclusive` variable.
 
 Telegraf plugin options:
 

defaults/main.yml

@@ -1,7 +1,10 @@
 ---
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 1.4.0
+telegraf_agent_version: 1.9.0
+telegraf_agent_version_patch: 1
+telegraf_agent_package: telegraf
+telegraf_agent_package_state: present
 telegraf_agent_hostname: "{{ ansible_fqdn }}"
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
@@ -47,6 +50,15 @@ telegraf_plugins_default:
 
 # extra configuration - /etc/telegraf/telegraf.d/*
 telegraf_plugins_extra: {}
+telegraf_plugins_extra_exclusive: False
 
 # RedHat specific settings for convenience
 telegraf_redhat_releasever: "$releasever"
+
+telegraf_win_install_dir: 'C:\Telegraf'
+telegraf_win_logfile: 'C:\\Telegraf\\telegraf.log'
+telegraf_win_include: 'C:\Telegraf\telegraf_agent.d'
+telegraf_win_service_args:
+  - -service install
+  - -config {{ telegraf_win_install_dir }}\telegraf\telegraf.conf
+  - --config-directory {{ telegraf_win_include }}

files/telegraf.init

@@ -0,0 +1,212 @@
+#! /usr/bin/env bash
+
+# chkconfig: 2345 99 01
+# description: Telegraf daemon
+
+### BEGIN INIT INFO
+# Provides:          telegraf
+# Required-Start:    $all
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start telegraf at boot time
+### END INIT INFO
+
+# this init script supports three different variations:
+#  1. New lsb that define start-stop-daemon
+#  2. Old lsb that don't have start-stop-daemon but define, log, pidofproc and killproc
+#  3. Centos installations without lsb-core installed
+#
+# In the third case we have to define our own functions which are very dumb
+# and expect the args to be positioned correctly.
+
+# Command-line options that can be set in /etc/default/telegraf.  These will override
+# any config file values.
+TELEGRAF_OPTS=
+
+USER=telegraf
+GROUP=telegraf
+
+if [ -r /lib/lsb/init-functions ]; then
+    source /lib/lsb/init-functions
+fi
+
+DEFAULT=/etc/default/telegraf
+
+if [ -r $DEFAULT ]; then
+    set -o allexport
+    source $DEFAULT
+    set +o allexport
+fi
+
+if [ -z "$STDOUT" ]; then
+    STDOUT=/dev/null
+fi
+if [ ! -f "$STDOUT" ]; then
+    mkdir -p `dirname $STDOUT`
+fi
+
+if [ -z "$STDERR" ]; then
+    STDERR=/var/log/telegraf/telegraf.log
+fi
+if [ ! -f "$STDERR" ]; then
+    mkdir -p `dirname $STDERR`
+fi
+
+OPEN_FILE_LIMIT=65536
+
+function pidofproc() {
+    if [ $# -ne 3 ]; then
+        echo "Expected three arguments, e.g. $0 -p pidfile daemon-name"
+    fi
+
+    if [ ! -f "$2" ]; then
+        return 1
+    fi
+
+    local pidfile=`cat $2`
+
+    if [ "x$pidfile" == "x" ]; then
+        return 1
+    fi
+
+    if ps --pid "$pidfile" | grep -q $(basename $3); then
+        return 0
+    fi
+
+    return 1
+}
+
+function killproc() {
+    if [ $# -ne 3 ]; then
+        echo "Expected three arguments, e.g. $0 -p pidfile signal"
+    fi
+
+    pid=`cat $2`
+
+    kill -s $3 $pid
+}
+
+function log_failure_msg() {
+    echo "$@" "[ FAILED ]"
+}
+
+function log_success_msg() {
+    echo "$@" "[ OK ]"
+}
+
+# Process name ( For display )
+name=telegraf
+
+# Daemon name, where is the actual executable
+daemon=/usr/bin/telegraf
+
+# pid file for the daemon
+pidfile=/var/run/telegraf/telegraf.pid
+piddir=`dirname $pidfile`
+
+if [ ! -d "$piddir" ]; then
+    mkdir -p $piddir
+    chown $USER:$GROUP $piddir
+fi
+
+# Configuration file
+config=/etc/telegraf/telegraf.conf
+confdir=/etc/telegraf/telegraf.d
+
+# If the daemon is not there, then exit.
+[ -x $daemon ] || exit 5
+
+case $1 in
+    start)
+        # Checked the PID file exists and check the actual status of process
+        if [ -e $pidfile ]; then
+            pidofproc -p $pidfile $daemon > /dev/null 2>&1 && status="0" || status="$?"
+            # If the status is SUCCESS then don't need to start again.
+            if [ "x$status" = "x0" ]; then
+                log_failure_msg "$name process is running"
+                exit 0 # Exit
+            fi
+        fi
+
+        # Bump the file limits, before launching the daemon. These will carry over to
+        # launched processes.
+        ulimit -n $OPEN_FILE_LIMIT
+        if [ $? -ne 0 ]; then
+            log_failure_msg "set open file limit to $OPEN_FILE_LIMIT"
+        fi
+
+        log_success_msg "Starting the process" "$name"
+        if command -v startproc >/dev/null; then
+            startproc -u "$USER" -g "$GROUP" -p "$pidfile" -q -- "$daemon" -pidfile "$pidfile" -config "$config" -config-directory "$confdir" $TELEGRAF_OPTS
+        elif which start-stop-daemon > /dev/null 2>&1; then
+            start-stop-daemon --chuid $USER:$GROUP --start --quiet --pidfile $pidfile --exec $daemon -- -pidfile $pidfile -config $config -config-directory $confdir $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &
+        else
+            su -s /bin/sh -c "nohup $daemon -pidfile $pidfile -config $config -config-directory $confdir $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &" $USER
+        fi
+        log_success_msg "$name process was started"
+        ;;
+
+    stop)
+        # Stop the daemon.
+        if [ -e $pidfile ]; then
+            pidofproc -p $pidfile $daemon > /dev/null 2>&1 && status="0" || status="$?"
+            if [ "$status" = 0 ]; then
+                if killproc -p $pidfile SIGTERM && /bin/rm -rf $pidfile; then
+                    log_success_msg "$name process was stopped"
+                else
+                    log_failure_msg "$name failed to stop service"
+                fi
+            fi
+        else
+            log_failure_msg "$name process is not running"
+        fi
+        ;;
+
+    reload)
+        # Reload the daemon.
+        if [ -e $pidfile ]; then
+            pidofproc -p $pidfile $daemon > /dev/null 2>&1 && status="0" || status="$?"
+            if [ "$status" = 0 ]; then
+                if killproc -p $pidfile SIGHUP; then
+                    log_success_msg "$name process was reloaded"
+                else
+                    log_failure_msg "$name failed to reload service"
+                fi
+            fi
+        else
+            log_failure_msg "$name process is not running"
+        fi
+        ;;
+
+    restart)
+        # Restart the daemon.
+        $0 stop && sleep 2 && $0 start
+        ;;
+
+    status)
+        # Check the status of the process.
+        if [ -e $pidfile ]; then
+            if pidofproc -p $pidfile $daemon > /dev/null; then
+                log_success_msg "$name Process is running"
+                exit 0
+            else
+                log_failure_msg "$name Process is not running"
+                exit 1
+            fi
+        else
+            log_failure_msg "$name Process is not running"
+            exit 3
+        fi
+        ;;
+
+    version)
+        $daemon version
+        ;;
+
+    *)
+        # For invalid arguments, print the usage message.
+        echo "Usage: $0 {start|stop|restart|status|version}"
+        exit 2
+        ;;
+esac

handlers/main.yml

@@ -7,3 +7,9 @@
     state: restarted
     enabled: yes
   become: yes
+
+- name: "Restart Windows Telegraf"
+  win_service:
+    name: Telegraf
+    start_mode: auto
+    state: restarted

meta/main.yml

@@ -2,9 +2,9 @@
 galaxy_info:
   author: Werner Dijkerman
   description: Installing and configuring Telegraf
-  company:
-  license: license BSD
-  min_ansible_version: 1.2
+  company: myCompany.Dotcom
+  license: MIT
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -15,6 +15,14 @@ galaxy_info:
     - name: Debian
       versions:
         - all
-  categories:
+    - name: opensuse
+      versions:
+        - all
+    - name: Windows
+      versions:
+        - all
+
+  galaxy_tags:
     - monitoring
+
 dependencies: []

molecule/default/Dockerfile.j2

@@ -1,7 +1,14 @@
-FROM {{ item.image }}
+# Molecule managed
 
-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
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && 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 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; \
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

molecule/default/create.yml

@@ -2,14 +2,22 @@
 - 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 }}"
+  gather_facts: false
+  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
   tasks:
+    - name: Log into a Docker registry
+      docker_login:
+        username: "{{ item.registry.credentials.username }}"
+        password: "{{ item.registry.credentials.password }}"
+        email: "{{ item.registry.credentials.email | default(omit) }}"
+        registry: "{{ item.registry.url }}"
+        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
+      with_items: "{{ molecule_yml.platforms }}"
+      when:
+        - item.registry is defined
+        - item.registry.credentials is defined
+        - item.registry.credentials.username is defined
+
     - name: Create Dockerfiles from image names
       template:
         src: "{{ molecule_scenario_directory }}/Dockerfile.j2"
@@ -20,6 +28,7 @@
     - name: Discover local Docker images
       docker_image_facts:
         name: "molecule_local/{{ item.item.name }}"
+        docker_host: "{{ item.item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
       with_items: "{{ platforms.results }}"
       register: docker_images
 
@@ -27,21 +36,49 @@
       docker_image:
         path: "{{ molecule_ephemeral_directory }}"
         name: "molecule_local/{{ item.item.image }}"
+        docker_host: "{{ item.item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
         dockerfile: "{{ item.item.dockerfile | default(item.invocation.module_args.dest) }}"
-        force: "{{ item.item.force | default(True) }}"
+        force: "{{ item.item.force | default(true) }}"
+        pull: "{{ item.item.pull | default(omit) }}"
       with_items: "{{ platforms.results }}"
       when: platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0
 
+    - name: Create docker network(s)
+      docker_network:
+        name: "{{ item }}"
+        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
+        state: present
+      with_items: "{{ molecule_yml.platforms | molecule_get_docker_networks }}"
+
     - name: Create molecule instance(s)
       docker_container:
         name: "{{ item.name }}"
-        hostname: "{{ item.name }}"
+        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
+        hostname: "{{ item.hostname | default(item.name) }}"
         image: "molecule_local/{{ item.image }}"
         state: started
-        recreate: False
-        log_driver: none
-        command: "{{ item.command | default('sleep infinity') }}"
+        recreate: false
+        log_driver: json-file
+        command: "{{ item.command | default('bash -c \"while true; do sleep 10000; done\"') }}"
         privileged: "{{ item.privileged | default(omit) }}"
+        security_opts: "{{ item.security_opts | default(omit) }}"
         volumes: "{{ item.volumes | default(omit) }}"
+        tmpfs: "{{ item.tmpfs | default(omit) }}"
         capabilities: "{{ item.capabilities | default(omit) }}"
+        exposed_ports: "{{ item.exposed_ports | default(omit) }}"
+        published_ports: "{{ item.published_ports | default(omit) }}"
+        ulimits: "{{ item.ulimits | default(omit) }}"
+        networks: "{{ item.networks | default(omit) }}"
+        dns_servers: "{{ item.dns_servers | default(omit) }}"
+      register: server
       with_items: "{{ molecule_yml.platforms }}"
+      async: 7200
+      poll: 0
+
+    - name: Wait for instance(s) creation to complete
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      register: docker_jobs
+      until: docker_jobs.finished
+      retries: 300
+      with_items: "{{ server.results }}"

molecule/default/destroy.yml

@@ -2,15 +2,31 @@
 - name: Destroy
   hosts: localhost
   connection: local
-  gather_facts: False
+  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 }}"
+        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
         state: absent
-        force_kill: "{{ item.force_kill | default(True) }}"
+        force_kill: "{{ item.force_kill | default(true) }}"
+      register: server
       with_items: "{{ molecule_yml.platforms }}"
+      async: 7200
+      poll: 0
+
+    - name: Wait for instance(s) deletion to complete
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      register: docker_jobs
+      until: docker_jobs.finished
+      retries: 300
+      with_items: "{{ server.results }}"
+
+    - name: Delete docker network(s)
+      docker_network:
+        name: "{{ item }}"
+        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
+        state: absent
+      with_items: "{{ molecule_yml.platforms | molecule_get_docker_networks }}"

molecule/default/molecule.yml

@@ -9,17 +9,71 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 
 platforms:
+  - name: influxdb
+    image: influxdb:1.7-alpine
+    command: influxd
+    groups:
+      - tsdb
+    networks:
+      - name: telegraf
+    environment:
+      INFLUXDB_DB: telegraf
   - name: telegraf-centos
     image: milcom/centos7-systemd
     privileged: True
+    groups:
+      - telegraf
+    networks:
+      - name: telegraf
   - name: telegraf-debian
-    image: maint/debian-systemd
+    image: minimum2scp/systemd-stretch
     privileged: True
+    command: /sbin/init
+    groups:
+      - telegraf
+    networks:
+      - name: telegraf
+  - name: telegraf-ubuntu
+    image: solita/ubuntu-systemd:bionic
+    privileged: True
+    command: /sbin/init
+    groups:
+      - telegraf
+    networks:
+      - name: telegraf
+  - name: telegraf-opensuse
+    image: wdijkerman/molecule-systemd-leap
+    privileged: True
+    command: /sbin/init
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - telegraf
+    networks:
+      - name: telegraf
 
 provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  inventory:
+    group_vars:
+      all:
+        telegraf_agent_output:
+          - type: influxdb
+            config:
+              - urls = ["http://influxdb:8086"]
+              - database = "telegraf"
+              - precision = "s"
+        telegraf_plugins_extra:
+          percpu-usage:
+            plugin: cpu
+            config:
+              - percpu = true
+              - totalcpu = false
+              - name_override = "percpu_usage"
+              - fielddrop = ["cpu_time*"]
+
 scenario:
   name: default
 verifier:

molecule/default/playbook.yml

@@ -1,15 +1,4 @@
 ---
-- hosts: all
-  pre_tasks:
-    - name: "Installing which on CentOS"
-      yum:
-        name: which
-        state: installed
-      when: ansible_distribution == 'CentOS'
-    - name: "Installing wget on Debian"
-      apt:
-        name: wget
-        state: installed
-      when: ansible_distribution == 'Debian'
+- hosts: telegraf
   roles:
     - role: ansible-telegraf

molecule/default/prepare.yml

@@ -0,0 +1,29 @@
+---
+
+- hosts: telegraf
+  tasks:
+    - name: "Installing packages on CentOS"
+      yum:
+        name: which
+        state: present
+      when:
+        - ansible_os_family == 'RedHat'
+
+    - name: "Installing packages on Debian"
+      apt:
+        name:
+          - wget
+          - gpg
+        state: present
+      when:
+        - ansible_os_family == 'Debian'
+
+    - name: "Installing packages on Suse"
+      zypper:
+        name:
+          - sysvinit-tools
+          - insserv-compat
+          - aaa_base
+        state: present
+      when:
+        - ansible_os_family == 'Suse'

molecule/default/tests/test_default.py

@@ -3,13 +3,13 @@ import os
 import testinfra.utils.ansible_runner
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
 
 
 def test_telegraf_running_and_enabled(Service, SystemInfo):
     telegraf = Service("telegraf")
+    if SystemInfo.distribution not in ['opensuse-leap']:
         assert telegraf.is_enabled
-    if SystemInfo.distribution == 'centos':
         assert telegraf.is_running
 
 
@@ -18,9 +18,31 @@ def test_telegraf_dot_conf(File):
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
+    assert telegraf.contains('interval = "10s"')
     assert telegraf.contains('[[inputs.cpu]]')
+    assert telegraf.contains('percpu = true')
+    assert telegraf.contains('[[outputs.influxdb]]')
+    assert telegraf.contains('["http://influxdb:8086"]')
+    assert telegraf.contains('[[inputs.net]]')
 
 
-def test_telegraf_package(Package, SystemInfo):
+def test_telegraf_dot_d_dir(File):
+    telegraf = File("/etc/telegraf/telegraf.d")
+    assert telegraf.user == "root"
+    assert telegraf.group == "root"
+    assert telegraf.mode == 0o755
+    assert telegraf.is_directory
+
+
+def test_telegraf_dot_d(File):
+    telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf")
+    assert telegraf.user == "telegraf"
+    assert telegraf.group == "telegraf"
+    assert telegraf.mode == 0o640
+    assert telegraf.contains('[[inputs.cpu]]')
+    assert telegraf.contains('totalcpu = false')
+
+
+def test_telegraf_package(Package):
     telegraf = Package('telegraf')
     assert telegraf.is_installed

molecule/default/yaml-lint.yml

@@ -4,6 +4,6 @@ extends: default
 
 rules:
   line-length:
-    max: 120
+    max: 140
     level: warning
   truthy: disable

tasks/Debian.yml

@@ -1,42 +1,54 @@
 ---
 
-- name: Ensure the system can use the HTTPS transport for APT.
+- name: "Debian | Set name if state == latest"
+  set_fact:
+    telegraf_agent_package: telegraf={{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}
+  when:
+    - telegraf_agent_package_state != "latest"
+
+- name: "Debian | Ensure the system can use the HTTPS transport for APT"
   stat:
     path: /usr/lib/apt/methods/https
   register: apt_https_transport
 
-- name: Install APT HTTPS transport.
+- name: "Debian | Install APT HTTPS transport"
   apt:
     name: "apt-transport-https"
     state: present
-  when: not apt_https_transport.stat.exists
+  when:
+    - not apt_https_transport.stat.exists
   become: yes
 
-- name: Download Telegraf apt key.
+- name: "Debian | Download Telegraf apt key"
   apt_key:
     url: "https://repos.influxdata.com/influxdb.key"
+    id: 2582E0C5
     state: present
   become: yes
 
-- name: Add Telegraf repository (using LSB).
+- name: "Debian | Add Telegraf repository (using LSB)"
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable"
     filename: "telegraf"
     state: present
   become: yes
-  when: ansible_lsb is defined and ansible_lsb.codename is defined
+  when:
+    - ansible_lsb is defined
+    - ansible_lsb.codename is defined
 
-- name: Add Telegraf repository.
+- name: "Debian | Add Telegraf repository"
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
     filename: "telegraf"
     state: present
   become: yes
-  when: ansible_lsb is not defined or ansible_lsb.codename is not defined
+  when:
+    - ansible_lsb is not defined or ansible_lsb.codename is not defined
 
-- name: "Install telegraf package | Debian"
+- name: "Debian | Install telegraf package"
   apt:
-    name: "telegraf"
-    state: installed
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+    force: True
   notify: "Restart Telegraf"
   become: yes

tasks/RedHat.yml

@@ -1,7 +1,13 @@
 ---
 # description: RedHat specific installation
 
-- name: "Add yum repository | RedHat"
+- name: "RedHat | Set name if state == latest"
+  set_fact:
+    telegraf_agent_package: telegraf-{{ telegraf_agent_version }}
+  when:
+    - telegraf_agent_package_state != "latest"
+
+- name: "RedHat | Add yum repository"
   yum_repository:
     name: influxdb
     description: InfluxDB Repository - RHEL $releasever
@@ -9,8 +15,8 @@
     gpgcheck: yes
     gpgkey: https://repos.influxdata.com/influxdb.key
 
-- name: "Install telegraf package | RedHat"
+- name: "RedHat | Install telegraf package"
   yum:
-    name: "telegraf-{{ telegraf_agent_version }}"
-    state: installed
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
   notify: "Restart Telegraf"

tasks/Suse.yml

@@ -0,0 +1,52 @@
+---
+
+- name: "Suse | Adding telegraf group"
+  group:
+    name: telegraf
+    state: present
+
+- name: "Suse | Adding telegraf user"
+  user:
+    name: telegraf
+    group: telegraf
+    state: present
+  become: yes
+
+- name: "Suse | Install repo dependencies"
+  zypper:
+    name: ["python-libxml2", "python-xml"]
+    update_cache: True
+    state: present
+  become: yes
+
+- name: "Suse | Install basic repo file"
+  zypper_repository:
+    repo: "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Factory/"
+    name: The Go Programming Language (openSUSE_Factory)
+    state: present
+    runrefresh: True
+    auto_import_keys: True
+  become: yes
+
+- name: "Suse | Install Telegraf"
+  zypper:
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+  become: yes
+
+- name: "Suse | Create directories for telegraf"
+  file:
+    path: "{{ item.path }}"
+    owner: "{{ item.owner }}"
+    state: directory
+  with_items:
+    - path: /etc/telegraf/telegraf.d/
+      owner: root
+    - path: /var/log/telegraf
+      owner: telegraf
+
+- name: "Suse | Install init file"
+  copy:
+    src: telegraf.init
+    dest: /etc/init.d/telegraf
+    mode: 0755

tasks/configure.yml

@@ -1,51 +0,0 @@
----
-# 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/configure_linux.yml

@@ -0,0 +1,111 @@
+---
+# description: Configure telegraf and get all relevent ec2 information
+
+- name: Retrieve ec2 facts
+  ec2_metadata_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 is 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 is version_compare('0.10.0', '>=')
+  notify: "Restart Telegraf"
+
+- name: "Check if extra plugins directory exists in case of exclusive"
+  stat:
+    path: /etc/telegraf/telegraf.d
+  register: telegraf_directory
+  when:
+    - telegraf_plugins_extra_exclusive
+
+- name: "Delete telegraf extra plugin path"
+  file:
+    state: absent
+    path: "/etc/telegraf/telegraf.d/"
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify: "Restart Telegraf"
+
+- name: "Create telegraf extra plugin path"
+  file:
+    state: directory
+    path: "/etc/telegraf/telegraf.d/"
+    owner: telegraf
+    group: telegraf
+    mode: 0755
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify: "Restart Telegraf"
+
+- name: "Copy telegraf extra plugins"
+  template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
+    owner: telegraf
+    group: telegraf
+    mode: 0640
+  with_dict: "{{ telegraf_plugins_extra }}"
+  loop_control:
+    label: "{{ item.key }}"
+  when:
+    - telegraf_plugins_extra is defined
+    - telegraf_plugins_extra is iterable
+    - item.value.state|default('present') != 'absent'
+  become: yes
+  notify: "Restart Telegraf"
+
+- name: "Remove telegraf extra plugins"
+  file:
+    path: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
+    state: absent
+  with_dict: "{{ telegraf_plugins_extra }}"
+  loop_control:
+    label: "{{ item.key }}"
+  when:
+    - telegraf_plugins_extra is defined
+    - telegraf_plugins_extra is iterable
+    - item.value.state|default('present') == 'absent'
+  become: yes
+  notify: "Restart Telegraf"
+
+- name: "Force restart service after reread config"
+  meta: flush_handlers
+
+- name: "Start Telegraf (If it wasn't running)"
+  service:
+    name: telegraf
+    state: started
+    enabled: yes
+  become: yes

tasks/configure_windows.yml

@@ -0,0 +1,78 @@
+---
+
+- name: "Windows | Create directory structure"
+  win_file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ telegraf_win_install_dir }}"
+    - "{{ telegraf_win_include }}"
+
+- name: "Windows | Check if file is already downloaded"
+  win_stat:
+    path: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip'
+  register: file_info
+
+- name: "Windows | Download Telegraf Agent Zip file"
+  win_get_url:
+    url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}_windows_amd64.zip
+    dest: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip'
+  when:
+    - not file_info.stat.exists
+
+- name: "Windows | Unzip file"
+  win_unzip:
+    src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip'
+    dest: "{{ telegraf_win_install_dir }}"
+    creates: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe'
+
+- name: "Windows | Configure Telegraf"
+  win_template:
+    src: telegraf.conf.j2
+    dest: '{{ telegraf_win_install_dir }}\telegraf\telegraf.conf'
+  notify: "Restart Windows Telegraf"
+
+- name: "Windows | Copy telegraf extra plugins"
+  win_template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: '{{ telegraf_win_include }}\{{ item.key }}.conf'
+  with_dict: "{{ telegraf_plugins_extra }}"
+  loop_control:
+    label: "{{ item.key }}"
+  when:
+    - telegraf_plugins_extra is defined
+    - telegraf_plugins_extra is iterable
+    - item.value.state|default('present') != 'absent'
+  notify: "Restart Windows Telegraf"
+
+- name: "Windows | Remove telegraf extra plugins"
+  win_file:
+    path: '{{ telegraf_win_include }}\{{ item.key }}.conf'
+    state: absent
+  with_dict: "{{ telegraf_plugins_extra }}"
+  loop_control:
+    label: "{{ item.key }}"
+  when:
+    - telegraf_plugins_extra is defined
+    - telegraf_plugins_extra is iterable
+    - item.value.state|default('present') == 'absent'
+  notify: "Restart Windows Telegraf"
+
+- name: "Windows | Register Service"
+  win_command: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe {{ telegraf_win_service_args | join(" ") }}'
+  register: telegraf_windows_install
+  args:
+    creates: '{{ telegraf_win_install_dir }}\.installed'
+
+- name: "Windows | Create done file so it won't register itself again"
+  win_file:
+    path: '{{ telegraf_win_install_dir }}\.installed'
+    state: touch
+  when:
+    - telegraf_windows_install is changed
+
+- name: "Windows | Set service startup mode to auto and ensure it is started"
+  win_service:
+    name: Telegraf
+    start_mode: auto
+    state: started

tasks/main.yml

@@ -1,16 +1,29 @@
 ---
 # tasks file for ansible-telegraf
 
-- name: "Install the correct repository"
-  include: "RedHat.yml"
-  when: ansible_os_family == "RedHat"
+- name: "Install on RedHat"
+  include_tasks: "RedHat.yml"
+  when:
+    - ansible_os_family == "RedHat"
 
-- name: "Install the correct repository"
-  include: "Debian.yml"
-  when: ansible_os_family == "Debian"
+- name: "Install on Debian"
+  include_tasks: "Debian.yml"
+  when:
+    - ansible_os_family == "Debian"
   tags:
     - telegraf
     - packages
 
+- name: "Install on Suse"
+  include_tasks: "Suse.yml"
+  when: ansible_os_family == "Suse"
+
 - name: "Configure telegraf"
-  include: "configure.yml"
+  include_tasks: "configure_linux.yml"
+  when:
+    - ansible_os_family != "Windows"
+
+- name: "Install / Configure telegraf on Windows"
+  include_tasks: "configure_windows.yml"
+  when:
+    - ansible_os_family == "Windows"

templates/telegraf-extra-plugin.conf.j2

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

templates/telegraf.conf.j2

@@ -21,14 +21,18 @@
     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', '>=') %}
+{% if telegraf_agent_version is 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', '>=') %}
+{% if telegraf_agent_version is version_compare('1.1', '>=') %}
+{% if ansible_os_family == "Windows" %}
+    logfile = "{{ telegraf_win_logfile }}"
+{% else %}
     logfile = "{{ telegraf_agent_logfile }}"
+{% endif %}
     omit_hostname = {{ telegraf_agent_omit_hostname | lower }}
 {% endif %}
 
@@ -90,6 +94,16 @@
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.objects is defined and item.objects is iterable %}
+{% for object in item.objects %}
+[[inputs.{{ item.plugin }}.object]]
+  ObjectName = {{ object.name | to_json }}
+  Instances = {{ object.instances | default(["*"]) }}
+  Counters = {{ object.counters | default(["*"]) }}
+  Measurement = {{ object.measurement | default("win_perf_counters") | to_json }}
+  IncludeTotal = {{ object.total | default(false) | string | lower }}
+{% endfor %}
+{% endif %}
 {% if item.specifications is defined and item.specifications is iterable %}
 [[{{item.plugin}}.specifications]]
 {% for items in item.specifications %}
@@ -98,3 +112,10 @@
 {% endif %}
 {% endfor %}
 {% endif %}
+
+{% if telegraf_plugins_default is defined and telegraf_plugins_default|length == 0 %}
+{% if telegraf_plugins_extra is defined and telegraf_plugins_extra.keys() | length == 0 %}
+# No plugins configured, added a mem plugin so telegraf doesn't stop working.
+[[inputs.mem]]
+{% endif %}
+{% endif %}