Permalink
Browse files

Merge branch 'release/1.1.7'

  • Loading branch information...
2 parents b73a794 + ea27a86 commit c10036c100b545fe102a59c6739146524b26d553 @hectcastro committed May 8, 2014
Showing with 24 additions and 13 deletions.
  1. +13 −11 .kitchen.yml
  2. +4 −0 CHANGELOG.md
  3. +2 −0 README.md
  4. +1 −0 attributes/default.rb
  5. +1 −1 metadata.rb
  6. +2 −1 recipes/default.rb
  7. +1 −0 templates/default/config.js.erb
View
@@ -1,19 +1,21 @@
---
-driver_plugin: vagrant
+driver:
+ name: vagrant
+ require_chef_omnibus: true
+ customize:
+ memory: 512
+
+provisioner:
+ name: chef_zero
platforms:
- name: ubuntu-12.04
- driver_config:
- box: opscode-ubuntu-12.04
- box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
- customize:
- memory: 512
+ run_list:
+ - recipe[apt]
- name: centos-6.5
- driver_config:
- box: opscode-centos-6.5
- box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
- customize:
- memory: 512
+ run_list:
+ - recipe[yum]
+
suites:
- name: default
run_list:
View
@@ -1,3 +1,7 @@
+## v1.1.7
+
+* Add attribute for `globalSuffix` configuration settings.
+
## v1.1.6
* Add attribute for `dumpMessages` configuration setting.
View
@@ -52,6 +52,8 @@ Installs and configures StatsD.
namespace (default: `true`).
* `node["statsd"]["graphite"]["global_prefix"]` - Global prefix to use for
sending stats to Graphite (default: `stats`).
+* `node["statsd"]["graphite"]["global_suffix"]` - Global suffix to use for
+ sending stats to Graphite (default: ``).
* `node["statsd"]["graphite"]["prefix_counter"]` - Graphite prefix for counter
metrics (default: `counters`).
* `node["statsd"]["graphite"]["prefix_timer"]` - Graphite prefix for timer
View
@@ -21,6 +21,7 @@
# Graphite storage config
default["statsd"]["graphite"]["legacy_namespace"] = true
default["statsd"]["graphite"]["global_prefix"] = "stats"
+default["statsd"]["graphite"]["global_suffix"] = ""
default["statsd"]["graphite"]["prefix_counter"] = "counters"
default["statsd"]["graphite"]["prefix_timer"] = "timers"
default["statsd"]["graphite"]["prefix_gauge"] = "gauges"
View
@@ -2,7 +2,7 @@
maintainer_email "hectcastro@gmail.com"
license "Apache 2.0"
description "Installs and configures StatsD."
-version "1.1.6"
+version "1.1.7"
recipe "statsd", "Installs and configures StatsD"
name "statsd"
View
@@ -40,6 +40,7 @@
:delete_counters => node["statsd"]["delete_counters"],
:legacy_namespace => node["statsd"]["graphite"]["legacy_namespace"],
:global_prefix => node["statsd"]["graphite"]["global_prefix"],
+ :global_suffix => node["statsd"]["graphite"]["global_suffix"],
:prefix_counter => node["statsd"]["graphite"]["prefix_counter"],
:prefix_timer => node["statsd"]["graphite"]["prefix_timer"],
:prefix_gauge => node["statsd"]["graphite"]["prefix_gauge"],
@@ -61,6 +62,6 @@
:user => node['statsd']['username'],
:statsd_dir => node['statsd']['dir'],
:conf_dir => node['statsd']['conf_dir'],
- :nodejs_dir => node['nodejs']['dir']
+ :nodejs_dir => node['nodejs']['dir']
})
end
@@ -13,6 +13,7 @@
"graphite": {
"legacyNamespace": <%= @legacy_namespace %>,
"globalPrefix": "<%= @global_prefix %>",
+ "globalSuffix": "<%= @global_suffix %>",
"prefixCounter": "<%= @prefix_counter %>",
"prefixTimer": "<%= @prefix_timer %>",
"prefixGauge": "<%= @prefix_gauge %>",

0 comments on commit c10036c

Please sign in to comment.