Changes for version 0.0.2

Author: Branden Timm

CHANGELOG.rst

@@ -1,5 +1,10 @@
 logstash-forwarder formula
 ================
 
+0.0.2 (2014-09-02)
+ - Added managed init files for Debian and RedHat
+ - Support turning off logstash-forwarder log messages using
+   log_to_syslog pillar variable
+
 0.0.1 (2014-08-19)
  - Initial commit

README.rst

@@ -21,12 +21,15 @@ Available states
 
 Install the ``logstash-forwarder`` package, set up configuration file,  
 optionally set up the lumberjack certificate, and enable the service. This 
-formula currently supports Debian and RedHat based distributions, however the 
-service init file for RedHat distributions is currently broken, see 
-<https://github.com/elasticsearch/logstash-forwarder/pull/196>.  Due to this,
-the formula provides it's own init script until such a time when the above 
-issue is resolved.
-
+formula currently supports Debian and RedHat based distributions.  Although the
+packages for Debian and RedHat provide service init files, we manage it within
+this formula for two reasons:
+
+* The RedHat service init file is currently broken, see <https://github.com/elasticsearch/logstash-forwarder/pull/196>
+* By default, init files for both distro families enables 'log-to-syslog' when invoking 
+  logstash-forwarder, which can pollute your syslog with unnecessary noise.  By default
+  this feature will remain on, but it can be turned off by setting logstash_forwarder:log_to_syslog
+  to false in your pillar data.
 
 Usage
 =====

VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

logstash_forwarder/files/logstash-forwarder.deb.init

@@ -1,18 +1,13 @@
 {%- from 'logstash_forwarder/map.jinja' import logstash_forwarder with context %}
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          skeleton
+# Provides:          logstash-forwarder
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
 ### END INIT INFO
 
-# Author: Jordan Sissel <jordan.sissel@dreamhost.com>
-
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="log shipper"

logstash_forwarder/init.sls

@@ -1,8 +1,7 @@
-{%- from 'logstash_forwarder/map.jinja' import logstash_forwarder with context %}
-
 # Do nothing unless the target is RedHat or Debian based
-
 {%- if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Debian' %}
+{%- from 'logstash_forwarder/map.jinja' import logstash_forwarder with context %}
+
 include:
   - .repo
 

pillar.example

@@ -18,6 +18,7 @@ logstash_forwarder:
                 fields:
                     type: nginx-error
         cert_path: /etc/ssl/certs/logstash-forwarder.crt
+        log_to_syslog: true
         cert_contents: |
             -----BEGIN CERTIFICATE-----
             MIIDBzCCAe+gAwIBAgIJAImyMODCMdTFMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV