Merge pull request #15 from idealista/features/several_improvements

Features/several improvements

Author: José Noguera

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
 ## [Unreleased](https://github.com/idealista/fluentd-role/tree/develop)
+## Added
+- *Ability of providing service template via playbook* @jnogol
+## Changed
+- *Update default version to 1.2.5* @jnogol
+- *Use SIGTERM to stop Fluentd service* @jnogol
 
 ## [1.1.2](https://github.com/idealista/fluentd-role/tree/1.1.2)
 ## [Full Changelog](https://github.com/idealista/fluentd-role/compare/1.1.1...1.1.2)

defaults/main.yml

@@ -1,13 +1,19 @@
-#### installation variables ####
+# Installation variables
 fluentd_user: fluentd
 fluentd_group: fluentd
+
+fluentd_version: "1.2.5"
+
 fluentd_conf_path: "/etc/fluent"
 fluentd_log_path: "/var/log/fluent"
 fluentd_log_file: "{{ fluentd_log_path }}/fluent.log"
-fluentd_version: "0.12.40"
+
 fluentd_plugins: []
-# current state: started, stopped, restarted, reloaded
-fluentd_service_state: started
+
+# Service variables
+fluentd_service_state: started # current state: started, stopped, restarted, reloaded
 fluentd_service_enabled: yes # yes, no
 
+# Templates path
 fluentd_playbook_templates_path: "{{ playbook_dir }}/templates/fluentd"
+fluentd_service_template_path: fluentd/fluentd.service.j2

tasks/config.yml

@@ -27,7 +27,7 @@
 
 - name: FLUENTD | Copy fluentd service config
   template:
-    src: fluentd/fluentd.service.j2
+    src: "{{ fluentd_service_template_path }}"
     dest: /lib/systemd/system/fluentd.service
     owner: "{{ fluentd_user }}"
     group: "{{ fluentd_group }}"

tasks/install.yml

@@ -10,26 +10,25 @@
     name: "{{ fluentd_user }}"
     group: "{{ fluentd_group }}"
 
-
-- name: FLUENTD | install required libs
+- name: FLUENTD | Install required libs
   apt:
     name: "{{ item }}"
     update_cache: yes
   with_items: "{{ fluentd_required_libs }}"
 
-- name: FLUENTD | install fluentd gem
+- name: FLUENTD | Install fluentd gem
   gem:
     name: fluentd
     state: present
     version: "{{ fluentd_version }}"
     user_install: no
-  changed_when: false
+  notify: restart fluentd
 
-- name: FLUENTD | install fluentd plugin gems
+- name: FLUENTD | Install fluentd plugin gems
   gem:
     name: "{{ item }}"
     state: present
     user_install: no
   with_items:
     - "{{ fluentd_plugins }}"
-  changed_when: false
+  notify: restart fluentd

templates/fluentd/fluentd.service.j2

@@ -11,7 +11,7 @@ User={{ fluentd_user }}
 Group={{ fluentd_group }}
 
 ExecStart=/usr/local/bin/fluentd -d /run/fluentd/fluentd.pid -c {{ fluentd_conf_path }}/fluent.conf -o {{ fluentd_log_file }}
-ExecStop=/usr/bin/kill -9 $MAINPID
+ExecStop=/usr/bin/kill $MAINPID
 Restart=always
 
 [Install]

tests/goss/specs/fluentd.yml

@@ -64,7 +64,7 @@ command:
   fluentd --version:
     exit-status: 0
     stdout:
-    - fluentd 0.12.40
+    - fluentd 1.2.5
     stderr: []
     timeout: 10000