Merge pull request #141 from dj-wasabi/add-action

Added GH Action to automatically update CHANGELOG.md

.github/FUNDING.yml

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

.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.

.github/workflows/main.yml

@@ -0,0 +1,49 @@
+# This will execute some scripts on main branch.
+
+name: MasterRun
+
+on:
+  push:
+    branches:
+      - master
+      - main
+
+  workflow_dispatch:
+
+jobs:
+  runme:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout dj-wasabi-release repo
+        uses: actions/checkout@v2
+        with:
+          repository: dj-wasabi/dj-wasabi-release
+          path: dj-wasabi-release
+
+      - name: Checkout current repo
+        uses: actions/checkout@v2
+        with:
+          path: main
+
+      - name: Commit Changelog file
+        run: |
+          # We are cloned in the 'main' directory and the dj-wasabi-release
+          # repository is the 'dj-wasabi-release' next to 'main'
+          cd main
+
+          # Generate CHANGELOG.md file
+          ../dj-wasabi-release/release.sh -d
+
+          # Let commit the changes if there are any? (Well there should be!)
+          if [[ $(git status | grep -c 'CHANGELOG.md' || true) -gt 0 ]]
+            then  echo "Committing file"
+                  git config --global user.name 'Werner Dijkerman [GH bot]'
+                  git config --global user.email 'github@dj-wasabi.nl'
+
+                  git add CHANGELOG.md
+                  git commit -m "Updated CHANGELOG.md on \"$(date "+%Y-%m-%d %H:%M:%S")\"" CHANGELOG.md
+                  git push
+          fi
+        env:
+          CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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,16 @@
+---
+repos:
+- repo: local
+  hooks:
+    - id: ansible-lint
+      name: Ansible-lint
+      description: This hook runs ansible-lint.
+      entry: ansible-lint --force-color .
+      language: python
+      pass_filenames: false
+      always_run: true
+- 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,20 +0,0 @@
----
-sudo: required
-language: python
-services:
-  - docker
-
-before_install:
-- sudo apt-get -qq update
-- sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine
-
-install:
-- pip install molecule ansible docker-py
-
-script:
-- molecule --version
-- ansible --version
-- molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -1,71 +1,248 @@
-dj-wasabi.telegraf
+# Changelog
-------------------
 
-Below an overview of all changes in the releases.
+## [0.13.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.13.0) (2020-10-16)
 
-Version (Release date)
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.12.0...0.13.0)
 
-0.6.0 (2017-01-02)
+**Implemented enhancements:**
 
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!))
+- Setup the system for individual plugins [\#125](https://github.com/dj-wasabi/ansible-telegraf/issues/125)
-  * Do "become" for the steps that require root access on Debian #10 (By pull request: Ismael (Thanks!))
+- Logparser configuration [\#111](https://github.com/dj-wasabi/ansible-telegraf/issues/111)
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #11 (By pull request: Ismael (Thanks!))
+- ansible\_fqdn problematic for getting hostname [\#105](https://github.com/dj-wasabi/ansible-telegraf/issues/105)
-  * Removed imports #12
+- FreeBSD support [\#99](https://github.com/dj-wasabi/ansible-telegraf/issues/99)
-  * Fixing molecule #15
+- Proxy not taken into consideration when using 'online' [\#96](https://github.com/dj-wasabi/ansible-telegraf/issues/96)
-  * set telegraf hostname in defaults. #13 (By pull request: romainbureau (Thanks!))
-  * use version_compare filter … #14 (By pull request: lhoss (Thanks!))
-  * support missing agent settings upto telegraf v1.1 #16 (By pull request: lhoss (Thanks!))
-  * update the README with the latest v0.13 - v1.1 agent settings #17 (By pull request: lhoss (Thanks!))
 
-0.5.1 (2016-08-24)
+**Closed issues:**
 
-  * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!))
+- telegraf\_agent\_aws\_tags creates an invalid Telegraf configuration [\#128](https://github.com/dj-wasabi/ansible-telegraf/issues/128)
+- Broken on Ubuntu 20.04 [\#121](https://github.com/dj-wasabi/ansible-telegraf/issues/121)
+- Broken on RedHat [\#119](https://github.com/dj-wasabi/ansible-telegraf/issues/119)
 
-0.5.0 (2016-07-17)
+**Merged pull requests:**
 
-  * Removed Test Kitchen tests
+- corrected "Example Docker configuration" to make it work by default [\#132](https://github.com/dj-wasabi/ansible-telegraf/pull/132) ([NotDead](https://github.com/NotDead))
-  * Added Molecule tests and travis make use of them
+- Removing requirements file and use it from ci-base repo [\#131](https://github.com/dj-wasabi/ansible-telegraf/pull/131) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Updated default version to 1.0.0 beta2
+- Going to Github Actions [\#130](https://github.com/dj-wasabi/ansible-telegraf/pull/130) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Feature/add extra plugins to telegrafd folder #5 (By pull request: stvnwrgs (Thanks!))
+- quote aws ec2 global tags [\#129](https://github.com/dj-wasabi/ansible-telegraf/pull/129) ([Puneeth-n](https://github.com/Puneeth-n))
+- made service status configurable [\#127](https://github.com/dj-wasabi/ansible-telegraf/pull/127) ([DEvil0000](https://github.com/DEvil0000))
+- Plugin dependencies are installed and configured [\#126](https://github.com/dj-wasabi/ansible-telegraf/pull/126) ([carlba](https://github.com/carlba))
+- fix debian packagename on state latest [\#124](https://github.com/dj-wasabi/ansible-telegraf/pull/124) ([dwerder](https://github.com/dwerder))
+- MacOS support [\#123](https://github.com/dj-wasabi/ansible-telegraf/pull/123) ([carlba](https://github.com/carlba))
+- gpgkey yum repo fix [\#122](https://github.com/dj-wasabi/ansible-telegraf/pull/122) ([marcinwito](https://github.com/marcinwito))
+- Fix RedHat task list [\#120](https://github.com/dj-wasabi/ansible-telegraf/pull/120) ([rohit-gohri](https://github.com/rohit-gohri))
+- added installation method manual - skip installation [\#117](https://github.com/dj-wasabi/ansible-telegraf/pull/117) ([DEvil0000](https://github.com/DEvil0000))
+- Support postgresql\_extensible queries [\#116](https://github.com/dj-wasabi/ansible-telegraf/pull/116) ([rlex](https://github.com/rlex))
+- Added extra filtering possibilities for a plugin [\#113](https://github.com/dj-wasabi/ansible-telegraf/pull/113) ([dj-wasabi](https://github.com/dj-wasabi))
+- Minor changes to get Travis working again [\#112](https://github.com/dj-wasabi/ansible-telegraf/pull/112) ([dj-wasabi](https://github.com/dj-wasabi))
+- Download from influxdb [\#109](https://github.com/dj-wasabi/ansible-telegraf/pull/109) ([dj-wasabi](https://github.com/dj-wasabi))
+- Don't override package name unless "latest" [\#108](https://github.com/dj-wasabi/ansible-telegraf/pull/108) ([matttrach](https://github.com/matttrach))
+- Adding support for arm64 systems [\#106](https://github.com/dj-wasabi/ansible-telegraf/pull/106) ([remkade](https://github.com/remkade))
+- Use items\(\) instead of iteritems\(\) [\#104](https://github.com/dj-wasabi/ansible-telegraf/pull/104) ([diego1q2w](https://github.com/diego1q2w))
+- Fix: ensure apt-cache is updated before install [\#103](https://github.com/dj-wasabi/ansible-telegraf/pull/103) ([asfaltboy](https://github.com/asfaltboy))
+- on FreeBSD the telegeraf.conf is in root of /usr/local/etc. [\#102](https://github.com/dj-wasabi/ansible-telegraf/pull/102) ([langerma](https://github.com/langerma))
+- Some changes for fixing FreeBSD [\#101](https://github.com/dj-wasabi/ansible-telegraf/pull/101) ([dj-wasabi](https://github.com/dj-wasabi))
+- basic FreeBSD support [\#100](https://github.com/dj-wasabi/ansible-telegraf/pull/100) ([langerma](https://github.com/langerma))
+- Added the use\_proxy argument to use a proxy \(or not\) [\#98](https://github.com/dj-wasabi/ansible-telegraf/pull/98) ([dj-wasabi](https://github.com/dj-wasabi))
+- Various small changes for molecule [\#97](https://github.com/dj-wasabi/ansible-telegraf/pull/97) ([dj-wasabi](https://github.com/dj-wasabi))
 
-0.4.0 (2016-02-05)
+## [0.12.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.12.0) (2019-03-12)
 
-  * Fixed test for test-kitchen
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.11.0...0.12.0)
-  * Added travis-ci test for testing default installation when PR is made
-  * Fixed Download url for Debian
-  * Removed default entry for telegraf_plugins_extra
 
-0.3.0 (2016-01-13)
+**Implemented enhancements:**
 
-  * Made it work with telegraf 0.10.0
+- Install telegraf from package file instead of repository [\#89](https://github.com/dj-wasabi/ansible-telegraf/issues/89)
-  * Default installation: 0.10.0
 
-0.2.0 (2015-11-14)
+**Closed issues:**
 
-  * Fixed kitchen test setup
+- Docker container support [\#82](https://github.com/dj-wasabi/ansible-telegraf/issues/82)
-  * Adding "net" to the telegraf_plugins_default property
-  * Update etc-opt-telegraf-telegraf.conf.j2 #2 (By pull request: aferrari-technisys (Thanks!))
-  * Improvement and upgrade for v0.2.0 of telegraf #1 (By pull request: aferrari-technisys (Thanks!))
 
-0.1.0 (2015-09-23)
+**Merged pull requests:**
 
-  * Updated `telegraf_agent_version` to 0.1.9
+- Add processors section in Telegraf config [\#94](https://github.com/dj-wasabi/ansible-telegraf/pull/94) ([ph4r5h4d](https://github.com/ph4r5h4d))
-  * Added restart when package is changed (When updated for example)
+- Updated to Telegraf 1.10.0;Different installation methods [\#93](https://github.com/dj-wasabi/ansible-telegraf/pull/93) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Added several plugin options:
+- Updating Telegraf default to 1.9.5 [\#92](https://github.com/dj-wasabi/ansible-telegraf/pull/92) ([sdurrheimer](https://github.com/sdurrheimer))
-    * pass
+- Updating Telegraf default to 1.9.4 [\#90](https://github.com/dj-wasabi/ansible-telegraf/pull/90) ([sdurrheimer](https://github.com/sdurrheimer))
-    * drop
+- Docker enhancements [\#88](https://github.com/dj-wasabi/ansible-telegraf/pull/88) ([jgeusebroek](https://github.com/jgeusebroek))
-    * tagpass
+- Updating Telegraf default to 1.9.3 [\#87](https://github.com/dj-wasabi/ansible-telegraf/pull/87) ([sdurrheimer](https://github.com/sdurrheimer))
-    * tagdrop
+- Added register for installation of packages [\#86](https://github.com/dj-wasabi/ansible-telegraf/pull/86) ([dj-wasabi](https://github.com/dj-wasabi))
-    * interval
+- Add Docker container support [\#85](https://github.com/dj-wasabi/ansible-telegraf/pull/85) ([jgeusebroek](https://github.com/jgeusebroek))
-  * Updated documentation
+- Remove legacy options [\#84](https://github.com/dj-wasabi/ansible-telegraf/pull/84) ([jgeusebroek](https://github.com/jgeusebroek))
-  
+- Fix tagpass and tagdrop [\#83](https://github.com/dj-wasabi/ansible-telegraf/pull/83) ([jgeusebroek](https://github.com/jgeusebroek))
+- \[bug\] debian - add cache\_valid\_time [\#81](https://github.com/dj-wasabi/ansible-telegraf/pull/81) ([pad92](https://github.com/pad92))
+- Updating Telegraf default to 1.9.2 [\#80](https://github.com/dj-wasabi/ansible-telegraf/pull/80) ([sdurrheimer](https://github.com/sdurrheimer))
+- Add Yum repo support for Amazon Linux [\#79](https://github.com/dj-wasabi/ansible-telegraf/pull/79) ([anthonysr](https://github.com/anthonysr))
+- Fix to work with Fedora Linux [\#78](https://github.com/dj-wasabi/ansible-telegraf/pull/78) ([ikke-t](https://github.com/ikke-t))
+- Updating to newer version of Telegraf [\#77](https://github.com/dj-wasabi/ansible-telegraf/pull/77) ([dj-wasabi](https://github.com/dj-wasabi))
+- Add support for extra win\_perf\_counters and prevent python u'' strings [\#76](https://github.com/dj-wasabi/ansible-telegraf/pull/76) ([jdivy](https://github.com/jdivy))
 
-0.0.2 (2015-09-20)
+## [0.11.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.11.0) (2018-12-11)
 
-  * Updated README dus to missing colon
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.10.0...0.11.0)
-  * Forgot to update the meta file
-  * Added Changelog file
 
-0.0.1 (2015-09-20)
+**Closed issues:**
 
-  * Initial release
+- No telegraf\_plugin\_extra info is added to plugins [\#71](https://github.com/dj-wasabi/ansible-telegraf/issues/71)
+- Daemon crash because of empty config.conf and plugin.conf files. [\#63](https://github.com/dj-wasabi/ansible-telegraf/issues/63)
+- Pin telegraf to {present, latest, specific-version} [\#59](https://github.com/dj-wasabi/ansible-telegraf/issues/59)
+- Ability to add multiple times the same extra-plugin [\#57](https://github.com/dj-wasabi/ansible-telegraf/issues/57)
+
+**Merged pull requests:**
+
+- Renamed the tojson to to\_json [\#74](https://github.com/dj-wasabi/ansible-telegraf/pull/74) ([dj-wasabi](https://github.com/dj-wasabi))
+- A few enhancements and fixes to windows support [\#73](https://github.com/dj-wasabi/ansible-telegraf/pull/73) ([jdivy](https://github.com/jdivy))
+- Replace 'ec2\_facts' with 'ec2\_metadata\_facts' to fix a deprecation warning [\#72](https://github.com/dj-wasabi/ansible-telegraf/pull/72) ([Rylon](https://github.com/Rylon))
+- Added default pluging if nothing is configured [\#70](https://github.com/dj-wasabi/ansible-telegraf/pull/70) ([dj-wasabi](https://github.com/dj-wasabi))
+- Added support for \(Open\)Suse [\#69](https://github.com/dj-wasabi/ansible-telegraf/pull/69) ([dj-wasabi](https://github.com/dj-wasabi))
+- Added Windows as OS [\#68](https://github.com/dj-wasabi/ansible-telegraf/pull/68) ([dj-wasabi](https://github.com/dj-wasabi))
+- Want to use latest [\#67](https://github.com/dj-wasabi/ansible-telegraf/pull/67) ([dj-wasabi](https://github.com/dj-wasabi))
+- Some small improvements [\#66](https://github.com/dj-wasabi/ansible-telegraf/pull/66) ([dj-wasabi](https://github.com/dj-wasabi))
+- telegraf-extra-plugin.conf.j2: fix template typo [\#65](https://github.com/dj-wasabi/ansible-telegraf/pull/65) ([gaelL](https://github.com/gaelL))
+- Using base ci requirements.txt [\#64](https://github.com/dj-wasabi/ansible-telegraf/pull/64) ([dj-wasabi](https://github.com/dj-wasabi))
+- Wen copying/removing plugins show only plugin name [\#62](https://github.com/dj-wasabi/ansible-telegraf/pull/62) ([mprasil](https://github.com/mprasil))
+- Pin apt key ID [\#61](https://github.com/dj-wasabi/ansible-telegraf/pull/61) ([tszym](https://github.com/tszym))
+- Added support for plugins being managed exclusively by this playbook [\#60](https://github.com/dj-wasabi/ansible-telegraf/pull/60) ([gaizeror](https://github.com/gaizeror))
+
+## [0.10.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.10.0) (2018-08-12)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.9.0...0.10.0)
+
+**Closed issues:**
+
+- Package changed namespace and broke our Tower instance [\#56](https://github.com/dj-wasabi/ansible-telegraf/issues/56)
+- PR \#46 break telegraf "Multiple inputs of the same type" [\#48](https://github.com/dj-wasabi/ansible-telegraf/issues/48)
+- telegraf\_plugins\_extra is override when multiple call [\#30](https://github.com/dj-wasabi/ansible-telegraf/issues/30)
+
+**Merged pull requests:**
+
+- Updating to Telegraf 1.7.3;Updating changelog [\#58](https://github.com/dj-wasabi/ansible-telegraf/pull/58) ([dj-wasabi](https://github.com/dj-wasabi))
+- Added bunch of files [\#55](https://github.com/dj-wasabi/ansible-telegraf/pull/55) ([dj-wasabi](https://github.com/dj-wasabi))
+- Fix Deprecation warnings [\#54](https://github.com/dj-wasabi/ansible-telegraf/pull/54) ([dj-wasabi](https://github.com/dj-wasabi))
+- Changed 'include' to 'include\_tasks' to remove deprecation warning [\#53](https://github.com/dj-wasabi/ansible-telegraf/pull/53) ([tjend](https://github.com/tjend))
+- Add option to remove extra plugin config files [\#52](https://github.com/dj-wasabi/ansible-telegraf/pull/52) ([tjend](https://github.com/tjend))
+- Plugins extra hash allow multiple inputs same type [\#50](https://github.com/dj-wasabi/ansible-telegraf/pull/50) ([tjend](https://github.com/tjend))
+- Update to 2.4;Using specific versions of libraries [\#49](https://github.com/dj-wasabi/ansible-telegraf/pull/49) ([dj-wasabi](https://github.com/dj-wasabi))
+
+## [0.9.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.9.0) (2018-05-06)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.8.0...0.9.0)
+
+**Closed issues:**
+
+- Cannot call plugin multiple times anymore [\#39](https://github.com/dj-wasabi/ansible-telegraf/issues/39)
+
+**Merged pull requests:**
+
+- Updating to 0.9.0 [\#47](https://github.com/dj-wasabi/ansible-telegraf/pull/47) ([dj-wasabi](https://github.com/dj-wasabi))
+- Convert the telegraf\_plugins\_extra varaible to a hash so that we can … [\#46](https://github.com/dj-wasabi/ansible-telegraf/pull/46) ([tjend](https://github.com/tjend))
+- Improved comments, split up role, moved tags and added defaults [\#45](https://github.com/dj-wasabi/ansible-telegraf/pull/45) ([boxrick](https://github.com/boxrick))
+- Allow to override RedHat release version [\#43](https://github.com/dj-wasabi/ansible-telegraf/pull/43) ([tszym](https://github.com/tszym))
+- Fix Travis Tests [\#42](https://github.com/dj-wasabi/ansible-telegraf/pull/42) ([dj-wasabi](https://github.com/dj-wasabi))
+- Fix markdown [\#41](https://github.com/dj-wasabi/ansible-telegraf/pull/41) ([angristan](https://github.com/angristan))
+- plugins: be able to specify the filename of extra plugings [\#40](https://github.com/dj-wasabi/ansible-telegraf/pull/40) ([gaelL](https://github.com/gaelL))
+- tags: give an option to use AWS tags as telegraf tags [\#32](https://github.com/dj-wasabi/ansible-telegraf/pull/32) ([gaelL](https://github.com/gaelL))
+
+## [0.8.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.8.0) (2017-10-30)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.7.0...0.8.0)
+
+**Closed issues:**
+
+- PIP dependencies conflicting with native yum packages [\#28](https://github.com/dj-wasabi/ansible-telegraf/issues/28)
+
+**Merged pull requests:**
+
+- Use telegra\_global\_tags for oldest telegraf versions [\#38](https://github.com/dj-wasabi/ansible-telegraf/pull/38) ([tszym](https://github.com/tszym))
+-  Fix extra plugins by file  /  Change apt source filename / Change tags by global\_tags  [\#37](https://github.com/dj-wasabi/ansible-telegraf/pull/37) ([aarnaud](https://github.com/aarnaud))
+- Remove useless packages on RedHat. fix \#28 [\#36](https://github.com/dj-wasabi/ansible-telegraf/pull/36) ([tszym](https://github.com/tszym))
+- Test if LSB codename exists before using it [\#35](https://github.com/dj-wasabi/ansible-telegraf/pull/35) ([tszym](https://github.com/tszym))
+- Updating to Molecule V2 [\#31](https://github.com/dj-wasabi/ansible-telegraf/pull/31) ([dj-wasabi](https://github.com/dj-wasabi))
+
+## [0.7.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.7.0) (2017-02-23)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.6.0...0.7.0)
+
+**Fixed bugs:**
+
+- multiple plugins in telegraf\_plugins\_extra are duplicated [\#22](https://github.com/dj-wasabi/ansible-telegraf/issues/22)
+- Deleting extra plugins doesn't delete them [\#8](https://github.com/dj-wasabi/ansible-telegraf/issues/8)
+
+**Merged pull requests:**
+
+- Updating to release 0.7.0 [\#27](https://github.com/dj-wasabi/ansible-telegraf/pull/27) ([dj-wasabi](https://github.com/dj-wasabi))
+- Replace action by modules [\#26](https://github.com/dj-wasabi/ansible-telegraf/pull/26) ([tszym](https://github.com/tszym))
+- Use yum repository to install telegraf on RedHat [\#25](https://github.com/dj-wasabi/ansible-telegraf/pull/25) ([tszym](https://github.com/tszym))
+- Remove for-loop in extra-plugin template [\#24](https://github.com/dj-wasabi/ansible-telegraf/pull/24) ([emersondispatch](https://github.com/emersondispatch))
+- Update Debian.yml [\#23](https://github.com/dj-wasabi/ansible-telegraf/pull/23) ([zend0](https://github.com/zend0))
+- extra plugins tags [\#21](https://github.com/dj-wasabi/ansible-telegraf/pull/21) ([oboukili](https://github.com/oboukili))
+- Input tags support [\#20](https://github.com/dj-wasabi/ansible-telegraf/pull/20) ([szibis](https://github.com/szibis))
+- Fix telegraf confguration permissions [\#19](https://github.com/dj-wasabi/ansible-telegraf/pull/19) ([szibis](https://github.com/szibis))
+
+## [0.6.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.6.0) (2017-01-02)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.5.1...0.6.0)
+
+**Merged pull requests:**
+
+- update the README with the latest v0.13 - v1.1 agent settings [\#17](https://github.com/dj-wasabi/ansible-telegraf/pull/17) ([lhoss](https://github.com/lhoss))
+- support missing agent settings upto telegraf v1.1 [\#16](https://github.com/dj-wasabi/ansible-telegraf/pull/16) ([lhoss](https://github.com/lhoss))
+- Fixing molecule [\#15](https://github.com/dj-wasabi/ansible-telegraf/pull/15) ([dj-wasabi](https://github.com/dj-wasabi))
+- use version\_compare filter … [\#14](https://github.com/dj-wasabi/ansible-telegraf/pull/14) ([lhoss](https://github.com/lhoss))
+- set telegraf hostname in defaults. [\#13](https://github.com/dj-wasabi/ansible-telegraf/pull/13) ([airbe](https://github.com/airbe))
+- Removed imports [\#12](https://github.com/dj-wasabi/ansible-telegraf/pull/12) ([dj-wasabi](https://github.com/dj-wasabi))
+- Fix the Influxdb repo for "hybrid" debian distros \(like "jessie/sid"\) [\#11](https://github.com/dj-wasabi/ansible-telegraf/pull/11) ([Ismael](https://github.com/Ismael))
+- Do "become" for the steps that require root access on Debian [\#10](https://github.com/dj-wasabi/ansible-telegraf/pull/10) ([Ismael](https://github.com/Ismael))
+- Added new code for correct molecule verification [\#7](https://github.com/dj-wasabi/ansible-telegraf/pull/7) ([dj-wasabi](https://github.com/dj-wasabi))
+
+## [0.5.1](https://github.com/dj-wasabi/ansible-telegraf/tree/0.5.1) (2016-08-24)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.5.0...0.5.1)
+
+**Merged pull requests:**
+
+- fixed issue with ansible not getting the package [\#6](https://github.com/dj-wasabi/ansible-telegraf/pull/6) ([thecodeassassin](https://github.com/thecodeassassin))
+
+## [0.5.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.5.0) (2016-07-17)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.4.0...0.5.0)
+
+**Closed issues:**
+
+- A new Release for the .deb package url change [\#3](https://github.com/dj-wasabi/ansible-telegraf/issues/3)
+
+**Merged pull requests:**
+
+- Feature/add extra plugins to telegrafd folder [\#5](https://github.com/dj-wasabi/ansible-telegraf/pull/5) ([stvnwrgs](https://github.com/stvnwrgs))
+
+## [0.4.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.4.0) (2016-02-05)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.3.0...0.4.0)
+
+## [0.3.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.3.0) (2016-01-13)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.2.0...0.3.0)
+
+## [0.2.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.2.0) (2015-11-14)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.1.0...0.2.0)
+
+**Merged pull requests:**
+
+- Update etc-opt-telegraf-telegraf.conf.j2 [\#2](https://github.com/dj-wasabi/ansible-telegraf/pull/2) ([aferrari-technisys](https://github.com/aferrari-technisys))
+- Improvement and upgrade for v0.2.0 of telegraf [\#1](https://github.com/dj-wasabi/ansible-telegraf/pull/1) ([aferrari-technisys](https://github.com/aferrari-technisys))
+
+## [0.1.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.1.0) (2015-09-23)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.0.2...0.1.0)
+
+## [0.0.2](https://github.com/dj-wasabi/ansible-telegraf/tree/0.0.2) (2015-09-20)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.0.1...0.0.2)
+
+## [0.0.1](https://github.com/dj-wasabi/ansible-telegraf/tree/0.0.1) (2015-09-20)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/03adb259af33123c917cdc960d23aeee07e01fef...0.0.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

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,93 @@
+# 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 repository https://github.com/dj-wasabi/dj-wasabi-release, a file named `requirements.txt` exists and contains the versions used by the tests.
+
+### Requirements
+
+You can install them with the following command:
+
+```
+wget https://raw.githubusercontent.com/dj-wasabi/dj-wasabi-release/main/requirements.txt
+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
+
+## pre-commit
+
+This repository contains a pre-commit hook. This means that when you want to commit the changes, 1 or more tests are executed to validate the changes. Please take a look at how to install the `pre-commit` package from the official [site](https://pre-commit.com/). Also make sure to install `ansible-lint` via `pip install ansible-lint` as this is 1 of the tools that is executed while a pre-commit hooks runs.
+
+## 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.

CONTRIBUTORS

@@ -0,0 +1,40 @@
+ Alejandro
+ Angristan
+ Anthony ARNAUD
+ Carl Bäckström
+ DEvil0000
+ Daniel Werdermann
+ Diego Nava
+ Emerson Knapp
+ Farshad Nematdoust
+ Ilkka Tengvall
+ Ismael
+ Jack Ivy
+ Jeroen Geusebroek
+ Kyle
+ Laurent Hoss
+ Lex Rivera
+ Marcin Wito
+ Markus Langer
+ Matt
+ Miroslav Prasil
+ NotDead
+ Olivier Boukili
+ Pascal
+ Pavel Savchenko
+ Puneeth Nanjundaswamy
+ Rick Box
+ Rohit Gohri
+ Romain BUREAU
+ Ryan Conway
+ Slawomir Skowron
+ Steve Durrheimer
+ Steven Wirges
+ TheCodeAssassin
+ Thomas Szymanski
+ Troy Jendra
+ Werner Dijkerman
+ aroglian
+ gaelL
+ or
+ zend0

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

@@ -1,9 +1,38 @@
-dj-wasabi.telegraf
+# dj-wasabi.telegraf
-=========
 
-Build status:
+- [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)
+  * [Molecule](#molecule)
+  * [License](#license)
+  * [Author Information](#author-information)
 
-[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf)
+## Build status:
+
+[![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.
 
@@ -13,36 +42,120 @@ Design goals are to have a minimal memory footprint with a plugin system so that
 
 (https://github.com/influxdb/telegraf)
 
-Requirements
+## Requirements
-------------
 
-No requirements. (Yes, an Influxdb server somewhere on the network will help though ;-) )
+### Supported systems
 
-Role Variables
+This role supports the following systems:
---------------
 
-The following parameters can be set for the Telegraf agent:
+ * 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
+
+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
+
+### Ansible role specific variables
+
+Specifying the version to be installed:
+
+* `telegraf_agent_version`: The version of Telegraf to install. If `telegraf_agent_package_state` is set to `latest`, then this property and value is ignored. 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_rpm_url`: The full path to the RPM file located on a webserver. 
-* `telegraf_agent_deb_url`:  The full path to the DEB file located on a webserver.
 * `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10`
 * `telegraf_agent_debug`: Run Telegraf in debug mode. Default: `False`
 * `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True
 * `telegraf_agent_flush_interval`: Default data flushing interval for all outputs. Default: 10
 * `telegraf_agent_flush_jitter`: Jitter the flush interval by a random amount. Default: 0
+* `telegraf_agent_aws_tags`: Configure AWS ec2 tags into Telegraf tags section Default: `False`
+* `telegraf_agent_aws_tags_prefix`: Define a prefix for AWS ec2 tags. Default: `""`
 * `telegraf_agent_collection_jitter`: Jitter the collection by a random amount. Default: 0 (since v0.13)
 * `telegraf_agent_metric_batch_size`: The agent metric batch size. Default: 1000  (since v0.13)
 * `telegraf_agent_metric_buffer_limit`: The agent metric buffer limit. Default: 10000  (since v0.13)
 * `telegraf_agent_quiet`: Run Telegraf in quiet mode (error messages only). Default: `False` (since v0.13)
 * `telegraf_agent_logfile`: The agent logfile name. Default: '' (means to log to stdout) (since v1.1)
+* `telegraf_agent_hostname`: The agent hostname.  Default: `ansible_fqdn`
 * `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_agent_docker_image_version`: The version of the Docker Telegraf image to be used. Default the value contains the value given for `telegraf_agent_version`. Can be set to `latest` to get the actual `latest` tag for the provided Docker image.
+* `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:
 
-	telegraf_agent_tags:
+	telegraf_global_tags:
 	  - tag_name: some_name
 	    tag_value: some_value
 
@@ -53,6 +166,8 @@ Specifying an output. The default is set to localhost, you'll have to specify th
 	    config:
 	      - urls = ["http://localhost:8086"]
 	      - database = "telegraf"
+        tagpass:
+          - cpu = ["cpu0"]
 
 The config will be printed line by line into the configuration, so you could also use:
 
@@ -61,11 +176,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.
 
-There are two properties which are the same, but are used differently. Those are:
+### 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:
@@ -79,68 +263,83 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 	  - plugin: swap
 	  - plugin: netstat
 
-Every telegraf agent has these as an default configuration.
+Every telegraf agent has these as a default configuration.
- 
+
-The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. Following is an example for using this parameter for MySQL database servers:
+### 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
 	telegraf_plugins_extra:
-		- plugin: mysql
+		mysql:
 		  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:
 
-* `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.
+* `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.
-* `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"
 	    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
 
-Dependencies
-------------
 No dependencies
 
-Example Playbook
+## Example Playbook
-----------------
 
     - hosts: servers
       roles:
          - { role: dj-wasabi.telegraf }
 
-##Contributors
+## Molecule
-The following have contributed to this Ansible role:
-
-  * aferrari-technisys
-  * stvnwrgs
-  * lhoss
-  * thecodeassassin
-  * Ismael
-  * romainbureau
-
-# Molecule
 
 This roles is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: https://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/
 
-License
+## License
--------
 
 BSD
 
-Author Information
+## Author Information
-------------------
 
 Please let me know if you have issues. Pull requests are also accepted! :-)
 

defaults/main.yml

@@ -1,31 +1,45 @@
 ---
+telegraf_enabled: True
 # defaults file for ansible-telegraf
 
-#telegraf_agent_version: 0.10.1
+telegraf_agent_version: 1.10.0
-telegraf_agent_version: 1.0.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_version_sub_l: _beta2
-telegraf_agent_version_sub_u: -beta2
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
 telegraf_agent_round_interval: True
 telegraf_agent_flush_interval: 10
 telegraf_agent_flush_jitter: 0
+telegraf_agent_aws_tags: False
+telegraf_agent_aws_tags_prefix: ""
+telegraf_agent_config_path: /etc/telegraf
 
-#v0.13 settings (not sure if supported in older version):
+# 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
+telegraf_agent_docker_image_version: "{{ telegraf_agent_version }}"
+
+# v0.13 settings (not sure if supported in older version):
 telegraf_agent_collection_jitter: 0
 telegraf_agent_metric_batch_size: 1000
 telegraf_agent_metric_buffer_limit: 10000
 telegraf_agent_quiet: False
 
-#v1.1 settings:
+# v1.1 settings:
 telegraf_agent_logfile: ""
 telegraf_agent_omit_hostname: False
 
-telegraf_agent_rpm_url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_l }}.x86_64.rpm
+telegraf_global_tags: []
-telegraf_agent_deb_url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_u }}_amd64.deb
-
-telegraf_agent_tags:
 
 telegraf_agent_output:
   - type: influxdb
@@ -34,6 +48,7 @@ telegraf_agent_output:
       - database = "telegraf"
       - precision = "s"
 
+# defaults - /etc/telegraf/telegraf.conf
 telegraf_plugins_default:
   - plugin: cpu
     config:
@@ -45,5 +60,30 @@ telegraf_plugins_default:
   - plugin: system
   - plugin: swap
   - plugin: netstat
+  - plugin: processes
+  - plugin: kernel
 
-telegraf_plugins_extra:
+# extra configuration - /etc/telegraf/telegraf.d/*
+telegraf_plugins_extra: {}
+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

@@ -2,8 +2,24 @@
 # handlers file for ansible-telegraf
 
 - name: "Restart Telegraf"
-  action: service
+  service:
-          name=telegraf
+    name: telegraf
-          state=restarted
+    state: restarted
-          enabled=yes
+    enabled: yes
-  become: 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"
+  command: brew services restart telegraf

meta/main.yml

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

molecule.yml

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

molecule/default/converge.yml

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

molecule/default/molecule.yml

@@ -0,0 +1,61 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+
+platforms:
+  - 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
+    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:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/prepare.yml

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

@@ -0,0 +1,48 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
+
+
+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(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_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

playbook.yml

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

tasks/Debian.yml

@@ -1,59 +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
-  tags:
-    - telegraf
-    - packages
 
-- 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
-  tags:
-    - telegraf
-    - packages
 
-- name: Download Influxdb 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
-  tags:
+  when:
-    - telegraf
+    - telegraf_agent_package_method == "repo"
-    - packages
 
-- name: Add Influxdb 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: "influxdb"
+    filename: "telegraf"
     state: present
-  tags:
+  become: yes
-    - telegraf
+  when:
-    - packages
+    - telegraf_agent_package_method == "repo"
-  when: ansible_lsb is defined
+    - ansible_lsb is defined
+    - ansible_lsb.codename is defined
 
-- name: Add Influxdb repository.
+- name: "Debian | Add Telegraf repository"
   apt_repository:
     repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
-    filename: "influxdb"
+    filename: "telegraf"
     state: present
   become: yes
-  tags:
+  when:
-    - telegraf
+    - telegraf_agent_package_method == "repo"
-    - packages
+    - ansible_lsb is not defined or ansible_lsb.codename is not defined
-  when: ansible_lsb is not defined
 
-- name: "Install telegraf package | Debian"
+- name: "Debian | Download Telegraf package (online)"
-  action: apt
+  get_url:
-          name=telegraf
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_deb }}
-          state=installed
+    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_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
-  tags:
+  when:
-  - telegraf
+    - telegraf_agent_package_method == "repo"
-  - packages
+
+- 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"
+  command: sysrc telegraf_flags="-quiet -config-directory=/usr/local/etc/telegraf.d"
+  tags:
+    - skip_ansible_lint
+
+- name: "FreeBSD | add telegraf to init"
+  command: 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,38 +1,45 @@
 ---
+# description: RedHat specific installation
 
-- name: "Enable EPEL"
+- name: "RedHat | Set name if state == latest"
-  action: yum
+  set_fact:
-          name=epel-release
+    telegraf_agent_package: telegraf-{{ telegraf_agent_version }}
-          state=installed
+  when:
+    - telegraf_agent_package_state != "latest"
 
-- name: "Installing some dependencies"
+- name: Use RHEL 7 packages for Fedora
-  action: yum
+  set_fact:
-          name={{ item }}
+    telegraf_redhat_releasever: 7
-          state=installed
+  when:
-  with_items:
+    - ansible_distribution == "Fedora"
-    - python-pip
-    - python-devel
-    - gcc
-    - libffi-devel
-    - openssl-devel
 
-- name: "Installing PIP dependensies"
+- name: "RedHat | Add yum repository"
-  action: pip
+  yum_repository:
-          name={{ item }}
+    name: influxdb
-          state=present
+    description: InfluxDB Repository - RHEL $releasever
-  with_items:
+    baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}"
-    - urllib3
+    gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}"
-    - pyopenssl
+    gpgkey: "{{ telegraf_yum_gpgkey }}"
-    - ndg-httpsclient
+  become: yes
+  when:
+    - telegraf_agent_package_method == "repo"
 
-- name: "Fetch telegraf installation package | RedHat"
+- name: "RedHat | Download Telegraf package (online)"
-  action: get_url
+  get_url:
-          url="{{ telegraf_agent_rpm_url }}"
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_rpm }}
-          dest=/tmp/telegraf_{{ telegraf_agent_version }}.x86_64.rpm
+    dest: "{{ telegraf_agent_package }}"
-          mode=0440
+    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: "Install telegraf package | RedHat"
+- name: "RedHat | Install Telegraf package"
-  action: yum
+  package:
-          name=/tmp/telegraf_{{ telegraf_agent_version }}.x86_64.rpm
+    name: "{{ telegraf_agent_package }}"
-          state=installed
+    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,57 @@
+---
+
+- 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 }}"
+    mode: 0755
+    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_linux.yml

@@ -0,0 +1,189 @@
+---
+# 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('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('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
+      command: 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 }}"
+        mode: 0400
+        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('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('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)"
+  command: 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,100 @@
+---
+
+- 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 (newer than 1.15)"
+  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_agent_version }}\telegraf.exe'
+  when: telegraf_agent_version is version('1.15', '>=')
+
+- name: "Windows | Move extracted directory (newer than 1.15)"
+  win_copy:
+    src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}\'
+    dest: '{{ telegraf_win_install_dir }}\telegraf'
+    remote_src: yes
+  when: telegraf_agent_version is version('1.15', '>=')
+
+- 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'
+    delete_archive: yes
+  when: telegraf_agent_version is version('1.15', '<')
+
+- 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
+
+- name: "Windows | Cleanup"
+  win_file:
+    path: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}'
+    state: absent
+  when: telegraf_agent_version is version('1.15', '>=')

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_docker_image_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,44 +1,47 @@
 ---
 # tasks file for ansible-telegraf
 
-- name: "Install the correct repository"
+- name: "Install on RedHat"
-  include: "RedHat.yml"
+  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: "Debian.yml"
+  include_tasks: "Debian.yml"
-  when: ansible_os_family == "Debian"
+  when:
+    - ansible_os_family == "Debian" and not telegraf_agent_docker
+  tags:
+    - telegraf
+    - packages
 
-- name: "Copy the template for versions < 0.10.0"
+- name: "Install on Suse"
-  template:
+  include_tasks: "Suse.yml"
-    src: etc-opt-telegraf-telegraf.conf.j2
+  when: ansible_os_family == "Suse" and not telegraf_agent_docker
-    dest: /etc/opt/telegraf/telegraf.conf
-    owner: root
-    group: root
-    mode: 0644
-  become: yes
-  when: telegraf_agent_version|version_compare('0.10.0', '<')
-  notify: "Restart Telegraf"
 
-- name: "Copy the template for versions >= 0.10.0"
+- name: "Install on FreeBSD"
-  template:
+  include_tasks: "FreeBSD.yml"
-    src: telegraf.conf.j2
+  when:
-    dest: /etc/telegraf/telegraf.conf
+    - ansible_os_family == "FreeBSD" and not telegraf_agent_docker
-    owner: root
-    group: root
-    mode: 0644
-  become: yes
-  when: telegraf_agent_version|version_compare('0.10.0', '>=')
-  notify: "Restart Telegraf"
 
-- name: "Copy telegraf extra plugins"
+- name: "Install on MacOS"
-  template:
+  include_tasks: "MacOS.yml"
-    src: "telegraf-extra-plugin.conf.j2"
+  when:
-    dest: "/etc/telegraf/telegraf.d/{{ item.plugin }}.conf"
+    - ansible_os_family == "Darwin" and not telegraf_agent_docker
-    owner: root
+
-    group: root
+- include_tasks: "docker.yml"
-    mode: 0644
+  when: telegraf_agent_docker
-  with_items: "{{ telegraf_plugins_extra }}"
+
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable"
+- name: "Configure Telegraf"
-  become: yes
+  include_tasks: "configure_linux.yml"
-  notify: "Restart Telegraf"
+  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

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

@@ -1,44 +1,57 @@
+### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
 
-{% if telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable %}
+[[inputs.{{ item.value.plugin | default(item.key) }}]]
-{% for item in telegraf_plugins_extra %}
+{% if item.value.interval is defined %}
-[[inputs.{{ item.plugin }}]]
+    interval = "{{ item.value.interval }}s"
-{% if item.interval is defined %}
-    interval = "{{ item.interval }}s"
 {% endif %}
-{% if item.config is defined and item.config is iterable %}
+{% if item.value.config is defined and item.value.config is iterable %}
-{% for items in item.config %}
+{% for items in item.value.config %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.tagpass is defined and item.tagpass is iterable %}
+{% if item.value.tags is defined and item.value.tags is iterable %}
-[{{ item.plugin }}.tagpass]
+[inputs.{{ item.value.plugin | default(item.key) }}.tags]
-{% for items in item.tagpass %}
+{% for items in item.value.tags %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.tagdrop is defined and item.tagdrop is iterable %}
+{% if item.value.tagpass is defined and item.value.tagpass is iterable %}
-[{{ item.plugin }}.tagdrop]
+[inputs.{{ item.value.plugin | default(item.key) }}.tagpass]
-{% for items in item.tagdrop %}
+{% for items in item.value.tagpass %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.pass is defined and item.pass is iterable %}
+{% if item.value.tagdrop is defined and item.value.tagdrop is iterable %}
-[{{ item.plugin }}.pass]
+[inputs.{{ item.value.plugin | default(item.key) }}.tagdrop]
-{% for items in item.pass %}
+{% for items in item.value.tagdrop %}
     {{ items }}
 {% endfor %}
 {% endif %}
-{% if item.drop is defined and item.drop is iterable %}
+{% if item.value.filter is defined %}
-[{{ item.plugin }}.drop]
+{% if item.value.filter.name is defined %}
-{% for items in item.drop %}
+[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.specifications is defined and item.specifications is iterable %}
+{% endif %}
-[[{{item.plugin}}.specifications]]
+{% endif %}
-{% for items in item.specifications %}
+{% if item.value.objects is defined and item.value.objects is iterable %}
-    {{ items }}
+{% 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.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 %}
-{% endif %}
+{% endfor %}
+{% endif %}

templates/telegraf.conf.j2

@@ -1,12 +1,18 @@
-# Telegraf configuration
+### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
 
-[tags]
+[global_tags]
-{% if telegraf_agent_tags is defined and telegraf_agent_tags is iterable %}
+{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %}
-{% for item in telegraf_agent_tags %}
+{% for item in telegraf_global_tags %}
     {{ item.tag_name }} = "{{ item.tag_value }}"
 {% endfor %}
 {% endif %}
 
+{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
+{% for key, value in ec2_tags.tags.items()%}
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
+{% endfor %}
+{% endif %}
+
 # Configuration for telegraf agent
 [agent]
     interval = "{{ telegraf_agent_interval }}s"
@@ -15,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 %}
 
@@ -36,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 %}
 
@@ -54,33 +76,53 @@
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.tags is defined and item.tags is iterable %}
+[inputs.{{ item.plugin }}.tags]
+{% for items in item.tags %}
+    {{ items }}
+{% 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 %}
+{% if item.objects is defined and item.objects is iterable %}
-[{{ item.plugin }}.pass]
+{% for object in item.objects %}
-{% for items in item.pass %}
+[[inputs.{{ item.plugin }}.object]]
-    {{ items }}
+  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]]
+{% if telegraf_plugins_default is defined and telegraf_plugins_default|length == 0 %}
-{% for items in item.specifications %}
+{% 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 %}

tests/inventory

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

tests/test.yml

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

tests/test_docker.py

@@ -1,23 +0,0 @@
-from testinfra.utils.ansible_runner import AnsibleRunner
-
-testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
-
-
-def test_telegraf_running_and_enabled(Service, SystemInfo):
-    telegraf = Service("telegraf")
-    assert telegraf.is_enabled
-    if SystemInfo.distribution == 'centos':
-        assert telegraf.is_running
-
-
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
-    assert telegraf.user == "root"
-    assert telegraf.group == "root"
-    assert telegraf.mode == 0o644
-    assert telegraf.contains('[[inputs.cpu]]')
-
-
-def test_telegraf_package(Package, SystemInfo):
-    telegraf = Package('telegraf')
-    assert telegraf.is_installed