Updated changelog

Feature/add extra plugins to telegrafd folder

.gitignore

@@ -1,3 +1,7 @@
-.kitchen/
-.kitchen.local.yml
-.idea/
+.idea
+.molecule
+tests/.cache
+.cache
+__pycache__
+*.retry
+pmip

.kitchen.yml

@@ -1,19 +0,0 @@
----
-driver:
-  name: docker
-
-provisioner:
-  name: ansible_playbook
-  ansible_yum_repo: "http://mirror.logol.ru/epel/6/x86_64/epel-release-6-8.noarch.rpm"
-  hosts: localhost
-
-platforms:
-  - name: centos-6.6
-
-verifier:
-  ruby_bindir: '/usr/bin' 
-
-suites:
-  - name: default
-    run_list:
-    attributes:

.travis.yml

@@ -0,0 +1,17 @@
+---
+sudo: required
+language: python
+services:
+  - docker
+
+before_install:
+- sudo apt-get -qq update
+- sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine
+
+install:
+- pip install molecule
+
+script:
+- molecule test
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -5,6 +5,32 @@ Below an overview of all changes in the releases.
 
 Version (Release date)
 
+0.5.0 (2016-07-17)
+
+  * 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!))
+
+0.4.0 (2016-02-05)
+
+  * 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
+
+0.3.0 (2016-01-13)
+
+  * Made it work with telegraf 0.10.0
+  * Default installation: 0.10.0
+
+0.2.0 (2015-11-14)
+
+  * 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!))
+
 0.1.0 (2015-09-23)
 
   * Updated `telegraf_agent_version` to 0.1.9

Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "test-kitchen"
-gem "kitchen-docker"
-gem "kitchen-ansible"

README.md

@@ -1,6 +1,10 @@
 dj-wasabi.telegraf
 =========
 
+Build status:
+
+[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf)
+
 This role will install and configure telegraf.
 
 Telegraf is an agent written in Go for collecting metrics from the system it's running on, or from other services, and writing them into InfluxDB.
@@ -19,11 +23,14 @@ Role Variables
 
 The following parameters can be set for the Telegraf agent:
 
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `0.1.9`
+* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.0.0`
+* `telegraf_agent_rpm_url`: The full path to the RPM file located on a webserver. 
+* `telegraf_agent_deb_url`:  The full path to the DEB file located on a webserver.
 * `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10`
 * `telegraf_agent_debug`: Setting the Telegraf in debug mode. Default: `False`
-* `telegraf_agent_utc`: Option for outputting data in UTC. Default: `True`
-* `telegraf_agent_precision`: Precision to write data at. Valid values for Precision are n, u, ms, s, m, and h. Default: `s`
+* `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True
+* `telegraf_agent_flush_interval`: Default data flushing interval for all outputs. Default: 10
+* `telegraf_agent_flush_jitter`: Jitter the flush interval by a random amount. Default: 0
 
 You can set tags for the host running telegraf:
 
@@ -36,7 +43,7 @@ Specifying an output. The default is set to localhost, you'll have to specify th
 	telegraf_agent_output:
 	  - type: influxdb
 	    config:
-	      - url = "http://localhost:8086"
+	      - urls = ["http://localhost:8086"]
 	      - database = "telegraf"
 
 The config will be printed line by line into the configuration, so you could also use:
@@ -62,6 +69,7 @@ With the property `telegraf_plugins_default` it is set to use the default set of
 	  - plugin: mem
 	  - plugin: system
 	  - plugin: swap
+	  - plugin: netstat
 
 Every telegraf agent has these as an default configuration.
  
@@ -104,10 +112,15 @@ Example Playbook
       roles:
          - { role: dj-wasabi.telegraf }
 
-Test Kitchen
-------------
+##Contributors
+The following have contributed to this Ansible role:
 
-This roles is configured to be tested with Test Kitchen. You can find on this page some more information regarding Test Kitchen: http://werner-dijkerman.nl/2015/08/20/using-test-kitchen-with-docker-and-serverspec-to-test-ansible-roles/
+  * aferrari-technisys
+  * stvnwrgs
+
+# Molecule
+
+This roles is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: https://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/
 
 License
 -------

defaults/main.yml

@@ -1,19 +1,27 @@
 ---
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 0.1.9
+#telegraf_agent_version: 0.10.1
+telegraf_agent_version: 1.0.0
+telegraf_agent_version_sub_l: _beta2
+telegraf_agent_version_sub_u: -beta2
 telegraf_agent_interval: 10
 telegraf_agent_debug: False
-telegraf_agent_utc: True
-telegraf_agent_precision: s
+telegraf_agent_round_interval: True
+telegraf_agent_flush_interval: 10
+telegraf_agent_flush_jitter: 0
+
+telegraf_agent_rpm_url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_l }}.x86_64.rpm
+telegraf_agent_deb_url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}{{ telegraf_agent_version_sub_u }}_amd64.deb
 
 telegraf_agent_tags:
 
 telegraf_agent_output:
   - type: influxdb
     config:
-      - url = "http://localhost:8086"
+      - urls = ["http://localhost:8086"]
       - database = "telegraf"
+      - precision = "s"
 
 telegraf_plugins_default:
   - plugin: cpu
@@ -22,7 +30,9 @@ telegraf_plugins_default:
   - plugin: disk
   - plugin: io
   - plugin: mem
+  - plugin: net
   - plugin: system
   - plugin: swap
+  - plugin: netstat
 
 telegraf_plugins_extra:

molecule.yml

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

playbook.yml

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

tasks/Debian.yml

@@ -2,13 +2,13 @@
 
 - name: "Fetch telegraf installation package | Debian"
   action: get_url
-          url=http://get.influxdb.org/telegraf/telegraf-{{ telegraf_agent_version }}_amd64.deb
-          dest=/tmp/telegraf_{{ telegraf_agent_version }}_amd64.deb
+          url={{ telegraf_agent_deb_url }}
+          dest=/tmp/telegraf_{{ telegraf_agent_version }}-1_amd64.deb
           mode=0440
 
 - name: "Install telegraf package | Debian"
   action: apt
-          deb=/tmp/telegraf_{{ telegraf_agent_version }}_amd64.deb
+          deb=/tmp/telegraf_{{ telegraf_agent_version }}-1_amd64.deb
           state=installed
   notify: "Restart Telegraf"
   sudo: yes

tasks/RedHat.yml

@@ -1,14 +1,38 @@
 ---
 
+- name: "Enable EPEL"
+  action: yum
+          name=epel-release
+          state=installed
+
+- name: "Installing some dependencies"
+  action: yum
+          name={{ item }}
+          state=installed
+  with_items:
+    - python-pip
+    - python-devel
+    - gcc
+    - libffi-devel
+    - openssl-devel
+
+- name: "Installing PIP dependensies"
+  action: pip
+          name={{ item }}
+          state=present
+  with_items:
+    - urllib3
+    - pyopenssl
+    - ndg-httpsclient
+
 - name: "Fetch telegraf installation package | RedHat"
   action: get_url
-          url=http://get.influxdb.org/telegraf/telegraf-{{ telegraf_agent_version }}-1.x86_64.rpm
-          dest=/tmp/telegraf_{{ telegraf_agent_version }}-1.x86_64.rpm
+          url="{{ telegraf_agent_rpm_url }}"
+          dest=/tmp/telegraf_{{ telegraf_agent_version }}.x86_64.rpm
           mode=0440
 
 - name: "Install telegraf package | RedHat"
   action: yum
-          name=/tmp/telegraf_{{ telegraf_agent_version }}-1.x86_64.rpm
+          name=/tmp/telegraf_{{ telegraf_agent_version }}.x86_64.rpm
           state=installed
   notify: "Restart Telegraf"
-  sudo: yes

tasks/main.yml

@@ -9,12 +9,40 @@
   include: "Debian.yml"
   when: ansible_os_family == "Debian"
 
-- name: "Copy the template"
-  action: template
-          src=etc-opt-telegraf-telegraf.conf.j2
-          dest=/etc/opt/telegraf/telegraf.conf
-          owner=root
-          group=root
-          mode=644
+- name: "Set fact by remove the dots from version"
+  set_fact:
+    telegraf_ver: "{{ telegraf_agent_version.replace('.','') }}"
+
+- name: "Copy the template for versions < 0.10.0"
+  template:
+    src: etc-opt-telegraf-telegraf.conf.j2
+    dest: /etc/opt/telegraf/telegraf.conf
+    owner: root
+    group: root
+    mode: 0644
+  when: telegraf_ver < 100
   sudo: yes
   notify: "Restart Telegraf"
+
+- name: "Copy the template for versions >= 0.10.0"
+  template:
+    src: telegraf.conf.j2
+    dest: /etc/telegraf/telegraf.conf
+    owner: root
+    group: root
+    mode: 0644
+  when: telegraf_ver >= 100
+  sudo: yes
+  notify: "Restart Telegraf"
+
+- name: "Copy telegraf extra plugins"
+  template:
+    src: "telegraf-extra-plugin.conf.j2"
+    dest: "/etc/telegraf/telegraf.d/{{ item.plugin }}.conf"
+    owner: root
+    group: root
+    mode: 644
+  with_items: "{{ telegraf_plugins_extra }}"
+  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable"
+  sudo: yes
+  notify: "Restart Telegraf"

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

@@ -12,8 +12,6 @@
     interval = "{{ telegraf_agent_interval }}s"
     debug = {{ telegraf_agent_debug | lower }}
     hostname = "{{ ansible_fqdn }}"
-    utc = {{ telegraf_agent_utc | lower }}
-    precision = "{{ telegraf_agent_precision }}"
 
 # Configuration for influxdb server to send metrics to
 [outputs]
@@ -62,45 +60,13 @@
     {{ items }}
 {% endfor %}
 {% endif %}
-
-{% endfor %}
-{% endif %}
-
-{% if telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable %}
-{% for item in telegraf_plugins_extra %}
-[{{ item.plugin }}]
-{% if item.interval is defined %}
-    interval = "{{ item.interval }}s"
-{% endif %}
-{% 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 %}
-[{{ item.plugin }}.tagpass]
-{% for items in item.tagpass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tagdrop is defined and item.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
-{% for items in item.tagdrop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
+{% if item.specifications is defined and item.specifications is iterable %}
+[[{{item.plugin}}.specifications]]
+{% for items in item.specifications %}
     {{ items }}
 {% endfor %}
 {% endif %}
 
+
 {% endfor %}
-{% endif %}
+{% endif %}

templates/telegraf-extra-plugin.conf.j2

@@ -0,0 +1,44 @@
+
+{% if telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable %}
+{% for item in telegraf_plugins_extra %}
+[[inputs.{{ item.plugin }}]]
+{% if item.interval is defined %}
+    interval = "{{ item.interval }}s"
+{% endif %}
+{% 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 %}
+[{{ item.plugin }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[{{ item.plugin }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.pass is defined and item.pass is iterable %}
+[{{ item.plugin }}.pass]
+{% for items in item.pass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.drop is defined and item.drop is iterable %}
+[{{ item.plugin }}.drop]
+{% for items in item.drop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.specifications is defined and item.specifications is iterable %}
+[[{{item.plugin}}.specifications]]
+{% for items in item.specifications %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endif %}

templates/telegraf.conf.j2

@@ -0,0 +1,78 @@
+# Telegraf configuration
+
+[tags]
+{% if telegraf_agent_tags is defined and telegraf_agent_tags is iterable %}
+{% for item in telegraf_agent_tags %}
+    {{ item.tag_name }} = "{{ item.tag_value }}"
+{% endfor %}
+{% endif %}
+
+# Configuration for telegraf agent
+[agent]
+    interval = "{{ telegraf_agent_interval }}s"
+    debug = {{ telegraf_agent_debug | lower }}
+    hostname = "{{ ansible_fqdn }}"
+    round_interval = {{ telegraf_agent_round_interval | lower }}
+    flush_interval = "{{ telegraf_agent_flush_interval }}s"
+    flush_jitter = "{{ telegraf_agent_flush_jitter }}s"
+
+###############################################################################
+#                                  OUTPUTS                                    #
+###############################################################################
+
+{% if telegraf_agent_output is defined and telegraf_agent_output is iterable %}
+{% for item in telegraf_agent_output %}
+[[outputs.{{ item.type }}]]
+{% for items in item.config %}
+    {{ items }}
+{% endfor %}
+{% endfor %}
+{% endif %}
+
+###############################################################################
+#                                  INPUTS                                     #
+###############################################################################
+
+{% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %}
+{% for item in telegraf_plugins_default %}
+[[inputs.{{ item.plugin }}]]
+{% if item.interval is defined %}
+    interval = "{{ item.interval }}s"
+{% endif %}
+{% 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 %}
+[{{ item.plugin }}.tagpass]
+{% for items in item.tagpass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.tagdrop is defined and item.tagdrop is iterable %}
+[{{ item.plugin }}.tagdrop]
+{% for items in item.tagdrop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.pass is defined and item.pass is iterable %}
+[{{ item.plugin }}.pass]
+{% for items in item.pass %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.drop is defined and item.drop is iterable %}
+[{{ item.plugin }}.drop]
+{% for items in item.drop %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% if item.specifications is defined and item.specifications is iterable %}
+[[{{item.plugin}}.specifications]]
+{% for items in item.specifications %}
+    {{ items }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endif %}

test/integration/default.yml

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

test/integration/default/serverspec/localhost/ansible_telegraf_spec.rb

@@ -1,27 +0,0 @@
-require 'serverspec'
-require 'spec_helper'
-
-describe 'Telegraf Packages' do
-    describe package('telegraf') do
-        it { should be_installed }
-    end
-end
-
-
-describe 'Telegraf Services' do
-    describe service('telegraf') do
-        it { should be_enabled }
-    end
-end
-
-describe 'Telegraf Configuration' do
-    describe file('/etc/opt/telegraf/telegraf.conf') do
-        it { should be_file}
-        it { should be_owned_by 'root'}
-        it { should be_grouped_into 'root'}
-
-        it { should contain "[cpu]" }
-        it { should contain "[mem]" }
-        it { should contain "url = \"http://localhost:8086\"" }
-    end
-end

test/integration/default/serverspec/spec_helper.rb

@@ -1,2 +0,0 @@
-require 'serverspec'
-set :backend, :exec

tests/inventory

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

tests/test.yml

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

tests/test_docker.py

@@ -0,0 +1,19 @@
+
+def test_telegraf_running_and_enabled(Service, SystemInfo):
+    telegraf = Service("telegraf")
+    assert telegraf.is_enabled
+    if SystemInfo.distribution == 'centos':
+        assert telegraf.is_running
+
+
+def test_telegraf_dot_conf(File):
+    telegraf = File("/etc/telegraf/telegraf.conf")
+    assert telegraf.user == "root"
+    assert telegraf.group == "root"
+    assert telegraf.mode == 0o644
+    assert telegraf.contains('[[inputs.cpu]]')
+
+
+def test_telegraf_package(Package, SystemInfo):
+    telegraf = Package('telegraf')
+    assert telegraf.is_installed

vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for .