Merge pull request #131 from dj-wasabi/add-requirements-ci

Removing requirements file and use it from dj-wasabi-release repo

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: dj-wasabi
+patreon: wernerdijkerman

.github/workflows/telegraf.yml

@@ -0,0 +1,65 @@
+name: "ansible-telegraf"
+on:
+  push:
+    paths:
+      - 'defaults/**'
+      - 'files/**'
+      - 'handlers/**'
+      - 'meta/**'
+      - 'molecule/**'
+      - 'tasks/**'
+      - 'templates/**'
+      - '.github/workflows/telegraf.yml'
+  pull_request:
+    paths:
+      - 'defaults/**'
+      - 'files/**'
+      - 'handlers/**'
+      - 'meta/**'
+      - 'molecule/**'
+      - 'tasks/**'
+      - 'templates/**'
+      - '.github/workflows/telegraf.yml'
+jobs:
+  molecule:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        molecule_distro:
+          - container: centos8
+            image: geerlingguy/docker-centos8-ansible:latest
+          - container: centos7
+            image: geerlingguy/docker-centos7-ansible:latest
+          - container: ubuntu2004
+            image: geerlingguy/docker-ubuntu2004-ansible:latest
+          - container: ubuntu1804
+            image: geerlingguy/docker-ubuntu1804-ansible:latest
+          - container: ubuntu1604
+            image: geerlingguy/docker-ubuntu1604-ansible:latest
+          - container: debian9
+            image: geerlingguy/docker-debian9-ansible:latest
+          - container: debian8
+            image: geerlingguy/docker-debian8-ansible:latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v1
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          curl -so requirements.txt 'https://raw.githubusercontent.com/dj-wasabi/dj-wasabi-release/main/requirements.txt'
+          pip install -r requirements.txt
+
+      - name: Run role tests
+        run: >-
+          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
+          MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
+          molecule test

.gitignore

@@ -5,3 +5,5 @@ tests/.cache
 __pycache__
 *.retry
 pmip
+# IDE:s
+.idea

.pre-commit-config.yaml

@@ -0,0 +1,11 @@
+---
+repos:
+# - repo: https://github.com/dj-wasabi/pre-commit-hooks
+#   rev: master
+#   hooks:
+#     - id: ansible-lint
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  -   id: end-of-file-fixer
+  -   id: trailing-whitespace

.travis.yml

@@ -1,15 +0,0 @@
----
-sudo: required
-language: python
-services:
-  - docker
-
-install:
-  - pip install -r requirements.txt
-
-script:
-  - molecule --version
-  - ansible --version
-  - molecule test
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -5,6 +5,50 @@ Below an overview of all changes in the releases.
 
 Version (Release date)
 
+0.12.0 (2019-03-12)
+
+  * Download from influxdb #109
+  * Don't override package name unless "latest" #108 (By pull request: matttrach (Thanks!))
+  * Adding support for arm64 systems #106 (By pull request: remkade (Thanks!))
+  * Use items() instead of iteritems() #104 (By pull request: diego1q2w
+  * Fix: ensure apt-cache is updated before install #103 (By pull request: asfaltboy (Thanks!))
+  * on FreeBSD the telegeraf.conf is in root of /usr/local/etc. #102 (By pull request: langerma (Thanks!))
+  * Some changes for fixing FreeBSD #101
+  * basic FreeBSD support #100 (By pull request: langerma (Thanks!))
+  * Added the use_proxy argument to use a proxy (or not) #98
+  * Various small changes for molecule #97
+
+0.12.0 (2019-03-12)
+
+  * Add support for extra win_perf_counters and prevent python u'' strings #76 (By pull request: jdivy (Thanks!))
+  * Fix to work with Fedora Linux #78 (By pull request: ikke-t (Thanks!))
+  * Add Yum repo support for Amazon Linux #79 (By pull request: anthonysr-mc (Thanks!))
+  * Updating Telegraf default to 1.9.2 #80 (and some to other versions as well) (By pull request: sdurrheimer (Thanks!))
+  * [bug] debian - add cache_valid_time #81 (By pull request: pad92 (Thanks!))
+  * Fix tagpass and tagdrop #83 (By pull request: jgeusebroek (Thanks!))
+  * Remove legacy options #84 (By pull request: jgeusebroek (Thanks!))
+  * Add Docker container support #85 (By pull request: jgeusebroek (Thanks!))
+  * Added register for installation of packages #86
+  * Docker enhancements #88 (By pull request: jgeusebroek (Thanks!))
+  * Updated to Telegraf 1.10.0;Different installation methods #93
+  * Add processors section in Telegraf config #94 (By pull request: ph4r5h4d (Thanks!))
+
+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
@@ -95,7 +139,7 @@ Version (Release date)
     * tagdrop
     * interval
   * Updated documentation
-  
+
 
 0.0.2 (2015-09-20)
 

CONTRIBUTING.md

@@ -22,9 +22,9 @@ Please note that this project is released with a Contributor Code of Conduct. By
 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.
@@ -85,4 +85,4 @@ Some web pages describing for virtual env:
 
 [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. 
+**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged.

README.md

@@ -1,8 +1,39 @@
 # dj-wasabi.telegraf
 
+- [dj-wasabi.telegraf](#dj-wasabitelegraf)
+  * [Build status:](#build-status-)
+  * [Requirements](#requirements)
+    + [Supported systems](#supported-systems)
+    + [InfluxDB](#influxdb)
+    + [Docker](#docker)
+  * [Upgrade](#upgrade)
+    + [0.7.0](#070)
+  * [Role Variables](#role-variables)
+    + [Ansible role specific variables](#ansible-role-specific-variables)
+      - [Telegraf Package](#telegraf-package)
+    + [Telegraf agent process configuration.](#telegraf-agent-process-configuration)
+    + [Docker specific role variables:](#docker-specific-role-variables-)
+  * [Extra information](#extra-information)
+    + [ansible_fqdn problematic for getting hostname](#ansible-fqdn-problematic-for-getting-hostname)
+    + [Setting tags](#setting-tags)
+    + [Docker specifics](#docker-specifics)
+      - [Docker image](#docker-image)
+      - [Docker mounts](#docker-mounts)
+      - [Example Docker configuration](#example-docker-configuration)
+  * [Windows specific Variables](#windows-specific-variables)
+  * [Extra information](#extra-information-1)
+    + [telegraf_plugins_default](#telegraf-plugins-default)
+    + [telegraf_plugins_extra](#telegraf-plugins-extra)
+  * [Dependencies](#dependencies)
+  * [Example Playbook](#example-playbook)
+  * [Contributors](#contributors)
+  * [Molecule](#molecule)
+  * [License](#license)
+  * [Author Information](#author-information)
+
 ## Build status:
 
-[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf)
+[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fdj-wasabi%2Fansible-telegraf%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/dj-wasabi/ansible-telegraf/goto?ref=master) <img src="https://img.shields.io/ansible/role/d/5173"/> <img src="https://img.shields.io/ansible/quality/5173"/>
 
 This role will install and configure telegraf.
 
@@ -14,8 +45,33 @@ Design goals are to have a minimal memory footprint with a plugin system so that
 
 ## Requirements
 
+### Supported systems
 
-No requirements. (Yes, an Influxdb server somewhere on the network will help though ;-) )
+This role supports the following systems:
+
+ * Red Hat
+ * Debian
+ * Ubuntu
+ * Docker container
+ * (Open)Suse
+ * Windows (Best effort)
+ * FreeBSD (Best effort)
+
+So, you'll need one of those systems.. :-)
+Please sent Pull Requests or suggestions when you want to use this role for other systems.
+
+### InfluxDB
+
+You'll need an InfluxDB instance running somewhere on your network. Or 1 of the other output types found on https://github.com/influxdata/telegraf/#output-plugins
+
+### Docker
+
+Docker needs to be installed on the target host. I can recommend these roles to install Docker:
+
+* [jgeusebroek.docker](https://galaxy.ansible.com/jgeusebroek/docker)
+* [geerlingguy.docker](https://galaxy.ansible.com/geerlingguy/docker)
+
+This is only the case when the configuration is needed for a Telegraf inside a Docker container (When `telegraf_agent_docker: True`).
 
 ## Upgrade
 ### 0.7.0
@@ -24,13 +80,33 @@ 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
 
-The following parameters can be set for the Telegraf agent:
+### Ansible role specific variables
+
+Specifying the version to be installed:
+
+* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.10.0`
+
+How `Telegraf` needs to be installed. There are 4 methods in getting `Telegraf` installed on the target host:
+
+* Via the package manager, like `yum`, `apt` or `zypper` ("repo");
+* Via a download from the `https://dl.influxdata.com/` site ("online");
+* Already provided and is already available on the target host, but not yet installed/configured ("offline");
+* Already installed on the target host or done manually, but not yet configured ("manual");
+
+This can be configured by setting `telegraf_agent_package_method` to one of the appropriate values ( `repo`, `online`, `offline` or `manual`).
+
+#### Telegraf Package
+
+These properties set in how and what package will be installed.
+
+* `telegraf_agent_package`: The name of the Telegraf package to install. When `telegraf_agent_package_method` is set to `online` or `offline`, it needs to have the full path of the file. Example: `telegraf_agent_package: /tmp/telegraf.rpm`. Default: `telegraf_agent_package: telegraf`.
+* `telegraf_agent_package_method`: The installation method to be used. Can choose between: `repo`, `offline` or `online`.
+* `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 process configuration.
 
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.0.0`
 * `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
@@ -45,7 +121,36 @@ The following parameters can be set for the Telegraf agent:
 * `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
+### Docker specific role variables:
+
+* `telegraf_agent_docker`: Install Telegraf as a docker container. Default: `False`
+* `telegraf_agent_docker_name`: Name of the docker container. Default: `telegraf`
+* `telegraf_agent_docker_network_mode`: Networking mode of the docker container. Default: `bridge`
+* `telegraf_agent_docker_restart_policy`: Docker container restart policy. Default: `unless-stopped`
+* `telegraf_uid_docker`: Override user id. Default: `995`
+* `telegraf_gid_docker`: Override group id. Default: `998`
+
+Full agent settings reference: [https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration).
+
+## Extra information
+
+### ansible_fqdn problematic for getting hostname
+
+Extra info regarding: ansible_fqdn problematic for getting hostname #105
+
+*Describe the bug*
+
+In some nodes I'm getting weird hostnames, mostly localhost.localdomain. Those nodes show proper configuration in hostnamectl. I've seen you're using 'ansible_fqdn' as default.
+
+Seems like ansible_fqdn and ansible_hostname can give different results, and sometimes even very weird results, as it sometimes makes DNS calls (which is not under my control in that cases) to infer that names.
+
+*Fix proposal*
+
+In my playbook I've added this parameter:
+
+	telegraf_agent_hostname: "{{ ansible_nodename }}"
+
+### Setting tags
 
 You can set tags for the host running telegraf:
 
@@ -60,8 +165,8 @@ Specifying an output. The default is set to localhost, you'll have to specify th
 	    config:
 	      - urls = ["http://localhost:8086"]
 	      - database = "telegraf"
-            tagpass:
-              - diskmetrics = ["true"]
+        tagpass:
+          - cpu = ["cpu0"]
 
 The config will be printed line by line into the configuration, so you could also use:
 
@@ -70,11 +175,80 @@ The config will be printed line by line into the configuration, so you could als
 
 and it will be printed in the configuration file.
 
+### Docker specifics
+
+#### Docker image
+
+The official [Influxdata Telegraf image](https://hub.docker.com/_/telegraf) is used. 	`telegraf_agent_version` will translate to the image tag.
+
+#### Docker mounts
+
+Please note that the Docker container bind mounts basicly your whole system (read-only) to monitor the Docker Engine Host from within the container. To be precise:
+
+	- /etc/telegraf:/etc/telegraf:ro
+	- /:/hostfs:ro
+	- /etc:/hostfs/etc:ro
+	- /proc:/hostfs/proc:ro
+	- /sys:/hostfs/sys:ro
+	- /var/run:/var/run:ro
+
+More information: [https://github.com/influxdata/telegraf/blob/master/docs/FAQ.md](https://github.com/influxdata/telegraf/blob/master/docs/FAQ.md).
+
+#### Example Docker configuration
+
+	telegraf_agent_docker: True
+	# Force host networking mode, so Docker Engine Host traffic metrics can be gathered.
+	telegraf_agent_docker_network_mode: host
+	# Force a specific image tag.
+	telegraf_agent_version: 1.10.0-alpine
+
+	telegraf_plugins_default:
+	  - plugin: cpu
+	    config:
+	      - percpu = true
+	  - plugin: disk
+	    tagpass:
+	      - fstype = [ "ext4", "xfs" ]
+	    tagdrop:
+	      - path = [ "/etc", "/etc/telegraf", "/etc/hostname", "/etc/hosts", "/etc/resolv.conf" ]
+	  - plugin: io
+	  - plugin: mem
+	  - plugin: system
+	  - plugin: swap
+	  - plugin: netstat
+	  - plugin: processes
+	  - plugin: docker
+	    config:
+	      - endpoint = "unix:///var/run/docker.sock"
+	      - timeout = "5s"
+
+## 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 or other service 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.
+
+## MacOS specific Variables
+
+**NOTE**
+
+_MacOS support is as the Window Support an best effort and not officially supported._
+
+* `telegraf_mac_user`:  Telegraf will run as this user (needed as running things as other users using brew is problematic)
+
+## Extra information
+
 There are two properties which are similar, but are used differently. Those are:
 
 * `telegraf_plugins_default`
 * `telegraf_plugins_extra`
 
+### telegraf_plugins_default
+
 With the property `telegraf_plugins_default` it is set to use the default set of Telegraf plugins. You could override it with more plugins, which should be enabled at default.
 
 	telegraf_plugins_default:
@@ -90,6 +264,8 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 
 Every telegraf agent has these as a default configuration.
 
+### telegraf_plugins_extra
+
 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
@@ -98,28 +274,51 @@ 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:
 
 * `tags` An k/v tags to apply to a specific input's measurements. Can be used on any stage for better filtering for example in outputs.
-* `pass`: An array of strings that is used to filter metrics generated by the current plugin. Each string in the array is tested as a prefix against metric names and if it matches, the metric is emitted.
-* `drop`: The inverse of pass, if a metric name matches, it is not emitted.
 * `tagpass`: (added in Telegraf 0.1.5) tag names and arrays of strings that are used to filter metrics by the current plugin. Each string in the array is tested as an exact match against the tag name, and if it matches the metric is emitted.
 * `tagdrop`: (added in Telegraf 0.1.5) The inverse of tagpass. If a tag matches, the metric is not emitted. This is tested on metrics that have passed the tagpass test.
 * `interval`: How often to gather this metric. Normal plugins use a single global interval, but if one particular plugin should be run less or more often, you can configure that here.
+* `filter.name`: Like when there is an extra filter that needs to be configured, like `grok` for a `logparser` plugin.
+* `filter.config`: The extra configuration for the - in the `filter.name` example - `grok` filter. (See example below)
 
 An example might look like this:
 
 	telegraf_plugins_default:
 	  - plugin: disk
 	    interval: 12
-            tags:
-                - diskmetrics = "true"
+        tags:
+          - diskmetrics = "true"
 	    tagpass:
 	      - fstype = [ "ext4", "xfs" ]
     	  - path = [ "/opt", "/home" ]
 
+If you want to define processors you can simply use `telegraf_processors` variable.
+An example might look like this:
+```
+telegraf_processors:
+  - processor: rename
+  - processor: rename.replace
+    config:
+        - tag = "level"
+        - dest = "LogLevel"
+```
 
+When you want to make use of the `grok` filter for the logparser:
+
+	telegraf_plugins_extra:
+		logparser:
+		plugin: logparser
+		config:
+			- files = ["/var/log/messages"]
+			- from_beginning = false
+		filter:
+			name: grok
+			config:
+			- patterns = ["invoked oom-killer"]
 
 ## Dependencies
 
@@ -133,24 +332,34 @@ No dependencies
 
 ## Contributors
 
-The following have contributed to this Ansible role:
+The following have contributed to this Ansible role (Provided with: `git shortlog -s -n`):
 
- * Thomas Szymanski
- * Alejandro
- * Slawomir Skowron
- * Ismael
- * Laurent Hoss
- * Anthony ARNAUD
- * Rick Box
- * Emerson Knapp
- * gaelL
- * Steven Wirges
- * zend0
- * Angristan
- * Olivier Boukili
- * Romain BUREAU
- * TheCodeAssassin
- * tjend
+* Werner Dijkerman
+* Thomas Szymanski
+* Jeroen Geusebroek
+* or
+* Alejandro
+* Troy Jendra
+* Slawomir Skowron
+* gaelL
+* Laurent Hoss
+* Ismael
+* Anthony ARNAUD
+* Ilkka Tengvall
+* Rick Box
+* Steven Wirges
+* Jack Ivy
+* Emerson Knapp
+* zend0
+* Angristan
+* Miroslav Prasil
+* Olivier Boukili
+* Pascal
+* Romain BUREAU
+* Ryan Conway
+* Steve Durrheimer
+* TheCodeAssassin
+* aroglian
 
 Thank you all!
 

defaults/main.yml

@@ -1,7 +1,15 @@
 ---
+telegraf_enabled: True
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 1.7.3
+telegraf_agent_version: 1.10.0
+telegraf_agent_version_patch: 1
+telegraf_agent_package: telegraf
+telegraf_agent_package_file_deb: telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
+telegraf_agent_package_file_rpm: telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
+telegraf_agent_package_path: /tmp
+telegraf_agent_package_method: repo
+telegraf_agent_package_state: present
 telegraf_agent_hostname: "{{ ansible_fqdn }}"
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
@@ -10,6 +18,15 @@ telegraf_agent_flush_interval: 10
 telegraf_agent_flush_jitter: 0
 telegraf_agent_aws_tags: False
 telegraf_agent_aws_tags_prefix: ""
+telegraf_agent_config_path: /etc/telegraf
+
+# Docker specific settings
+telegraf_uid_docker: 998
+telegraf_gid_docker: 995
+telegraf_agent_docker: False
+telegraf_agent_docker_name: telegraf
+telegraf_agent_docker_network_mode: bridge
+telegraf_agent_docker_restart_policy: unless-stopped
 
 # v0.13 settings (not sure if supported in older version):
 telegraf_agent_collection_jitter: 0
@@ -47,6 +64,25 @@ 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_yum_baseurl:
+  amazon: "https://repos.influxdata.com/centos/6/$basearch/stable"
+  centos: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
+  default: "https://repos.influxdata.com/{{ ansible_distribution|lower }}/{{ telegraf_redhat_releasever }}/$basearch/stable"
+  redhat: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
+telegraf_yum_gpgkey: "https://repos.influxdata.com/influxdb.key"
+
+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 }}
+
+telegraf_mac_user: user
+telegraf_mac_group: admin

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

@@ -6,4 +6,20 @@
     name: telegraf
     state: restarted
     enabled: yes
+  when: not telegraf_agent_docker
   become: yes
+
+- name: "Restart Telegraf container"
+  docker_container:
+    name: "{{ telegraf_agent_docker_name }}"
+    restart: True
+  when: telegraf_agent_docker
+
+- name: "Restart Windows Telegraf"
+  win_service:
+    name: Telegraf
+    start_mode: auto
+    state: restarted
+
+- name: "Restart MacOS Telegraf"
+  shell: brew services restart telegraf

meta/main.yml

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

molecule/default/Dockerfile.j2

@@ -1,7 +0,0 @@
-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

@@ -1,46 +0,0 @@
-*******
-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/converge.yml

@@ -0,0 +1,4 @@
+---
+- hosts: telegraf
+  roles:
+    - role: ansible-telegraf

molecule/default/create.yml

@@ -1,47 +0,0 @@
----
-- 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

@@ -1,16 +0,0 @@
----
-- 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

@@ -3,28 +3,56 @@ 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
+  - name: influxdb
+    image: influxdb:1.7-alpine
+    command: influxd
+    groups:
+      - tsdb
+    networks:
+      - name: telegraf
+    environment:
+      INFLUXDB_DB: telegraf
+  - name: telegraf-${MY_MOLECULE_CONTAINER:-centos8}
+    image: ${MY_MOLECULE_IMAGE:-"geerlingguy/docker-centos8-ansible"}
+    command: ${MY_MOLECULE_DOCKER_COMMAND:-""}
     privileged: True
-  - name: telegraf-debian
-    image: minimum2scp/systemd-stretch
-    privileged: True
-    command: /sbin/init
-  - name: telegraf-ubuntu
-    image: solita/ubuntu-systemd:bionic
-    privileged: True
-    command: /sbin/init
+    pre_build_image: True
+    networks:
+      - name: telegraf
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - telegraf
 
 provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  inventory:
+    group_vars:
+      debian:
+        telegraf_agent_package_method: online
+      all:
+        telegraf_agent_package_state: latest
+        telegraf_agent_output:
+          - type: influxdb
+            config:
+              - urls = ["http://influxdb:8086"]
+              - database = "telegraf"
+              - precision = "s"
+        telegraf_plugins_extra:
+          logparser:
+            plugin: logparser
+            config:
+              - files = ["/var/log/messages"]
+              - from_beginning = false
+            filter:
+              name: grok
+              config:
+                - patterns = ["invoked oom-killer"]
+
 scenario:
   name: default
 verifier:

molecule/default/playbook.yml

@@ -1,22 +0,0 @@
----
-- hosts: all
-  pre_tasks:
-    - name: "Installing which on CentOS"
-      yum:
-        name: which
-        state: present
-      when:
-        - ansible_os_family == 'RedHat'
-
-    - name: "Installing wget on Debian"
-      apt:
-        name: "{{ item }}"
-        state: present
-      when:
-        - ansible_os_family == 'Debian'
-      with_items:
-        - wget
-        - gpg
-
-  roles:
-    - role: ansible-telegraf

molecule/default/prepare.yml

@@ -0,0 +1,40 @@
+---
+
+- hosts: telegraf
+  tasks:
+    - name: "Installing packages on CentOS"
+      yum:
+        name: which
+        state: present
+      when:
+        - ansible_os_family == 'RedHat'
+
+    - name: "Apt get update"
+      shell: apt-get update && apt-get install -y python-apt
+      when:
+        - ansible_os_family == 'Debian'
+
+    - name: debug
+      debug:
+        var: ansible_distribution_major_version
+
+    - name: "Installing packages on Debian"
+      apt:
+        name:
+          - wget
+          - python-apt
+          - "{{ 'gnupg-agent' if ansible_distribution_major_version in ['8', '18', '16'] else 'gpg-agent' }}"
+        update_cache: True
+        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,24 +3,46 @@ 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")
-    assert telegraf.is_enabled
-    if SystemInfo.distribution == 'centos':
+def test_telegraf_running_and_enabled(host):
+    telegraf = host.service("telegraf")
+    if host.system_info.distribution not in ['opensuse-leap']:
+        assert telegraf.is_enabled
         assert telegraf.is_running
 
 
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
+def test_telegraf_dot_conf(host):
+    telegraf = host.file("/etc/telegraf/telegraf.conf")
     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):
-    telegraf = Package('telegraf')
+def test_telegraf_dot_d_dir(host):
+    telegraf = host.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(host):
+    telegraf = host.file("/etc/telegraf/telegraf.d/logparser.conf")
+    assert telegraf.user == "telegraf"
+    assert telegraf.group == "telegraf"
+    assert telegraf.mode == 0o640
+    assert telegraf.contains('[[inputs.logparser]]')
+    assert telegraf.contains('from_beginning = false')
+
+
+def test_telegraf_package(host):
+    telegraf = host.package('telegraf')
     assert telegraf.is_installed

molecule/default/yaml-lint.yml

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

requirements.txt

@@ -1,4 +0,0 @@
-ansible==2.4.4.0
-docker==3.3.0
-molecule==2.13.1
-testinfra==1.12.0

tasks/Debian.yml

@@ -1,42 +1,104 @@
 ---
 
-- 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 | Set telegraf_agent_package_arch"
+  set_fact:
+    telegraf_agent_package_arch: "{{ ansible_architecture }}"
+
+- name: "Debian | Set telegraf_agent_package_arch specific for x86_64"
+  set_fact:
+    telegraf_agent_package_arch: "amd64"
+  when:
+    - ansible_architecture == "x86_64"
+
+- name: "Debian | Set telegraf_agent_package_arch specific for arm64"
+  set_fact:
+    telegraf_agent_package_arch: "armhf"
+  when:
+    - ansible_architecture == "arm64"
+
+- 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
+  register: are_telegraf_dependencies_packages_installed
+  until: are_telegraf_dependencies_packages_installed is succeeded
+  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
+  register: are_telegraf_dependencies_keys_installed
+  until: are_telegraf_dependencies_keys_installed is succeeded
   become: yes
+  when:
+    - telegraf_agent_package_method == "repo"
 
-- 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:
+    - telegraf_agent_package_method == "repo"
+    - 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:
+    - telegraf_agent_package_method == "repo"
+    - ansible_lsb is not defined or ansible_lsb.codename is not defined
 
-- name: "Install telegraf package | Debian"
+- name: "Debian | Download Telegraf package (online)"
+  get_url:
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_deb }}
+    dest: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
+    use_proxy: "{{ true if http_proxy is defined and http_proxy else false }}"
+  environment:
+    http_proxy: "{{ http_proxy | default(None) | default(omit) }}"
+    https_proxy: "{{ https_proxy | default(None) | default(omit) }}"
+  when:
+    - telegraf_agent_package_method == "online"
+
+- name: "Debian | Install Telegraf package"
   apt:
-    name: "telegraf"
-    state: present
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+    update_cache: yes
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
   notify: "Restart Telegraf"
   become: yes
+  when:
+    - telegraf_agent_package_method == "repo"
+
+- name: "Debian | Install Telegraf package"
+  apt:
+    deb: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
+    state: "present"
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
+  notify: "Restart Telegraf"
+  become: yes
+  when:
+    - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"

tasks/FreeBSD.yml

@@ -0,0 +1,24 @@
+---
+# description: FreeBSD specific installation
+
+- name: "FreeBSD | set package name"
+  set_fact:
+    telegraf_agent_package: telegraf
+
+- name: "FreeBSD | Install Telegraf package"
+  pkgng:
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
+  notify: "Restart Telegraf"
+
+- name: "FreeBSD | add telegraf_flags for extra plugins"
+  shell: sysrc telegraf_flags="-quiet -config-directory=/usr/local/etc/telegraf.d"
+  tags:
+    - skip_ansible_lint
+
+- name: "FreeBSD | add telegraf to init"
+  shell: sysrc telegraf_enable="YES"
+  tags:
+    - skip_ansible_lint

tasks/MacOS.yml

@@ -0,0 +1,14 @@
+---
+# description: MacOS specific installation
+
+- name: "MacOS | set package name"
+  set_fact:
+    telegraf_agent_package: telegraf
+
+- name: "MacOS | Install Telegraf package"
+  package:
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
+  notify: "Restart Telegraf"

tasks/RedHat.yml

@@ -1,16 +1,45 @@
 ---
 # 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: Use RHEL 7 packages for Fedora
+  set_fact:
+    telegraf_redhat_releasever: 7
+  when:
+    - ansible_distribution == "Fedora"
+
+- name: "RedHat | Add yum repository"
   yum_repository:
     name: influxdb
     description: InfluxDB Repository - RHEL $releasever
-    baseurl: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
-    gpgcheck: yes
-    gpgkey: https://repos.influxdata.com/influxdb.key
+    baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}"
+    gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}"
+    gpgkey: "{{ telegraf_yum_gpgkey }}"
+  become: yes
+  when:
+    - telegraf_agent_package_method == "repo"
 
-- name: "Install telegraf package | RedHat"
-  yum:
-    name: "telegraf-{{ telegraf_agent_version }}"
-    state: installed
+- name: "RedHat | Download Telegraf package (online)"
+  get_url:
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_rpm }}
+    dest: "{{ telegraf_agent_package }}"
+    use_proxy: "{{ true if http_proxy is defined and http_proxy else false }}"
+  environment:
+    http_proxy: "{{ http_proxy | default(None) | default(omit) }}"
+    https_proxy: "{{ https_proxy | default(None) | default(omit) }}"
+  when:
+    - telegraf_agent_package_method == "online"
+
+- name: "RedHat | Install Telegraf package"
+  package:
+    name: "{{ telegraf_agent_package }}"
+    state: "{{ telegraf_agent_package_state }}"
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
+  become: yes
   notify: "Restart Telegraf"

tasks/Suse.yml

@@ -0,0 +1,56 @@
+---
+
+- 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
+  register: are_telegraf_dependencies_packages_installed
+  until: are_telegraf_dependencies_packages_installed is succeeded
+  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 }}"
+  register: is_telegraf_package_installed
+  until: is_telegraf_package_installed is succeeded
+  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,60 +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 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: "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 }}"
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and 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 }}"
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and item.value.state|default('present') == 'absent'"
-  become: yes
-  notify: "Restart Telegraf"
-
-- name: "Force restart service after reread config"
-  meta: flush_handlers

tasks/configure_linux.yml

@@ -0,0 +1,188 @@
+---
+# description: Configure telegraf and get all relevent ec2 information
+
+- name: Retrieve ec2 facts
+  ec2_metadata_facts:
+  when:
+    - telegraf_agent_aws_tags
+
+- name: "Add prefix path"
+  set_fact:
+    telegraf_agent_config_path: /usr/local/etc
+  when:
+    - ansible_os_family == "FreeBSD"
+
+- 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
+    - Restart Telegraf container
+
+- name: "Copy the template for versions >= 0.10.0"
+  template:
+    src: telegraf.conf.j2
+    dest: "{{ telegraf_agent_config_path }}/telegraf.conf"
+    owner: telegraf
+    group: telegraf
+    mode: 0640
+  become: yes
+  when:
+    - telegraf_agent_version is version_compare('0.10.0', '>=')
+  notify:
+    - Restart Telegraf
+    - Restart Telegraf container
+
+- name: "Check if extra plugins directory exists in case of exclusive"
+  stat:
+    path: "{{ telegraf_agent_config_path }}/telegraf.d"
+  register: telegraf_directory
+  when:
+    - telegraf_plugins_extra_exclusive
+
+- name: "Delete telegraf extra plugin path"
+  file:
+    state: absent
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify:
+    - Restart Telegraf
+    - Restart Telegraf container
+
+- name: "Create telegraf extra plugin path"
+  file:
+    state: directory
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
+    owner: telegraf
+    group: telegraf
+    mode: 0755
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify:
+    - Restart Telegraf
+    - Restart Telegraf container
+
+- name: "Copy telegraf extra plugins"
+  template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: "{{ telegraf_agent_config_path }}/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
+    - Restart Telegraf container
+
+- name: "Remove telegraf extra plugins"
+  file:
+    path: "{{ telegraf_agent_config_path }}/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
+    - Restart Telegraf container
+
+- name: "Force restart service after reread config"
+  meta: flush_handlers
+
+- name: "Start Telegraf (If it wasn't running)"
+  service:
+    name: telegraf
+    state: "{{ telegraf_enabled | ternary('started', 'stopped') }}"
+    enabled: "{{ telegraf_enabled }}"
+  become: yes
+  when: not telegraf_agent_docker
+
+- name: Configure system for for docker plugin
+  block:
+    - name: Add telegraf user to docker group
+      user:
+        name: telegraf
+        groups: docker
+        append: true
+      become: true
+      notify:
+        - Restart Telegraf
+
+  when: "'docker' in telegraf_plugins_extra and not telegraf_agent_docker"
+
+- name: Configure system for for smart plugin
+  block:
+    - name: Install smartmontools
+      become: true
+      package:
+        name: smartmontools
+
+    - name: Find path of smartctl
+      shell: which smartctl
+      register: which_smartctl
+      ignore_errors: true
+      changed_when: false
+      become: true
+
+    - name: Ensure telegraf user can execute smartctl
+      blockinfile:
+        marker: "# {mark} ANSIBLE MANAGED BLOCK (Ensure telegraf user can execute smartctl)"
+        dest: "/etc/sudoers.d/telegraf"
+        block: "telegraf ALL=(root) NOPASSWD: {{ which_smartctl.stdout }}"
+        create: true
+      become: true
+      notify:
+        - Restart Telegraf
+
+  when: "'smart' in telegraf_plugins_extra and not telegraf_agent_docker"
+
+- name: Configure system for for sensors plugin
+  block:
+    - name: Debian | Install lm-sensors
+      package:
+        name: lm-sensors
+      become: true
+      notify:
+        - Restart Telegraf
+      when: ansible_os_family == "Debian"
+    - name: RedHat | Install lm-sensors
+      package:
+        name: lm_sensors
+      become: true
+      notify:
+        - Restart Telegraf
+      when: ansible_os_family == "RedHat"
+
+  when: "'sensors' in telegraf_plugins_extra and not telegraf_agent_docker"

tasks/configure_macos.yml

@@ -0,0 +1,128 @@
+---
+# description: Configure telegraf and get all relevent ec2 information
+
+- name: Retrieve ec2 facts
+  ec2_metadata_facts:
+  when:
+    - telegraf_agent_aws_tags
+
+- name: "Add prefix path"
+  set_fact:
+    telegraf_agent_config_path: /usr/local/etc
+  when:
+    - ansible_os_family in ["FreeBSD", "Darwin"]
+
+- 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_mac_user }}"
+    group: "{{ telegraf_mac_group }}"
+    mode: 0640
+  become: yes
+  when:
+    - telegraf_agent_version is version_compare('0.10.0', '<')
+  notify:
+    - Restart Telegraf
+    - Restart Telegraf container
+
+- name: "Copy the template for versions >= 0.10.0"
+  template:
+    src: telegraf.conf.j2
+    dest: "{{ telegraf_agent_config_path }}/telegraf.conf"
+    owner: "{{ telegraf_mac_user }}"
+    group: "{{ telegraf_mac_group }}"
+    mode: 0640
+  become: yes
+  when:
+    - telegraf_agent_version is version_compare('0.10.0', '>=')
+  notify:
+    - Restart MacOS Telegraf
+    - Restart Telegraf container
+
+- name: "Check if extra plugins directory exists in case of exclusive"
+  stat:
+    path: "{{ telegraf_agent_config_path }}/telegraf.d"
+  register: telegraf_directory
+  when:
+    - telegraf_plugins_extra_exclusive
+
+- name: "Delete telegraf extra plugin path"
+  file:
+    state: absent
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify:
+    - Restart MacOS Telegraf
+    - Restart Telegraf container
+
+- name: "Create telegraf extra plugin path"
+  file:
+    state: directory
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
+    owner: "{{ telegraf_mac_user }}"
+    group: "{{ telegraf_mac_group }}"
+    mode: 0755
+  when:
+    - telegraf_plugins_extra_exclusive
+    - telegraf_directory.stat.exists
+  become: yes
+  notify:
+    - Restart MacOS Telegraf
+    - Restart Telegraf container
+
+- name: "Copy telegraf extra plugins"
+  template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: "{{ telegraf_agent_config_path }}/telegraf.d/{{ item.key }}.conf"
+    owner: "{{ telegraf_mac_user }}"
+    group: "{{ telegraf_mac_group }}"
+    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 MacOS Telegraf
+    - Restart Telegraf container
+
+- name: "Remove telegraf extra plugins"
+  file:
+    path: "{{ telegraf_agent_config_path }}/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 MacOS Telegraf
+    - Restart Telegraf container
+
+- name: "Force restart service after reread config"
+  meta: flush_handlers
+
+- name: "Start Telegraf (If it wasn't running)"
+  shell: brew services start telegraf
+  register: brew_services_start_telegraf
+  changed_when: '"Successfully started `telegraf`" in brew_services_start_telegraf.stdout'
+  when: not telegraf_agent_docker

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

@@ -0,0 +1,59 @@
+---
+
+- name: Adding Telegraf group
+  group:
+    name: telegraf
+    state: present
+    gid: "{{ telegraf_gid_docker }}"
+
+- name: Adding Telegraf user
+  user:
+    name: telegraf
+    group: telegraf
+    state: present
+    create_home: False
+    home: /etc/telegraf
+    uid: "{{ telegraf_uid_docker }}"
+    system: True
+  become: yes
+
+- name: Create /etc/telegraf (home) directory
+  file:
+    path: /etc/telegraf
+    owner: telegraf
+    group: telegraf
+    mode: 0750
+    state: directory
+  become: yes
+
+- name: Create /etc/telegraf.d directory
+  file:
+    path: /etc/telegraf/telegraf.d
+    owner: telegraf
+    group: telegraf
+    mode: 0750
+    state: directory
+  become: yes
+
+- name: Ensure Telegraf Docker container is running
+  docker_container:
+    name: "{{ telegraf_agent_docker_name }}"
+    image: "telegraf:{{ telegraf_agent_version }}"
+    state: started
+    restart_policy: "{{ telegraf_agent_docker_restart_policy }}"
+    command: -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d
+    network_mode: "{{ telegraf_agent_docker_network_mode }}"
+    security_opts:
+      - apparmor:unconfined
+    volumes:
+      - /etc/telegraf:/etc/telegraf:ro
+      - /:/hostfs:ro
+      - /etc:/hostfs/etc:ro
+      - /proc:/hostfs/proc:ro
+      - /sys:/hostfs/sys:ro
+      - /var/run:/var/run:ro
+    env:
+      HOST_MOUNT_PREFIX: /hostfs
+      HOST_ETC: /hostfs/etc
+      HOST_PROC: /hostfs/proc
+      HOST_SYS: /hostfs/sys

tasks/main.yml

@@ -1,16 +1,47 @@
 ---
 # tasks file for ansible-telegraf
 
-- name: "Install the correct repository"
+- name: "Install on RedHat"
   include_tasks: "RedHat.yml"
-  when: ansible_os_family == "RedHat"
+  when:
+    - ansible_os_family == "RedHat" and not telegraf_agent_docker
 
-- name: "Install the correct repository"
+- name: "Install on Debian"
   include_tasks: "Debian.yml"
-  when: ansible_os_family == "Debian"
+  when:
+    - ansible_os_family == "Debian" and not telegraf_agent_docker
   tags:
     - telegraf
     - packages
 
-- name: "Configure telegraf"
-  include_tasks: "configure.yml"
+- name: "Install on Suse"
+  include_tasks: "Suse.yml"
+  when: ansible_os_family == "Suse" and not telegraf_agent_docker
+
+- name: "Install on FreeBSD"
+  include_tasks: "FreeBSD.yml"
+  when:
+    - ansible_os_family == "FreeBSD" and not telegraf_agent_docker
+
+- name: "Install on MacOS"
+  include_tasks: "MacOS.yml"
+  when:
+    - ansible_os_family == "Darwin" and not telegraf_agent_docker
+
+- include_tasks: "docker.yml"
+  when: telegraf_agent_docker
+
+- name: "Configure Telegraf"
+  include_tasks: "configure_linux.yml"
+  when:
+    - ansible_os_family not in ['Windows', 'Darwin']
+
+- name: "Install / Configure telegraf on Windows"
+  include_tasks: "configure_windows.yml"
+  when:
+    - ansible_os_family == "Windows" and not telegraf_agent_docker
+
+- name: "Install / Configure telegraf on MacOS"
+  include_tasks: "configure_macos.yml"
+  when:
+    - ansible_os_family == "Darwin" and not telegraf_agent_docker

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

@@ -9,7 +9,7 @@
 
 {% 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 }}"
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}
 
@@ -27,6 +27,18 @@
 {% for items in item.config %}
     {{ items }}
 {% endfor %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[outputs.{{ item.type }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[outputs.{{ item.type }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
 {% endfor %}
 {% endif %}
 
@@ -43,36 +55,17 @@
 {% endfor %}
 {% endif %}
 {% if item.tagpass is defined and item.tagpass is iterable %}
-[{{ item.plugin }}.tagpass]
+[inputs.{{ item.plugin }}.tagpass]
 {% for items in item.tagpass %}
     {{ items }}
 {% endfor %}
 {% endif %}
 {% if item.tagdrop is defined and item.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
+[inputs.{{ item.plugin }}.tagdrop]
 {% for items in item.tagdrop %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ 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 %}

templates/telegraf-extra-plugin.conf.j2

@@ -16,32 +16,42 @@
 {% endfor %}
 {% endif %}
 {% if item.value.tagpass is defined and item.value.tagpass is iterable %}
-[{{ item.value.plugin | default(item.key) }}.tagpass]
+[inputs.{{ 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.value.plugin | default(item.key) }}.tagdrop]
+[inputs.{{ 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.value.plugin | default(item.key) }}.pass]
-{% for items in item.value.pass %}
+{% if item.value.filter is defined %}
+{% if item.value.filter.name is defined %}
+[inputs.{{ item.value.plugin | default(item.key) }}.{{ item.value.filter.name | default("grok") }}]
+{% if item.value.filter.config is defined and item.value.filter.config is iterable %}
+{% for items in item.value.filter.config %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.value.drop is defined and item.value.drop is iterable %}
-[{{ item.value.plugin | default(item.key) }}.drop]
-{% for items in item.value.drop %}
-    {{ items }}
+{% endif %}
+{% endif %}
+{% if item.value.objects is defined and item.value.objects is iterable %}
+{% for object in item.value.objects %}
+[[inputs.{{ item.value.plugin | default(item.key) }}.object]]
+  ObjectName = {{ object.name | to_json }}
+  Instances = {{ object.instances | default(["*"]) | to_json }}
+  Counters = {{ object.counters | default(["*"]) | to_json }}
+  Measurement = {{ object.measurement | default("win_perf_counters") | to_json }}
+  IncludeTotal = {{ object.total | default(false) | string | lower }}
 {% endfor %}
 {% endif %}
-{% if item.value.specifications is defined and item.value.specifications is iterable %}
-[[{{item.value.plugin | default(item.key)}}.specifications]]
-{% for items in item.value.specifications %}
-    {{ items }}
+{% if item.value.queries is defined and item.value.queries is iterable %}
+{% for query in item.value.queries %}
+[[inputs.{{ item.value.plugin | default(item.key) }}.query]]
+{% for item in item.value.queries[query] %}
+    {{ item }}
+{% endfor %}
 {% endfor %}
 {% endif %}

templates/telegraf.conf.j2

@@ -8,8 +8,8 @@
 {% 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 }}"
+{% for key, value in ec2_tags.tags.items()%}
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}
 
@@ -28,7 +28,11 @@
     quiet = {{ telegraf_agent_quiet | lower }}
 {% endif %}
 {% 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 %}
 
@@ -42,6 +46,18 @@
 {% for items in item.config %}
     {{ items }}
 {% endfor %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[outputs.{{ item.type }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[outputs.{{ item.type }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
 {% endfor %}
 {% endif %}
 
@@ -67,32 +83,46 @@
 {% endfor %}
 {% endif %}
 {% if item.tagpass is defined and item.tagpass is iterable %}
-[{{ item.plugin }}.tagpass]
+[inputs.{{ item.plugin }}.tagpass]
 {% for items in item.tagpass %}
     {{ items }}
 {% endfor %}
 {% endif %}
 {% if item.tagdrop is defined and item.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
+[inputs.{{ item.plugin }}.tagdrop]
 {% for items in item.tagdrop %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
+{% 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(["*"]) | to_json }}
+  Counters = {{ object.counters | default(["*"]) | to_json }}
+  Measurement = {{ object.measurement | default("win_perf_counters") | to_json }}
+  IncludeTotal = {{ object.total | default(false) | string | lower }}
 {% endfor %}
 {% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
-{% for items in item.specifications %}
+
+{% 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 %}
+
+###############################################################################
+#                                  PROCESSORS                                    #
+###############################################################################
+
+{% if telegraf_processors is defined and telegraf_processors is iterable %}
+{% for item in telegraf_processors %}
+[[processors.{{ item.processor }}]]
+{% if item.config is defined and item.config is iterable %}
+{% for items in item.config %}
     {{ items }}
 {% endfor %}
 {% endif %}