Updated CHANGELOG.md on "2022-03-21 15:46:31"

* templates/telegraf.conf.j2: Adding aggregator support.

Adding aggregator support and tagpass/tagdrop support for
processors and aggregators.

* Adding test for aggregator templating

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

.pre-commit-config.yaml

@@ -1,9 +1,14 @@
 ---
 repos:
-# - repo: https://github.com/dj-wasabi/pre-commit-hooks
+- repo: local
-#   rev: master
+  hooks:
-#   hooks:
+    - id: ansible-lint
-#     - 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:

CHANGELOG.md

@@ -1,152 +1,299 @@
-dj-wasabi.telegraf
+# Changelog
-------------------
 
-Below an overview of all changes in the releases.
+## [Unreleased](https://github.com/dj-wasabi/ansible-telegraf/tree/HEAD)
 
-Version (Release date)
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.13.2...HEAD)
 
-0.12.0 (2019-03-12)
+**Implemented enhancements:**
 
-  * Download from influxdb #109
+- Adding support for aggregators [\#156](https://github.com/dj-wasabi/ansible-telegraf/pull/156) ([simo-tuomisto](https://github.com/simo-tuomisto))
-  * Don't override package name unless "latest" #108 (By pull request: matttrach (Thanks!))
+- Add support for Rocky Linux [\#147](https://github.com/dj-wasabi/ansible-telegraf/pull/147) ([maxwondercorn](https://github.com/maxwondercorn))
-  * Adding support for arm64 systems #106 (By pull request: remkade (Thanks!))
+- Add Windows feature of upgrade agents [\#146](https://github.com/dj-wasabi/ansible-telegraf/pull/146) ([PeterSzegedi](https://github.com/PeterSzegedi))
-  * Use items() instead of iteritems() #104 (By pull request: diego1q2w
-  * Fix: ensure apt-cache is updated before install #103 (By pull request: asfaltboy (Thanks!))
-  * on FreeBSD the telegeraf.conf is in root of /usr/local/etc. #102 (By pull request: langerma (Thanks!))
-  * Some changes for fixing FreeBSD #101
-  * basic FreeBSD support #100 (By pull request: langerma (Thanks!))
-  * Added the use_proxy argument to use a proxy (or not) #98
-  * Various small changes for molecule #97
 
-0.12.0 (2019-03-12)
+**Merged pull requests:**
 
-  * Add support for extra win_perf_counters and prevent python u'' strings #76 (By pull request: jdivy (Thanks!))
+- Improve usage on SUSE releases [\#155](https://github.com/dj-wasabi/ansible-telegraf/pull/155) ([jeffmahoney](https://github.com/jeffmahoney))
-  * Fix to work with Fedora Linux #78 (By pull request: ikke-t (Thanks!))
+- Add variable for openSUSE RPM repository [\#151](https://github.com/dj-wasabi/ansible-telegraf/pull/151) ([kingphil](https://github.com/kingphil))
-  * Add Yum repo support for Amazon Linux #79 (By pull request: anthonysr-mc (Thanks!))
+- Fixed issues with Windows paths containing spaces & removed redundant "telegraf" folder in path [\#144](https://github.com/dj-wasabi/ansible-telegraf/pull/144) ([treanorjp](https://github.com/treanorjp))
-  * Updating Telegraf default to 1.9.2 #80 (and some to other versions as well) (By pull request: sdurrheimer (Thanks!))
-  * [bug] debian - add cache_valid_time #81 (By pull request: pad92 (Thanks!))
-  * Fix tagpass and tagdrop #83 (By pull request: jgeusebroek (Thanks!))
-  * Remove legacy options #84 (By pull request: jgeusebroek (Thanks!))
-  * Add Docker container support #85 (By pull request: jgeusebroek (Thanks!))
-  * Added register for installation of packages #86
-  * Docker enhancements #88 (By pull request: jgeusebroek (Thanks!))
-  * Updated to Telegraf 1.10.0;Different installation methods #93
-  * Add processors section in Telegraf config #94 (By pull request: ph4r5h4d (Thanks!))
 
-0.11.0 (2018-12-11)
+## [0.13.2](https://github.com/dj-wasabi/ansible-telegraf/tree/0.13.2) (2021-03-05)
 
-  * Added support for plugins being managed exclusively by this playbook #60 (By pull request: gaizeror (Thanks!))
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.13.1...0.13.2)
-  * Pin apt key ID #61 (By pull request: tszym (Thanks!))
-  * Wen copying/removing plugins show only plugin name #62 (By pull request: mprasil (Thanks!))
-  * Using base ci requirements.txt #64
-  * telegraf-extra-plugin.conf.j2: fix template typo #65 (By pull request: gaelL (Thanks!))
-  * Some small improvements #66
-  * Want to use latest #67
-  * Added Windows as OS #68
-  * Added support for (Open)Suse #69
-  * Added default pluging if nothing is configured #70
-  * Replace 'ec2_facts' with 'ec2_metadata_facts' to fix a deprecation warning #72 (By pull request: Rylon (Thanks!))
-  * A few enhancements and fixes to windows support #73 (By pull request: jdivy (Thanks!))
-  * Renamed the tojson to to_json #74
 
-0.10.0 (2018-08-12)
+**Implemented enhancements:**
 
-  * Updating to telegraf 1.7.3
+- Remove telegraf repository after switching to online method [\#142](https://github.com/dj-wasabi/ansible-telegraf/pull/142) ([djerfy](https://github.com/djerfy))
-  * Fix Deprecation warnings #54
-  * Changed 'include' to 'include_tasks' to remove deprecation warning #53 (By pull request: tjend (Thanks!))
-  * Add option to remove extra plugin config files #52 (By pull request: tjend (Thanks!))
-  * Plugins extra hash allow multiple inputs same type #50 (By pull request: tjend (Thanks!))
-  * Using specific version for tests
-  * Update minimum Ansible version to 2.4
 
-0.9.0 (2018-05-06)
+**Merged pull requests:**
 
-  * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!))
+- Fix spacing for telegraf\_plugins\_extra example in readme.md [\#143](https://github.com/dj-wasabi/ansible-telegraf/pull/143) ([isclever](https://github.com/isclever))
-  * Fix markdown #41 (By pull request: Angristan (Thanks!))
-  * Allow to override RedHat release version #43 (By pull request: tszym (Thanks!))
-  * Improved comments, split up role, moved tags and added defaults #45 (By pull request: boxrick (Thanks!))
-  * Fix Travis Tests #42
-  * Convert the telegraf_plugins_extra varaible to a hash so that we can … #46 (By pull request: tjend (Thanks!))
 
-0.8.0 (2017-10-30)
+## [0.13.1](https://github.com/dj-wasabi/ansible-telegraf/tree/0.13.1) (2021-01-06)
 
-  * Updating to Molecule V2
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.13.0...0.13.1)
-  * Test if LSB codename exists before using it #35 (By pull request: tszym (Thanks!))
-  * Remove useless packages on RedHat. fix #28 #36 (By pull request: tszym (Thanks!))
-  * Fix extra plugins by file / Change apt source filename / Change tags by global_tags #37 (By pull request: aarnaud (Thanks!))
-  * Use telegra_global_tags for oldest telegraf versions #38 (By pull request: tszym (Thanks!))
 
-0.7.0 (2017-02-23)
+**Implemented enhancements:**
 
-  * Replace action by modules #26 (By pull request: tszym (Thanks!))
+- Added GH Action to automatically update CHANGELOG.md [\#141](https://github.com/dj-wasabi/ansible-telegraf/pull/141) ([dj-wasabi](https://github.com/dj-wasabi))
-  * 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!))
 
-0.6.0 (2017-01-02)
+**Fixed bugs:**
 
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!))
+- adjustments for Windows \>= 1.15 [\#139](https://github.com/dj-wasabi/ansible-telegraf/pull/139) ([billabongrob](https://github.com/billabongrob))
-  * 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!))
 
-0.5.1 (2016-08-24)
+**Closed issues:**
 
-  * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!))
+- Newer versions of Telegraf fail on Windows [\#138](https://github.com/dj-wasabi/ansible-telegraf/issues/138)
 
-0.5.0 (2016-07-17)
+**Merged pull requests:**
 
-  * Removed Test Kitchen tests
+- Added property telegraf\_agent\_docker\_image\_version for using a specific version of the Docker image [\#137](https://github.com/dj-wasabi/ansible-telegraf/pull/137) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Added Molecule tests and travis make use of them
+- Apply ansible-lint in pre-commit hook and fix changes [\#136](https://github.com/dj-wasabi/ansible-telegraf/pull/136) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Updated default version to 1.0.0 beta2
+- Using version as version\_compare is deprecated [\#135](https://github.com/dj-wasabi/ansible-telegraf/pull/135) ([dj-wasabi](https://github.com/dj-wasabi))
-  * Feature/add extra plugins to telegrafd folder #5 (By pull request: stvnwrgs (Thanks!))
+- Using command instead of shell module [\#134](https://github.com/dj-wasabi/ansible-telegraf/pull/134) ([dj-wasabi](https://github.com/dj-wasabi))
 
-0.4.0 (2016-02-05)
+## [0.13.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.13.0) (2020-10-16)
 
-  * Fixed test for test-kitchen
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.12.0...0.13.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
+- Setup the system for individual plugins [\#125](https://github.com/dj-wasabi/ansible-telegraf/issues/125)
-  * Default installation: 0.10.0
+- 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.2.0 (2015-11-14)
+**Closed issues:**
 
-  * Fixed kitchen test setup
+- telegraf\_agent\_aws\_tags creates an invalid Telegraf configuration [\#128](https://github.com/dj-wasabi/ansible-telegraf/issues/128)
-  * Adding "net" to the telegraf_plugins_default property
+- Broken on Ubuntu 20.04 [\#121](https://github.com/dj-wasabi/ansible-telegraf/issues/121)
-  * Update etc-opt-telegraf-telegraf.conf.j2 #2 (By pull request: aferrari-technisys (Thanks!))
+- Broken on RedHat [\#119](https://github.com/dj-wasabi/ansible-telegraf/issues/119)
-  * 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
+- 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 restart when package is changed (When updated for example)
+- 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))
-  * Added several plugin options:
+- Going to Github Actions [\#130](https://github.com/dj-wasabi/ansible-telegraf/pull/130) ([dj-wasabi](https://github.com/dj-wasabi))
-    * pass
+- quote aws ec2 global tags [\#129](https://github.com/dj-wasabi/ansible-telegraf/pull/129) ([Puneeth-n](https://github.com/Puneeth-n))
-    * drop
+- made service status configurable [\#127](https://github.com/dj-wasabi/ansible-telegraf/pull/127) ([DEvil0000](https://github.com/DEvil0000))
-    * tagpass
+- Plugin dependencies are installed and configured [\#126](https://github.com/dj-wasabi/ansible-telegraf/pull/126) ([carlba](https://github.com/carlba))
-    * tagdrop
+- fix debian packagename on state latest [\#124](https://github.com/dj-wasabi/ansible-telegraf/pull/124) ([dwerder](https://github.com/dwerder))
-    * interval
+- MacOS support [\#123](https://github.com/dj-wasabi/ansible-telegraf/pull/123) ([carlba](https://github.com/carlba))
-  * Updated documentation
+- 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.12.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.12.0) (2019-03-12)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.11.0...0.12.0)
+
+**Implemented enhancements:**
+
+- Install telegraf from package file instead of repository [\#89](https://github.com/dj-wasabi/ansible-telegraf/issues/89)
+
+**Closed issues:**
+
+- Docker container support [\#82](https://github.com/dj-wasabi/ansible-telegraf/issues/82)
+
+**Merged pull requests:**
+
+- 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.11.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.11.0) (2018-12-11)
+
+[Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.10.0...0.11.0)
+
+**Closed issues:**
+
+- 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)
 
 
-0.0.2 (2015-09-20)
 
-  * Updated README dus to missing colon
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
-  * Forgot to update the meta file
-  * Added Changelog file
-
-0.0.1 (2015-09-20)
-
-  * Initial release

CONTRIBUTING.md

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

CONTRIBUTORS

@@ -0,0 +1,44 @@
+ Alejandro
+ Angristan
+ Anthony ARNAUD
+ Carl Bäckström
+ DEvil0000
+ DJΞRFY
+ Daniel Werdermann
+ Diego Nava
+ Emerson Knapp
+ Farshad Nematdoust
+ Greg
+ Heckel, Robert J
+ 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
+ Werner Dijkerman [GH bot]
+ aroglian
+ gaelL
+ or
+ zend0

README.md

@@ -26,7 +26,6 @@
     + [telegraf_plugins_extra](#telegraf-plugins-extra)
   * [Dependencies](#dependencies)
   * [Example Playbook](#example-playbook)
-  * [Contributors](#contributors)
   * [Molecule](#molecule)
   * [License](#license)
   * [Author Information](#author-information)
@@ -86,7 +85,7 @@ 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 4 methods in getting `Telegraf` installed on the target host:
 
@@ -119,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:
@@ -127,6 +127,7 @@ 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`
 
@@ -232,6 +233,10 @@ _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.
 
+## openSUSE specific Variables
+
+* `telegraf_zypper_baseurl`:  The URL to the openSUSE repository that hosts Telegraf (for example, for openSUSE Leap: "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_{{ ansible_distribution_version }}/").  If this is unspecified, a default repository will be used.
+
 ## MacOS specific Variables
 
 **NOTE**
@@ -270,9 +275,9 @@ The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific t
 
 	cat group_vars/mysql_database
 	telegraf_plugins_extra:
-		mysql:
+	  mysql:
-		  config:
+	    config:
-		  	- servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"]
+	      - 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.
 
@@ -330,39 +335,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

@@ -2,7 +2,7 @@
 telegraf_enabled: True
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 1.10.0
+telegraf_agent_version: 1.18.2
 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
@@ -19,6 +19,7 @@ telegraf_agent_flush_jitter: 0
 telegraf_agent_aws_tags: False
 telegraf_agent_aws_tags_prefix: ""
 telegraf_agent_config_path: /etc/telegraf
+telegraf_win_logfile_rotation_max_archives: 3
 
 # Docker specific settings
 telegraf_uid_docker: 998
@@ -27,6 +28,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
@@ -74,14 +76,21 @@ 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"
+  rocky: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
 telegraf_yum_gpgkey: "https://repos.influxdata.com/influxdb.key"
 
+telegraf_zypper_repos:
+  "opensuse tumbleweed": "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Factory/"
+  "default": "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Factory/"
+  "sles": "http://download.opensuse.org/repositories/devel:/languages:/go/SLE_{{ ansible_distribution_major_version }}_SP{{ ansible_distribution_release }}/"
+  "opensuse leap": "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_{{ ansible_distribution_version }}/"
+
 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 {{ telegraf_win_install_dir }}\telegraf.conf
   - --config-directory {{ telegraf_win_include }}
 
 telegraf_mac_user: user

files/telegraf.init

@@ -1,212 +0,0 @@
-#! /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

@@ -22,4 +22,4 @@
     state: restarted
 
 - name: "Restart MacOS Telegraf"
-  shell: brew services restart telegraf
+  command: brew services restart telegraf

molecule/default/molecule.yml

@@ -52,6 +52,13 @@ provisioner:
               name: grok
               config:
                 - patterns = ["invoked oom-killer"]
+        telegraf_aggregators:
+          - aggregator: basicstats
+            config:
+              - drop_original = false
+              - stats = ['mean']
+            tagpass:
+              - cpu = ["cpu-total"]
 
 scenario:
   name: default

molecule/default/prepare.yml

@@ -14,10 +14,6 @@
       when:
         - ansible_os_family == 'Debian'
 
-    - name: debug
-      debug:
-        var: ansible_distribution_major_version
-
     - name: "Installing packages on Debian"
       apt:
         name:
@@ -32,8 +28,6 @@
     - name: "Installing packages on Suse"
       zypper:
         name:
-          - sysvinit-tools
-          - insserv-compat
           - aaa_base
         state: present
       when:

molecule/default/tests/test_default.py

@@ -24,6 +24,7 @@ def test_telegraf_dot_conf(host):
     assert telegraf.contains('[[outputs.influxdb]]')
     assert telegraf.contains('["http://influxdb:8086"]')
     assert telegraf.contains('[[inputs.net]]')
+    assert telegraf.contains('[[aggregators.basicstats]]')
 
 
 def test_telegraf_dot_d_dir(host):

tasks/Debian.yml

@@ -80,7 +80,7 @@
   when:
     - telegraf_agent_package_method == "online"
 
-- name: "Debian | Install Telegraf package"
+- name: "Debian | Install Telegraf package (repo)"
   apt:
     name: "{{ telegraf_agent_package }}"
     state: "{{ telegraf_agent_package_state }}"
@@ -92,7 +92,7 @@
   when:
     - telegraf_agent_package_method == "repo"
 
-- name: "Debian | Install Telegraf package"
+- name: "Debian | Install Telegraf package (online)"
   apt:
     deb: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
     state: "present"
@@ -102,3 +102,11 @@
   become: yes
   when:
     - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"
+
+- name: "Debian | Remove repository (online/offline install)"
+  file:
+    path: "/etc/apt/sources.list.d/telegraf.list"
+    state: absent
+  become: yes
+  when:
+    - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"

tasks/FreeBSD.yml

@@ -14,11 +14,11 @@
   notify: "Restart Telegraf"
 
 - name: "FreeBSD | add telegraf_flags for extra plugins"
-  shell: sysrc telegraf_flags="-quiet -config-directory=/usr/local/etc/telegraf.d"
+  command: sysrc telegraf_flags="-quiet -config-directory=/usr/local/etc/telegraf.d"
   tags:
     - skip_ansible_lint
 
 - name: "FreeBSD | add telegraf to init"
-  shell: sysrc telegraf_enable="YES"
+  command: sysrc telegraf_enable="YES"
   tags:
     - skip_ansible_lint

tasks/Suse.yml

@@ -12,23 +12,48 @@
     state: present
   become: yes
 
-- name: "Suse | Install repo dependencies"
+- name: "Suse | Install repo dependencies for Python 2"
   zypper:
-    name: ["python-libxml2", "python-xml"]
+    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
+  when: ansible_python.version.major == 2
 
-- name: "Suse | Install basic repo file"
+- name: "Suse | Install repo dependencies for Python >= 3"
+  zypper:
+    name:
+      - python3-libxml2-python
+    update_cache: True
+    state: present
+  register: are_telegraf_dependencies_packages_installed
+  until: are_telegraf_dependencies_packages_installed is succeeded
+  become: yes
+  when: ansible_python.version.major >= 3
+
+- name: "Suse | Add default Open Build Service repository"
   zypper_repository:
-    repo: "http://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Factory/"
+    repo: "{{ telegraf_zypper_repos[ansible_distribution|lower] | default(telegraf_zypper_repos['default']) }}"
-    name: The Go Programming Language (openSUSE_Factory)
+    name: "telegraf"
     state: present
     runrefresh: True
     auto_import_keys: True
   become: yes
+  when: telegraf_zypper_baseurl is not defined
+
+- name: "Suse | Add specified package repository"
+  zypper_repository:
+    repo: "{{ telegraf_zypper_baseurl }}"
+    name: "telegraf"
+    state: present
+    runrefresh: True
+    auto_import_keys: True
+  become: yes
+  when: telegraf_zypper_baseurl is defined
 
 - name: "Suse | Install Telegraf"
   zypper:
@@ -42,15 +67,10 @@
   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

@@ -30,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
@@ -44,7 +44,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
@@ -150,7 +150,7 @@
         name: smartmontools
 
     - name: Find path of smartctl
-      shell: which smartctl
+      command: which smartctl
       register: which_smartctl
       ignore_errors: true
       changed_when: false
@@ -161,6 +161,7 @@
         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:

tasks/configure_macos.yml

@@ -30,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
@@ -44,7 +44,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 MacOS Telegraf
     - Restart Telegraf container
@@ -122,7 +122,7 @@
   meta: flush_handlers
 
 - name: "Start Telegraf (If it wasn't running)"
-  shell: brew services start telegraf
+  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,16 +20,39 @@
   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.exe'
+    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 }}\telegraf.exe'
+    dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
+    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.exe'
+    delete_archive: yes
+  when: telegraf_agent_version is version('1.15', '<')
+
+- name: "Windows | Move extracted executable"
+  win_copy:
+    src: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe'
+    dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
+    remote_src: 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'
+    dest: '{{ telegraf_win_install_dir }}\telegraf.conf'
   notify: "Restart Windows Telegraf"
 
 - name: "Windows | Copy telegraf extra plugins"
@@ -58,21 +81,40 @@
     - item.value.state|default('present') == 'absent'
   notify: "Restart Windows Telegraf"
 
-- name: "Windows | Register Service"
+- name: "Windows | Check if Telegraf service is already in place"
-  win_command: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe {{ telegraf_win_service_args | join(" ") }}'
+  win_service:
-  register: telegraf_windows_install
+    name: telegraf
-  args:
+  register: service_result
-    creates: '{{ telegraf_win_install_dir }}\.installed'
+  failed_when: service_result is not defined
 
-- name: "Windows | Create done file so it won't register itself again"
+- debug: msg={{ service_result }}
-  win_file:
+
-    path: '{{ telegraf_win_install_dir }}\.installed'
+- name: "Windows | Set service startup mode to auto and ensure it is started"
-    state: touch
+  win_service:
+    name: Telegraf
+    start_mode: auto
+    state: stopped
   when:
-    - telegraf_windows_install is changed
+    - service_result.exists
+
+- name: "Windows | Unregister Service"
+  win_command: '{{ telegraf_win_install_dir }}\telegraf.exe --service uninstall'
+  register: telegraf_windows_uninstall
+  when:
+    - service_result.exists
+
+- name: "Windows | Register Service"
+  win_command: '{{ telegraf_win_install_dir }}\telegraf.exe {{ telegraf_win_service_args | join(" ") }}'
+  register: telegraf_windows_install
 
 - 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

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

templates/telegraf.conf.j2

@@ -30,6 +30,9 @@
 {% if telegraf_agent_version is version_compare('1.1', '>=') %}
 {% if ansible_os_family == "Windows" %}
     logfile = "{{ telegraf_win_logfile }}"
+    logfile_rotation_interval = "{{ telegraf_win_logfile_rotation_interval }}"
+    logfile_rotation_max_size = "{{ telegraf_win_logfile_rotation_max_size }}"
+    logfile_rotation_max_archives = {{ telegraf_win_logfile_rotation_max_archives| int }}
 {% else %}
     logfile = "{{ telegraf_agent_logfile }}"
 {% endif %}
@@ -115,7 +118,7 @@
 {% endif %}
 
 ###############################################################################
-#                                  PROCESSORS                                    #
+#                                  PROCESSORS                                 #
 ###############################################################################
 
 {% if telegraf_processors is defined and telegraf_processors is iterable %}
@@ -126,5 +129,44 @@
     {{ items }}
 {% endfor %}
 {% endif %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[processors.{{ item.processor }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[processors.{{ item.processor }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+###############################################################################
+#                                  AGGREGATORS                                #
+###############################################################################
+
+{% if telegraf_aggregators is defined and telegraf_aggregators is iterable %}
+{% for item in telegraf_aggregators %}
+[[aggregators.{{ item.aggregator }}]]
+{% if item.config is defined and item.config is iterable %}
+{% for items in item.config %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagpass is defined and item.tagpass is iterable %}
+[aggregators.{{ item.aggregator }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[aggregators.{{ item.aggregator }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
 {% endfor %}
 {% endif %}