bunch of fixes

README.md

@@ -8,24 +8,33 @@ This module is puppet 3 tested
 
 ## Usage
 
-Installation, make sure service is running and will be started at boot time:
+### Set up a parent instance.  This sets up the "framework" config to add individual file/file-group watchers that can be tagged with individual fields.
 
-     class { 'lumberjack': 
-       host  => 'logstashhost',
-       port  => '1234',
-       files => ['/var/log/messages', '/var/log/secure'],
-       ssl_ca_path => "puppet:///path/to/ca.crt",
-     }
+    lumberjack::instance{
+      'core':
+        hosts       => ['logstash.blah.com'],
+        port        => '5005',
+        ssl_ca_file => 'puppet:///modules/conf/etc/ssl/certs/ca.crt',
+        provider    => 'daemontools';
+    }
 
-Removal/decommissioning:
+### Add watchers that plug in to the intance you set up.
+    lumberjack::watcher {
+      'syslog':
+        part_of => 'core',
+        files => ["/var/log/secure", "/var/log/messages", "/var/log/*.log", ];
 
-     class { 'lumberjack':
-       ensure => 'absent',
-     }
+      'statsd':
+        part_of => 'core',
+        files => ["/data/log/statsd/statsd.log", ];
 
-Install everything but disable service(s) afterwards:
+      'diamond':
+        part_of => 'core',
+        files => ["/data/log/diamond/diamond.log", ];
+    }
+
+### Removal/decommissioning:
 
      class { 'lumberjack':
-       status => 'disabled',
+       ensure => 'absent',
      }
-

manifests/init.pp

@@ -52,8 +52,8 @@
 #   String to set the specific version you want to install.
 #   Defaults to <tt>false</tt>.
 #
-# [*host*]
-#   Hostname to connect to
+# [*hosts*]
+#   Array of Hostnames to connect to
 #
 # [*port*]
 #   Port to connect to
@@ -97,6 +97,7 @@
   $autoupgrade       = $lumberjack::params::autoupgrade,
   $status            = $lumberjack::params::status,
   $restart_on_change = $lumberjack::params::restart_on_change,
+  $provider          = $lumberjack::params::provider,
   $version           = false,
 ) inherits lumberjack::params {
 

manifests/instance.pp

@@ -4,36 +4,22 @@
 #
 # === Parameters
 #
-# [*host*]
-#   Host name or IP address of the Logstash instance to connect to
-#   Value type is string
-#   Default value: undef
-#   This variable is optional
+# [*hosts*]
+#   Host names or IP addresses of the Logstash instances to connect to
+#   Value type is array
 #
 # [*port*]
 #   Port number of the Logstash instance to connect to
 #   Value type is number
 #   Default value: undef
 #   This variable is optional
 #
-# [*files*]
-#   Array of files you wish to process
-#   Value type is array
-#   Default value: undef
-#   This variable is optional
-#
 # [*ssl_ca_file*]
 #   File to use for the SSL CA
 #   Value type is string
 #   This variable is mandatory
 #
-# [*fields*]
-#   Extra fields to send
-#   Value type is hash
-#   Default value: false
-#   This variable is optional
-#
-# [*run_as_service*]
+# [*provider*]
 #   Set this to true if you want to run this as a service.
 #   Set to false if you only want to manage the ssl_ca_file
 #   Value type is boolean
@@ -43,124 +29,63 @@
 # === Authors
 #
 # * Richard Pijnenburg <mailto:richard@ispavailability.com>
+# * Modified by Jeff Vier <mailto:jeff@jeffvier.com>
 #
 define lumberjack::instance(
   $ssl_ca_file,
-  $host           = undef,
+  $hosts,
   $port           = undef,
-  $files          = undef,
-  $fields         = false,
-  $run_as_service = true,
-  $ensure         = $logstash::ensure
+  $runtime_opts   = '',
+  $provider       = "daemontools",
 ) {
 
   require lumberjack
 
   File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644'
+    owner => root,
+    group => root,
+    mode  => 0644
   }
 
-  if ($run_as_service == true ) {
-
-    # Input validation
-    validate_string($host)
-
-    if ! is_numeric($port) {
-      fail("\"${port}\" is not a valid port parameter value")
-    }
-
-    validate_array($files)
-    $logfiles = join($files,' ')
-
-    if $fields {
-      validate_hash($fields)
-    }
-
-    # Setup init file if running as a service
-    $notify_lumberjack = $lumberjack::restart_on_change ? {
-      true  => Service["lumberjack-${name}"],
-      false => undef,
+  if ($provider != false ) {
+    lumberjack::service{
+      $name:
+        ssl_ca_file  => $ssl_ca_file,
+        hosts        => $hosts,
+        port         => $port,
+        runtime_opts => $runtime_opts,
+        provider     => $provider;
     }
+  }
 
-    file { "/etc/init.d/lumberjack-${name}":
-      ensure  => $ensure,
-      mode    => '0755',
-      content => template("${module_name}/etc/init.d/lumberjack.erb"),
-      notify  => $notify_lumberjack
-    }
-
-    #### Service management
-
-    # set params: in operation
-    if $lumberjack::ensure == 'present' {
-
-      case $lumberjack::status {
-        # make sure service is currently running, start it on boot
-        'enabled': {
-          $service_ensure = 'running'
-          $service_enable = true
-        }
-        # make sure service is currently stopped, do not start it on boot
-        'disabled': {
-          $service_ensure = 'stopped'
-          $service_enable = false
-        }
-        # make sure service is currently running, do not start it on boot
-        'running': {
-          $service_ensure = 'running'
-          $service_enable = false
-        }
-        # do not start service on boot, do not care whether currently running or not
-        'unmanaged': {
-          $service_ensure = undef
-          $service_enable = false
-        }
-        # unknown status
-        # note: don't forget to update the parameter check in init.pp if you
-        #       add a new or change an existing status.
-        default: {
-          fail("\"${lumberjack::status}\" is an unknown service status value")
-        }
-      }
-
-    # set params: removal
-    } else {
-
-      # make sure the service is stopped and disabled (the removal itself will be
-      # done by package.pp)
-      $service_ensure = 'stopped'
-      $service_enable = false
+  if (!defined(File["/etc/lumberjack"])) {
+    file {
+      "/etc/lumberjack":
+        ensure => directory;
     }
-
-    # action
-    service { "lumberjack-${name}":
-      ensure     => $service_ensure,
-      enable     => $service_enable,
-      name       => $lumberjack::params::service_name,
-      hasstatus  => $lumberjack::params::service_hasstatus,
-      hasrestart => $lumberjack::params::service_hasrestart,
-      pattern    => $lumberjack::params::service_pattern,
+  }
+  if (!defined(File["/etc/lumberjack/${name}"])) {
+    file {
+      "/etc/lumberjack/${name}":
+        ensure => directory;
     }
-
-  } else {
-
-    $notify_lumberjack = undef
-
   }
 
+  file {
+    "/etc/lumberjack/${name}/pieces/header":
+      ensure  => $ensure,
+      content => template("${module_name}/lumberjack.config.json-headerpiece.erb"),
+      notify  => $notify_lumberjack;
 
-  file { "/etc/lumberjack/${name}":
-    ensure => directory,
-  }
+    "/etc/lumberjack/${name}/pieces/footer":
+      ensure  => $ensure,
+      content => template("${module_name}/lumberjack.config.json-footerpiece.erb"),
+      notify  => $notify_lumberjack;
 
-  # Setup certificate files
-  file { "/etc/lumberjack/${name}/ca.crt":
-    ensure  => $ensure,
-    source  => $ssl_ca_file,
-    require => File[ "/etc/lumberjack/${name}" ],
-    notify  => $notify_lumberjack
+    "/etc/lumberjack/${name}/ca.crt":
+      ensure  => $ensure,
+      source  => $ssl_ca_file,
+      notify  => $notify_lumberjack;
   }
 
 }

manifests/package.pp

@@ -24,8 +24,6 @@
 #
 class lumberjack::package {
 
-  #### Package management
-
   # set params: in operation
   if $lumberjack::ensure == 'present' {
 

manifests/params.pp

@@ -28,56 +28,42 @@
 # * Richard Pijnenburg <mailto:richard@ispavailability.com>
 #
 class lumberjack::params {
-
-  #### Default values for the parameters of the main module class, init.pp
-
-  # ensure
   $ensure = 'present'
-
-  # autoupgrade
-  $autoupgrade = false
-
-  # service status
+  $autoupgrade = true
   $status = 'enabled'
-
-  # Restart service on change
-  $restart_on_change = false
-
-  #### Internal module values
+  $restart_on_change = true
+  $provider = 'daemontools'
 
   # packages
   case $::operatingsystem {
     'CentOS', 'Fedora', 'Scientific', 'OracleLinux', 'Amazon', 'RedHat': {
-      # main application
-      $package = [ 'lumberjack' ]
-    }
+      $package = [ 'logstash-forwarder' ]
+      }
     'Debian', 'Ubuntu': {
-      # main application
-      $package = [ 'lumberjack' ]
-    }
+      $package = [ 'logstash-forwarder' ]
+      }
     default: {
       fail("\"${module_name}\" provides no package default value
             for \"${::operatingsystem}\"")
-    }
+      }
   }
 
   # service parameters
   case $::operatingsystem {
     'CentOS', 'Fedora', 'Scientific', 'OracleLinux', 'Amazon', 'RedHat': {
-      $service_name       = 'lumberjack'
+      $service_name       = "lumberjack-${name}"
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
     }
     'Debian', 'Ubuntu': {
-      $service_name       = 'lumberjack'
+      $service_name       = "lumberjack-${name}"
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
     }
     default: {
-      fail("\"${module_name}\" provides no service parameters
-            for \"${::operatingsystem}\"")
+      fail("\"${module_name}\" doesn't know about OS \"${::operatingsystem}\"")
     }
   }