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/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,16 +0,0 @@
----
-sudo: required
-language: python
-services:
-  - docker
-
-install:
-  - curl -sSlo requirements.txt https://raw.githubusercontent.com/dj-wasabi/ansible-ci-base/master/requirements.txt
-  - pip install -r requirements.txt
-
-script:
-  - molecule --version
-  - ansible --version
-  - molecule test
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -1,139 +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.12.0 (2019-03-12)
+**Implemented enhancements:**
 
-  * Add support for extra win_perf_counters and prevent python u'' strings #76 (By pull request: jdivy (Thanks!))
-  * Fix to work with Fedora Linux #78 (By pull request: ikke-t (Thanks!))
-  * Add Yum repo support for Amazon Linux #79 (By pull request: anthonysr-mc (Thanks!))
-  * Updating Telegraf default to 1.9.2 #80 (and some to other versions as well) (By pull request: sdurrheimer (Thanks!))
-  * [bug] debian - add cache_valid_time #81 (By pull request: pad92 (Thanks!))
-  * Fix tagpass and tagdrop #83 (By pull request: jgeusebroek (Thanks!))
-  * Remove legacy options #84 (By pull request: jgeusebroek (Thanks!))
-  * Add Docker container support #85 (By pull request: jgeusebroek (Thanks!))
-  * Added register for installation of packages #86
-  * Docker enhancements #88 (By pull request: jgeusebroek (Thanks!))
-  * Updated to Telegraf 1.10.0;Different installation methods #93
-  * Add processors section in Telegraf config #94 (By pull request: ph4r5h4d (Thanks!))
+- Setup the system for individual plugins [\#125](https://github.com/dj-wasabi/ansible-telegraf/issues/125)
+- Logparser configuration [\#111](https://github.com/dj-wasabi/ansible-telegraf/issues/111)
+- ansible\_fqdn problematic for getting hostname [\#105](https://github.com/dj-wasabi/ansible-telegraf/issues/105)
+- FreeBSD support [\#99](https://github.com/dj-wasabi/ansible-telegraf/issues/99)
+- Proxy not taken into consideration when using 'online' [\#96](https://github.com/dj-wasabi/ansible-telegraf/issues/96)
 
-0.11.0 (2018-12-11)
+**Closed issues:**
 
-  * Added support for plugins being managed exclusively by this playbook #60 (By pull request: gaizeror (Thanks!))
-  * Pin apt key ID #61 (By pull request: tszym (Thanks!))
-  * Wen copying/removing plugins show only plugin name #62 (By pull request: mprasil (Thanks!))
-  * Using base ci requirements.txt #64
-  * telegraf-extra-plugin.conf.j2: fix template typo #65 (By pull request: gaelL (Thanks!))
-  * Some small improvements #66
-  * Want to use latest #67
-  * Added Windows as OS #68
-  * Added support for (Open)Suse #69
-  * Added default pluging if nothing is configured #70
-  * Replace 'ec2_facts' with 'ec2_metadata_facts' to fix a deprecation warning #72 (By pull request: Rylon (Thanks!))
-  * A few enhancements and fixes to windows support #73 (By pull request: jdivy (Thanks!))
-  * Renamed the tojson to to_json #74
+- 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.10.0 (2018-08-12)
+**Merged pull requests:**
 
-  * Updating to telegraf 1.7.3
-  * Fix Deprecation warnings #54
-  * Changed 'include' to 'include_tasks' to remove deprecation warning #53 (By pull request: tjend (Thanks!))
-  * Add option to remove extra plugin config files #52 (By pull request: tjend (Thanks!))
-  * Plugins extra hash allow multiple inputs same type #50 (By pull request: tjend (Thanks!))
-  * Using specific version for tests
-  * Update minimum Ansible version to 2.4
+- 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))
+- 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))
+- Going to Github Actions [\#130](https://github.com/dj-wasabi/ansible-telegraf/pull/130) ([dj-wasabi](https://github.com/dj-wasabi))
+- 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.9.0 (2018-05-06)
+## [0.12.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.12.0) (2019-03-12)
 
-  * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!))
-  * Fix markdown #41 (By pull request: Angristan (Thanks!))
-  * Allow to override RedHat release version #43 (By pull request: tszym (Thanks!))
-  * Improved comments, split up role, moved tags and added defaults #45 (By pull request: boxrick (Thanks!))
-  * Fix Travis Tests #42
-  * Convert the telegraf_plugins_extra varaible to a hash so that we can … #46 (By pull request: tjend (Thanks!))
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.11.0...0.12.0)
 
-0.8.0 (2017-10-30)
+**Implemented enhancements:**
 
-  * Updating to Molecule V2
-  * Test if LSB codename exists before using it #35 (By pull request: tszym (Thanks!))
-  * Remove useless packages on RedHat. fix #28 #36 (By pull request: tszym (Thanks!))
-  * Fix extra plugins by file / Change apt source filename / Change tags by global_tags #37 (By pull request: aarnaud (Thanks!))
-  * Use telegra_global_tags for oldest telegraf versions #38 (By pull request: tszym (Thanks!))
+- Install telegraf from package file instead of repository [\#89](https://github.com/dj-wasabi/ansible-telegraf/issues/89)
 
-0.7.0 (2017-02-23)
+**Closed issues:**
 
-  * Replace action by modules #26 (By pull request: tszym (Thanks!))
-  * Use yum repository to install telegraf on RedHat #25 (By pull request: tszym (Thanks!))
-  * Remove for-loop in extra-plugin template #24 (By pull request: emersondispatch (Thanks!))
-  * Update Debian.yml #23 (By pull request: zend0 (Thanks!))
-  * extra plugins tags #21 (By pull request: oboukili (Thanks!))
-  * Input tags support #20 (By pull request: szibis (Thanks!))
-  * Fix telegraf confguration permissions #19 (By pull request: szibis (Thanks!))
+- Docker container support [\#82](https://github.com/dj-wasabi/ansible-telegraf/issues/82)
 
-0.6.0 (2017-01-02)
+**Merged pull requests:**
 
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!))
-  * Do "become" for the steps that require root access on Debian #10 (By pull request: Ismael (Thanks!))
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #11 (By pull request: Ismael (Thanks!))
-  * Removed imports #12
-  * Fixing molecule #15
-  * set telegraf hostname in defaults. #13 (By pull request: romainbureau (Thanks!))
-  * use version_compare filter … #14 (By pull request: lhoss (Thanks!))
-  * support missing agent settings upto telegraf v1.1 #16 (By pull request: lhoss (Thanks!))
-  * update the README with the latest v0.13 - v1.1 agent settings #17 (By pull request: lhoss (Thanks!))
+- Add processors section in Telegraf config [\#94](https://github.com/dj-wasabi/ansible-telegraf/pull/94) ([ph4r5h4d](https://github.com/ph4r5h4d))
+- 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))
+- Updating Telegraf default to 1.9.5 [\#92](https://github.com/dj-wasabi/ansible-telegraf/pull/92) ([sdurrheimer](https://github.com/sdurrheimer))
+- Updating Telegraf default to 1.9.4 [\#90](https://github.com/dj-wasabi/ansible-telegraf/pull/90) ([sdurrheimer](https://github.com/sdurrheimer))
+- Docker enhancements [\#88](https://github.com/dj-wasabi/ansible-telegraf/pull/88) ([jgeusebroek](https://github.com/jgeusebroek))
+- Updating Telegraf default to 1.9.3 [\#87](https://github.com/dj-wasabi/ansible-telegraf/pull/87) ([sdurrheimer](https://github.com/sdurrheimer))
+- Added register for installation of packages [\#86](https://github.com/dj-wasabi/ansible-telegraf/pull/86) ([dj-wasabi](https://github.com/dj-wasabi))
+- Add Docker container support [\#85](https://github.com/dj-wasabi/ansible-telegraf/pull/85) ([jgeusebroek](https://github.com/jgeusebroek))
+- 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.5.1 (2016-08-24)
+## [0.11.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.11.0) (2018-12-11)
 
-  * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!))
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.10.0...0.11.0)
 
-0.5.0 (2016-07-17)
+**Closed issues:**
 
-  * Removed Test Kitchen tests
-  * Added Molecule tests and travis make use of them
-  * Updated default version to 1.0.0 beta2
-  * Feature/add extra plugins to telegrafd folder #5 (By pull request: stvnwrgs (Thanks!))
+- 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)
 
-0.4.0 (2016-02-05)
+**Merged pull requests:**
 
-  * Fixed test for test-kitchen
-  * Added travis-ci test for testing default installation when PR is made
-  * Fixed Download url for Debian
-  * Removed default entry for telegraf_plugins_extra
+- 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.3.0 (2016-01-13)
+## [0.10.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.10.0) (2018-08-12)
 
-  * Made it work with telegraf 0.10.0
-  * Default installation: 0.10.0
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.9.0...0.10.0)
 
-0.2.0 (2015-11-14)
+**Closed issues:**
 
-  * Fixed kitchen test setup
-  * 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!))
+- 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)
 
-0.1.0 (2015-09-23)
+**Merged pull requests:**
 
-  * Updated `telegraf_agent_version` to 0.1.9
-  * Added restart when package is changed (When updated for example)
-  * Added several plugin options:
-    * pass
-    * drop
-    * tagpass
-    * tagdrop
-    * interval
-  * Updated documentation
-  
+- 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.0.2 (2015-09-20)
+## [0.9.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.9.0) (2018-05-06)
 
-  * Updated README dus to missing colon
-  * Forgot to update the meta file
-  * Added Changelog file
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.8.0...0.9.0)
 
-0.0.1 (2015-09-20)
+**Closed issues:**
 
-  * Initial release
+- 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)*

CONTRIBUTING.md

@@ -22,9 +22,9 @@ Please note that this project is released with a Contributor Code of Conduct. By
 2. Create a branch and apply your changes to this branch.
 
     a. Make sure you have updated the documentation when adding new variables;
-    
+
     b. Don't forget to add/update tests so we can test the functionality during each Pull Request;
-    
+
     c. Make sure the tests will succeed.
 
 3. Push the branch to your fork and submit a pull request.
@@ -44,13 +44,14 @@ Style guides are important because they ensure consistency in the content, look,
 
 ## (local) Development
 
-This role make use of Molecule to test the execution of the role and verificate it. In the root of the repository, a file named `requirements.txt` exists and contains the versions used by the tests.
+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
 ```
 
@@ -67,6 +68,10 @@ 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.
@@ -85,4 +90,4 @@ Some web pages describing for virtual env:
 
 [Molecule V2 with your own role](https://werner-dijkerman.nl/2017/09/05/using-molecule-v2-to-test-ansible-roles/)
 
-**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged. 
+**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged.

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

README.md

@@ -1,8 +1,38 @@
 # dj-wasabi.telegraf
 
+- [dj-wasabi.telegraf](#dj-wasabitelegraf)
+  * [Build status:](#build-status-)
+  * [Requirements](#requirements)
+    + [Supported systems](#supported-systems)
+    + [InfluxDB](#influxdb)
+    + [Docker](#docker)
+  * [Upgrade](#upgrade)
+    + [0.7.0](#070)
+  * [Role Variables](#role-variables)
+    + [Ansible role specific variables](#ansible-role-specific-variables)
+      - [Telegraf Package](#telegraf-package)
+    + [Telegraf agent process configuration.](#telegraf-agent-process-configuration)
+    + [Docker specific role variables:](#docker-specific-role-variables-)
+  * [Extra information](#extra-information)
+    + [ansible_fqdn problematic for getting hostname](#ansible-fqdn-problematic-for-getting-hostname)
+    + [Setting tags](#setting-tags)
+    + [Docker specifics](#docker-specifics)
+      - [Docker image](#docker-image)
+      - [Docker mounts](#docker-mounts)
+      - [Example Docker configuration](#example-docker-configuration)
+  * [Windows specific Variables](#windows-specific-variables)
+  * [Extra information](#extra-information-1)
+    + [telegraf_plugins_default](#telegraf-plugins-default)
+    + [telegraf_plugins_extra](#telegraf-plugins-extra)
+  * [Dependencies](#dependencies)
+  * [Example Playbook](#example-playbook)
+  * [Molecule](#molecule)
+  * [License](#license)
+  * [Author Information](#author-information)
+
 ## Build status:
 
-[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf)
+[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fdj-wasabi%2Fansible-telegraf%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/dj-wasabi/ansible-telegraf/goto?ref=master) <img src="https://img.shields.io/ansible/role/d/5173"/> <img src="https://img.shields.io/ansible/quality/5173"/>
 
 This role will install and configure telegraf.
 
@@ -15,14 +45,16 @@ Design goals are to have a minimal memory footprint with a plugin system so that
 ## Requirements
 
 ### Supported systems
+
 This role supports the following systems:
 
  * Red Hat
  * Debian
  * Ubuntu
  * Docker container
- * Windows (Best effort)
  * (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.
@@ -53,15 +85,16 @@ There was an issue:
 
 Specifying the version to be installed:
 
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.10.0`
+* `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 3 methods in getting `Telegraf` installed on the target host:
+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` or `offline`).
+This can be configured by setting `telegraf_agent_package_method` to one of the appropriate values ( `repo`, `online`, `offline` or `manual`).
 
 #### Telegraf Package
 
@@ -85,6 +118,7 @@ These properties set in how and what package will be installed.
 * `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)
 
 ### Docker specific role variables:
@@ -93,12 +127,30 @@ These properties set in how and what package will be installed.
 * `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:
@@ -154,10 +206,8 @@ More information: [https://github.com/influxdata/telegraf/blob/master/docs/FAQ.m
 	telegraf_plugins_default:
 	  - plugin: cpu
 	    config:
-	      - percpu = "true"
+	      - percpu = true
 	  - plugin: disk
-	    tags:
-	      - diskmetrics = "true"
 	    tagpass:
 	      - fstype = [ "ext4", "xfs" ]
 	    tagdrop:
@@ -183,6 +233,14 @@ _Supporting Windows is an best effort (I don't have the possibility to either te
 * `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:
@@ -190,6 +248,8 @@ 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:
@@ -205,6 +265,8 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 
 Every telegraf agent has these as a default configuration.
 
+### telegraf_plugins_extra
+
 The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. It is a hash instead of a list, so that you can merge values from multiple var files together. Following is an example for using this parameter for MySQL database servers:
 
 	cat group_vars/mysql_database
@@ -221,6 +283,8 @@ Telegraf plugin options:
 * `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:
 
@@ -233,17 +297,30 @@ An example might look like this:
 	      - fstype = [ "ext4", "xfs" ]
     	  - path = [ "/opt", "/home" ]
 
-If you want to define processors you can simply use `telegraf_processors` variable.  
+If you want to define processors you can simply use `telegraf_processors` variable.
 An example might look like this:
 ```
-telegraf_processors: 
+telegraf_processors:
   - processor: rename
-  - processor: rename.replace  
+  - 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
 
 No dependencies
@@ -254,39 +331,6 @@ No dependencies
       roles:
          - { role: dj-wasabi.telegraf }
 
-## Contributors
-
-The following have contributed to this Ansible role (Provided with: `git shortlog -s -n`):
-
-* Werner Dijkerman
-* Thomas Szymanski
-* Jeroen Geusebroek
-* or
-* Alejandro
-* Troy Jendra
-* Slawomir Skowron
-* gaelL
-* Laurent Hoss
-* Ismael
-* Anthony ARNAUD
-* Ilkka Tengvall
-* Rick Box
-* Steven Wirges
-* Jack Ivy
-* Emerson Knapp
-* zend0
-* Angristan
-* Miroslav Prasil
-* Olivier Boukili
-* Pascal
-* Romain BUREAU
-* Ryan Conway
-* Steve Durrheimer
-* TheCodeAssassin
-* aroglian
-
-Thank you all!
-
 ## 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/

defaults/main.yml

@@ -1,9 +1,12 @@
 ---
+telegraf_enabled: True
 # defaults file for ansible-telegraf
 
 telegraf_agent_version: 1.10.0
 telegraf_agent_version_patch: 1
 telegraf_agent_package: telegraf
+telegraf_agent_package_file_deb: telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
+telegraf_agent_package_file_rpm: telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
 telegraf_agent_package_path: /tmp
 telegraf_agent_package_method: repo
 telegraf_agent_package_state: present
@@ -15,6 +18,7 @@ telegraf_agent_flush_interval: 10
 telegraf_agent_flush_jitter: 0
 telegraf_agent_aws_tags: False
 telegraf_agent_aws_tags_prefix: ""
+telegraf_agent_config_path: /etc/telegraf
 
 # Docker specific settings
 telegraf_uid_docker: 998
@@ -23,6 +27,7 @@ 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
@@ -70,6 +75,7 @@ telegraf_yum_baseurl:
   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'
@@ -78,3 +84,6 @@ 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

@@ -209,4 +209,4 @@ case $1 in
         echo "Usage: $0 {start|stop|restart|status|version}"
         exit 2
         ;;
-esac
+esac

handlers/main.yml

@@ -20,3 +20,6 @@
     name: Telegraf
     start_mode: auto
     state: restarted
+
+- name: "Restart MacOS Telegraf"
+  command: brew services restart telegraf

meta/main.yml

@@ -2,6 +2,7 @@
 galaxy_info:
   author: Werner Dijkerman
   description: Installing and configuring Telegraf
+  role_name: telegraf
   company: myCompany.Dotcom
   license: MIT
   min_ansible_version: 2.4
@@ -21,6 +22,9 @@ galaxy_info:
     - name: Windows
       versions:
         - all
+    - name: MacOS
+      versions:
+        - all
 
   galaxy_tags:
     - monitoring

molecule/default/Dockerfile.j2

@@ -1,14 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

molecule/default/INSTALL.rst

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

molecule/default/create.yml

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

molecule/default/destroy.yml

@@ -1,32 +0,0 @@
----
-- name: Destroy
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
-  tasks:
-    - name: Destroy molecule instance(s)
-      docker_container:
-        name: "{{ item.name }}"
-        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
-        state: absent
-        force_kill: "{{ item.force_kill | default(true) }}"
-      register: server
-      with_items: "{{ molecule_yml.platforms }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: docker_jobs
-      until: docker_jobs.finished
-      retries: 300
-      with_items: "{{ server.results }}"
-
-    - name: Delete docker network(s)
-      docker_network:
-        name: "{{ item }}"
-        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
-        state: absent
-      with_items: "{{ molecule_yml.platforms | molecule_get_docker_networks }}"

molecule/default/molecule.yml

@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
 
 platforms:
   - name: influxdb
@@ -18,50 +14,26 @@ platforms:
       - name: telegraf
     environment:
       INFLUXDB_DB: telegraf
-  - name: telegraf-centos
-    image: milcom/centos7-systemd
+  - name: telegraf-${MY_MOLECULE_CONTAINER:-centos8}
+    image: ${MY_MOLECULE_IMAGE:-"geerlingguy/docker-centos8-ansible"}
+    command: ${MY_MOLECULE_DOCKER_COMMAND:-""}
     privileged: True
-    groups:
-      - telegraf
+    pre_build_image: True
     networks:
       - name: telegraf
-  - name: telegraf-debian
-    image: minimum2scp/systemd-stretch
-    privileged: True
-    command: /sbin/init
-    groups:
-      - telegraf
-    networks:
-      - name: telegraf
-  - name: telegraf-ubuntu
-    image: solita/ubuntu-systemd:bionic
-    privileged: True
-    command: /sbin/init
-    groups:
-      - telegraf
-    networks:
-      - name: telegraf
-  - name: telegraf-opensuse
-    image: wdijkerman/molecule-systemd-leap
-    privileged: True
-    command: /sbin/init
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - telegraf
-    networks:
-      - name: telegraf
 
 provisioner:
   name: ansible
   lint:
     name: ansible-lint
   inventory:
-    host_vars:
-      telegraf-debian:
-        telegraf_agent_package: /tmp/telegraf_amd64.deb
-        telegraf_agent_package_method: online
     group_vars:
+      debian:
+        telegraf_agent_package_method: online
       all:
         telegraf_agent_package_state: latest
         telegraf_agent_output:
@@ -71,13 +43,15 @@ provisioner:
               - database = "telegraf"
               - precision = "s"
         telegraf_plugins_extra:
-          percpu-usage:
-            plugin: cpu
+          logparser:
+            plugin: logparser
             config:
-              - percpu = true
-              - totalcpu = false
-              - name_override = "percpu_usage"
-              - fielddrop = ["cpu_time*"]
+              - files = ["/var/log/messages"]
+              - from_beginning = false
+            filter:
+              name: grok
+              config:
+                - patterns = ["invoked oom-killer"]
 
 scenario:
   name: default

molecule/default/prepare.yml

@@ -9,11 +9,18 @@
       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
-          - gpg
+          - 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'

molecule/default/tests/test_default.py

@@ -6,15 +6,15 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
 
 
-def test_telegraf_running_and_enabled(Service, SystemInfo):
-    telegraf = Service("telegraf")
-    if SystemInfo.distribution not in ['opensuse-leap']:
+def test_telegraf_running_and_enabled(host):
+    telegraf = host.service("telegraf")
+    if host.system_info.distribution not in ['opensuse-leap']:
         assert telegraf.is_enabled
         assert telegraf.is_running
 
 
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
+def test_telegraf_dot_conf(host):
+    telegraf = host.file("/etc/telegraf/telegraf.conf")
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
@@ -26,23 +26,23 @@ def test_telegraf_dot_conf(File):
     assert telegraf.contains('[[inputs.net]]')
 
 
-def test_telegraf_dot_d_dir(File):
-    telegraf = File("/etc/telegraf/telegraf.d")
+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(File):
-    telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf")
+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.cpu]]')
-    assert telegraf.contains('totalcpu = false')
+    assert telegraf.contains('[[inputs.logparser]]')
+    assert telegraf.contains('from_beginning = false')
 
 
-def test_telegraf_package(Package):
-    telegraf = Package('telegraf')
+def test_telegraf_package(host):
+    telegraf = host.package('telegraf')
     assert telegraf.is_installed

molecule/default/yaml-lint.yml

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

tasks/Debian.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: "Debian | Set name if state == latest"
+- name: "Debian | Set name if state != latest"
   set_fact:
     telegraf_agent_package: telegraf={{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}
   when:
@@ -16,6 +16,12 @@
   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
@@ -65,8 +71,12 @@
 
 - name: "Debian | Download Telegraf package (online)"
   get_url:
-    url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
-    dest: "{{ telegraf_agent_package }}"
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_deb }}
+    dest: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
+    use_proxy: "{{ true if http_proxy is defined and http_proxy else false }}"
+  environment:
+    http_proxy: "{{ http_proxy | default(None) | default(omit) }}"
+    https_proxy: "{{ https_proxy | default(None) | default(omit) }}"
   when:
     - telegraf_agent_package_method == "online"
 
@@ -74,6 +84,7 @@
   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"
@@ -83,11 +94,11 @@
 
 - name: "Debian | Install Telegraf package"
   apt:
-    deb: "{{ telegraf_agent_package }}"
+    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 != "repo"
+    - 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

@@ -10,22 +10,28 @@
 - name: Use RHEL 7 packages for Fedora
   set_fact:
     telegraf_redhat_releasever: 7
-  when: ansible_distribution == "Fedora"
+  when:
+    - ansible_distribution == "Fedora"
 
 - name: "RedHat | Add yum repository"
   yum_repository:
     name: influxdb
     description: InfluxDB Repository - RHEL $releasever
     baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}"
-    gpgcheck: yes
-    gpgkey: https://repos.influxdata.com/influxdb.key
+    gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}"
+    gpgkey: "{{ telegraf_yum_gpgkey }}"
+  become: yes
   when:
     - telegraf_agent_package_method == "repo"
 
 - name: "RedHat | Download Telegraf package (online)"
   get_url:
-    url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_rpm }}
     dest: "{{ telegraf_agent_package }}"
+    use_proxy: "{{ true if http_proxy is defined and http_proxy else false }}"
+  environment:
+    http_proxy: "{{ http_proxy | default(None) | default(omit) }}"
+    https_proxy: "{{ https_proxy | default(None) | default(omit) }}"
   when:
     - telegraf_agent_package_method == "online"
 
@@ -35,4 +41,5 @@
     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

@@ -42,6 +42,7 @@
   file:
     path: "{{ item.path }}"
     owner: "{{ item.owner }}"
+    mode: 0755
     state: directory
   with_items:
     - path: /etc/telegraf/telegraf.d/

tasks/configure_linux.yml

@@ -6,6 +6,12 @@
   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 }}'
@@ -24,7 +30,7 @@
     mode: 0640
   become: yes
   when:
-    - telegraf_agent_version is version_compare('0.10.0', '<')
+    - telegraf_agent_version is version('0.10.0', '<')
   notify:
     - Restart Telegraf
     - Restart Telegraf container
@@ -32,20 +38,20 @@
 - name: "Copy the template for versions >= 0.10.0"
   template:
     src: telegraf.conf.j2
-    dest: /etc/telegraf/telegraf.conf
+    dest: "{{ telegraf_agent_config_path }}/telegraf.conf"
     owner: telegraf
     group: telegraf
     mode: 0640
   become: yes
   when:
-    - telegraf_agent_version is version_compare('0.10.0', '>=')
+    - 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: /etc/telegraf/telegraf.d
+    path: "{{ telegraf_agent_config_path }}/telegraf.d"
   register: telegraf_directory
   when:
     - telegraf_plugins_extra_exclusive
@@ -53,7 +59,7 @@
 - name: "Delete telegraf extra plugin path"
   file:
     state: absent
-    path: "/etc/telegraf/telegraf.d/"
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
   when:
     - telegraf_plugins_extra_exclusive
     - telegraf_directory.stat.exists
@@ -65,7 +71,7 @@
 - name: "Create telegraf extra plugin path"
   file:
     state: directory
-    path: "/etc/telegraf/telegraf.d/"
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/"
     owner: telegraf
     group: telegraf
     mode: 0755
@@ -80,7 +86,7 @@
 - name: "Copy telegraf extra plugins"
   template:
     src: "telegraf-extra-plugin.conf.j2"
-    dest: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
+    dest: "{{ telegraf_agent_config_path }}/telegraf.d/{{ item.key }}.conf"
     owner: telegraf
     group: telegraf
     mode: 0640
@@ -98,7 +104,7 @@
 
 - name: "Remove telegraf extra plugins"
   file:
-    path: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
+    path: "{{ telegraf_agent_config_path }}/telegraf.d/{{ item.key }}.conf"
     state: absent
   with_dict: "{{ telegraf_plugins_extra }}"
   loop_control:
@@ -118,7 +124,66 @@
 - name: "Start Telegraf (If it wasn't running)"
   service:
     name: telegraf
-    state: started
-    enabled: yes
+    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

@@ -20,11 +20,27 @@
   when:
     - not file_info.stat.exists
 
-- name: "Windows | Unzip file"
+- 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:
@@ -76,3 +92,9 @@
     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

@@ -38,7 +38,7 @@
 - name: Ensure Telegraf Docker container is running
   docker_container:
     name: "{{ telegraf_agent_docker_name }}"
-    image: "telegraf:{{ telegraf_agent_version }}"
+    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

tasks/main.yml

@@ -18,15 +18,30 @@
   include_tasks: "Suse.yml"
   when: ansible_os_family == "Suse" and not telegraf_agent_docker
 
+- name: "Install on FreeBSD"
+  include_tasks: "FreeBSD.yml"
+  when:
+    - ansible_os_family == "FreeBSD" and not telegraf_agent_docker
+
+- name: "Install on MacOS"
+  include_tasks: "MacOS.yml"
+  when:
+    - ansible_os_family == "Darwin" and not telegraf_agent_docker
+
 - include_tasks: "docker.yml"
   when: telegraf_agent_docker
 
 - name: "Configure Telegraf"
   include_tasks: "configure_linux.yml"
   when:
-    - ansible_os_family != "Windows"
+    - ansible_os_family not in ['Windows', 'Darwin']
 
 - name: "Install / Configure telegraf on Windows"
   include_tasks: "configure_windows.yml"
   when:
     - ansible_os_family == "Windows" and not telegraf_agent_docker
+
+- name: "Install / Configure telegraf on MacOS"
+  include_tasks: "configure_macos.yml"
+  when:
+    - ansible_os_family == "Darwin" and not telegraf_agent_docker

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

@@ -9,7 +9,7 @@
 
 {% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
 {% for key, value in ec2_tags.tags.iteritems()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}
 
@@ -68,4 +68,4 @@
 {% endif %}
 
 {% endfor %}
-{% endif %}
+{% endif %}

templates/telegraf-extra-plugin.conf.j2

@@ -27,6 +27,16 @@
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.value.filter is defined %}
+{% if item.value.filter.name is defined %}
+[inputs.{{ item.value.plugin | default(item.key) }}.{{ item.value.filter.name | default("grok") }}]
+{% if item.value.filter.config is defined and item.value.filter.config is iterable %}
+{% for items in item.value.filter.config %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% endif %}
 {% if item.value.objects is defined and item.value.objects is iterable %}
 {% for object in item.value.objects %}
 [[inputs.{{ item.value.plugin | default(item.key) }}.object]]
@@ -36,4 +46,12 @@
   Measurement = {{ object.measurement | default("win_perf_counters") | to_json }}
   IncludeTotal = {{ object.total | default(false) | string | lower }}
 {% endfor %}
-{% endif %}
+{% 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 %}
+{% endfor %}
+{% endif %}

templates/telegraf.conf.j2

@@ -8,8 +8,8 @@
 {% endif %}
 
 {% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
-{% for key, value in ec2_tags.tags.iteritems()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+{% for key, value in ec2_tags.tags.items()%}
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}
 
@@ -127,4 +127,4 @@
 {% endfor %}
 {% endif %}
 {% endfor %}
-{% endif %}
+{% endif %}