Update to trbs/bucky for upstream source

.travis.yml

@@ -22,3 +22,4 @@ gemfile: .gemfile
 notifications:
   email:
     - [email protected]
+    - [email protected]

CHANGELOG

@@ -1,3 +1,7 @@
+2 Feb 2014 - Realign changes for bucky2 features to follow new upstream bucky project
+
+6 Jan 2014 - Manual fork to support bucky2 (mrsecure)
+
 0.0.2 ( Feb 10 2013 )
   Minor fixes and supply of RedHat and Debian based init scripts.
   Minor adjustments to readme file

Modulefile

@@ -1,10 +1,10 @@
 name    'ispavailability-bucky'
-version '0.0.2'
+version '0.4.0'
 source 'https://github.com/electrical/puppet-bucky'
 author 'ispavailability'
 license 'Apache License, Version 2.0'
 summary 'Module for managing and configuring bucky'
 description 'Module for managing and configuring bucky'
 project_page 'https://github.com/electrical/puppet-bucky'
 dependency 'puppetlabs/stdlib', '>= 3.0.0'
-dependency 'footballradar/python', '0.x'
+

README.md

@@ -2,9 +2,8 @@
 
 A puppet module for managing and configuring bucky
 
-https://github.com/cloudant/bucky
+https://github.com/trbs/bucky
 
-[![Build Status](https://travis-ci.org/electrical/puppet-bucky.png?branch=master)](https://travis-ci.org/electrical/puppet-bucky)
 
 ## Usage
 

manifests/config.pp

@@ -25,10 +25,11 @@
 class bucky::config {
 
   file { '/etc/bucky':
-    ensure => directory,
-    mode   => '0644',
-    owner  => 'root',
-    group  => 'root'
+    ensure  => directory,
+    mode    => '0644',
+    owner   => 'root',
+    group   => 'root',
+    require => Package["${bucky::params::package}"],
   }
 
   file { 'bucky_config':

manifests/files.pp

@@ -28,7 +28,8 @@
     mode    => '0755',
     owner   => 'root',
     group   => 'root',
-    source  => "puppet:///modules/${module_name}/etc/init.d/${bucky::params::initscript}",
+    content => template("${module_name}/etc/init.d/${bucky::params::initscript}.erb"),
+    require => Package["${bucky::params::package}"],
   }
 
 }

manifests/init.pp

@@ -80,10 +80,16 @@
   $autoupgrade                 = $bucky::params::autoupgrade,
   $status                      = $bucky::params::status,
   $version                     = false,
+  $run_as_user                 = $bucky::params::run_as_user,
   $statsd_enabled              = $bucky::params::statsd_enabled,
   $statsd_ip                   = $bucky::params::statsd_ip,
   $statsd_port                 = $bucky::params::statsd_port,
   $statsd_flush_time           = $bucky::params::statsd_flush_time,
+  $statsd_legacy_namespace     = $bucky::params::statsd_legacy_namespace,
+  $statsd_global_prefix        = $bucky::params::statsd_global_prefix,
+  $statsd_prefix_counter       = $bucky::params::statsd_prefix_counter,
+  $statsd_prefix_timer         = $bucky::params::statsd_prefix_timer,
+  $statsd_prefix_gauge         = $bucky::params::statsd_prefix_gauge,
   $metricsd_enabled            = $bucky::params::metricsd_enabled,
   $metricsd_ip                 = $bucky::params::metricsd_ip,
   $metricsd_port               = $bucky::params::metricsd_port,
@@ -164,6 +170,7 @@
     # we need the software and a working configuration before running a service
     Class['bucky::package'] -> Class['bucky::service']
     Class['bucky::files']   -> Class['bucky::service']
+    Class['bucky::config']  -> Class['bucky::service']
 
   } else {
 

manifests/package.pp

@@ -26,8 +26,6 @@
 
   #### Package management
 
-  include python
-
   # set params: in operation
   if $bucky::ensure == 'present' {
 
@@ -45,17 +43,22 @@
       $package_ensure = $bucky::version
 
     }
-
   # set params: removal
   } else {
     $package_ensure = 'purged'
   }
 
   # action
-  package { $bucky::params::package:
+  package { 'setproctitle':
+    ensure   => $package_ensure,
+    provider => 'pip',
+    require  => Package["${bucky::params::requiredpkgs}"]
+  }
+
+  package { $bucky::params::package :
     ensure   => $package_ensure,
     provider => 'pip',
-    require  => Class['python'],
+    require  => Package['setproctitle'],
   }
 
 }

manifests/params.pp

@@ -40,6 +40,8 @@
   # service status
   $status = 'enabled'
 
+  # user to run the service
+  $run_as_user = 'nobody'
 
   #### Config file defaults
 
@@ -63,6 +65,13 @@
   $statsd_port      = '8125'
   $statsd_flushtime = '10.0'
 
+  # namespace settings
+  $statsd_legacy_namespace = 'True'
+  $statsd_global_prefix    = 'stats'
+  $statsd_prefix_counter   = 'counters'
+  $statsd_prefix_timer     = 'timers'
+  $statsd_prefix_gauge     = 'gauges'
+
   # graphite
   $graphite_host               = '127.0.0.1'
   $graphite_port               = '2003'
@@ -85,10 +94,12 @@
     'CentOS', 'Fedora', 'Scientific', 'RedHat', 'Amazon': {
       # main application
       $package = [ 'bucky' ]
+      $requiredpkgs = [ 'python-devel' ]
     }
     'Debian', 'Ubuntu': {
       # main application
       $package = [ 'bucky' ]
+      $requiredpkgs = [ 'python-dev' ]
     }
     default: {
       fail("\"${module_name}\" provides no package default value

spec/classes/bucky_init_spec.rb

@@ -16,13 +16,13 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
-
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.Debian' } ) }
+    it { should contain_file('bucky_init').with_content(/start-stop-daemon/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -43,13 +43,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.Debian' } ) }
+    it { should contain_file('bucky_init').with_content(/start-stop-daemon/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -71,13 +72,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.RedHat' } ) }
+    it { should contain_file('bucky_init').with_content(/runuser -s/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -99,13 +101,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.RedHat' } ) }
+    it { should contain_file('bucky_init').with_content(/runuser -s/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -127,13 +130,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.RedHat' } ) }
+    it { should contain_file('bucky_init').with_content(/runuser -s/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -155,13 +159,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.RedHat' } ) }
+    it { should contain_file('bucky_init').with_content(/runuser -s/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }
@@ -183,13 +188,14 @@
     it { should contain_class('bucky::service') }
 
     # package.pp
-    it { should contain_package('bucky').with( { 'provider' => 'pip' } ) }
+    it { should contain_package('bucky').with_provider('pip') }
+    it { should contain_package('setproctitle').with_provider('pip') }
 
     # service.pp
     it { should contain_service('bucky') }
 
     # files.pp
-    it { should contain_file('bucky_init').with( { 'source' => 'puppet:///modules/bucky/etc/init.d/bucky.RedHat' } ) }
+    it { should contain_file('bucky_init').with_content(/runuser -s/) }
 
     # config.pp
     it { should contain_file('/etc/bucky') }

templates/etc/bucky/bucky.conf.erb

@@ -62,6 +62,19 @@ statsd_flush_time = <%= scope.lookupvar('bucky::statsd_flushtime') %>
 statsd_enabled = False
 <%- end -%>
 
+# If the legacy namespace is enabled, the statsd backend uses the
+# default prefixes except for counters, which are stored directly
+# in stats.NAME for the rate and stats_counts.NAME for the
+# absolute count.  If legacy names are disabled, the prefixes are
+# configurable, and counters are stored under
+# stats.counters.{rate,count} by default.  Any prefix can be set
+# to None to skip it.
+statsd_legacy_namespace = <%= scope.lookupvar('bucky::statsd_legacy_namespace') %>
+statsd_global_prefix = "<%= scope.lookupvar('bucky::statsd_global_prefix') %>"
+statsd_prefix_counter = "<%= scope.lookupvar('bucky::statsd_prefix_counter') %>"
+statsd_prefix_timer = "<%= scope.lookupvar('bucky::statsd_prefix_timer') %>"
+statsd_prefix_gauge = "<%= scope.lookupvar('bucky::statsd_prefix_gauge') %>"
+
 # Basic Graphite configuration
 graphite_ip = "<%= scope.lookupvar('bucky::graphite_host') %>"
 graphite_port = <%= scope.lookupvar('bucky::graphite_port') %>
@@ -80,7 +93,7 @@ graphite_reconnect_delay = <%= scope.lookupvar('bucky::graphite_reconnect_delay'
 graphite_pickle_enabled = <%= scope.lookupvar('bucky::graphite_pickle_enable') %>
 graphite_pickle_buffer_size = <%= scope.lookupvar('bucky::graphite_pickle_buffer_size') %>
 
-# Bucky provides these settings to allow the system wide
+# bucky provides these settings to allow the system wide
 # configuration of how metric names are processed before
 # sending to Graphite.
 #
@@ -97,7 +110,7 @@ name_replace_char = '<%= scope.lookupvar('bucky::name_replace_char') %>'
 # a.a.b.c.c.b would be rewritten as a.b.c.b
 name_strip_duplicates = <%= scope.lookupvar('bucky::name_strip_duplicates') %>
 
-# Bucky reverses hostname components to improve the locality
+# bucky reverses hostname components to improve the locality
 # of metric values in Graphite. For instance, "node.company.tld"
 # would be rewritten as "tld.company.node". This setting allows
 # for the specification of hostname components that should

files/etc/init.d/bucky.Debian → templates/etc/init.d/bucky.Debian.erb

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/init.d/bucky
-# init script for Bucky.
+# init script for bucky.
 #
 # Modified for LSB compliance by Glenn Aaldering <[email protected]>.
 
@@ -13,12 +13,12 @@
 # Should-Stop:       
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Bucky
-# Description:       Bucky
+# Short-Description: bucky
+# Description:       bucky
 ### END INIT INFO
 
 NAME=bucky
-DESC="Bucky"
+DESC="bucky"
 DEFAULT=/etc/default/$NAME
 
 if [ `id -u` -ne 0 ]; then
@@ -50,7 +50,7 @@ bucky_start() {
     log_action_end_msg 3 "Already running"
     exit 0
   fi
-  start-stop-daemon --exec $DAEMON -b -S -m -p $PIDFILE -- $CONFIG
+  start-stop-daemon --exec $DAEMON -b -S -m -p $PIDFILE -c <%= scope.lookupvar('bucky::run_as_user') %> -- $CONFIG
   log_end_msg $?
 }
 

files/etc/init.d/bucky.RedHat → templates/etc/init.d/bucky.RedHat.erb

@@ -14,7 +14,8 @@ lockfile='/var/lock/subsys/bucky'
 pidfile='/var/run/bucky.pid'
 bucky='/usr/bin/bucky'
 config='/etc/bucky/bucky.conf'
-logfile='/var/log/bucky.log'
+
+run_user='<%= scope.lookupvar('bucky::run_as_user') %>'
 
 RETVAL=0
 
@@ -29,7 +30,8 @@ fi
 
 start() {
     echo -n $"Starting bucky daemon: "
-    $bucky $config >> $logfile 2>&1 &
+    corelimit="ulimit -S -c 0"
+    runuser -s /bin/bash $run_user -c "$corelimit > /dev/null 2>&1 ; $bucky $config &"
     RETVAL=$?
 
     local PID=`pgrep -f "${bucky} ${config}"`