mysql-statsd 4.0 → 4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0aee233c5b0179676b4567014475779ab2fb544
-  data.tar.gz: ea901f14ddbea761ca8976bc1f9b2ffc90810334
+  metadata.gz: 69e5a9b210509c0c97ea0936f69dd03254a98969
+  data.tar.gz: 978c04604ac3d370393e6e3927c7a21e0b35361d
 SHA512:
-  metadata.gz: 564e60ee1ea70ef7935fea84a833b30812e000db8e6642e1a41a2c674eb753c3c2e772d5c26156178da2805e4acb1585893e9c92c0940d3f25fd22ae46349d90
-  data.tar.gz: df2059889cf0a611801bacbcae932483765507b079b5f61f98f5c33bd5fd06b74396904942ea4d0055bf7b12c8b2848ba9c9902b7d3c77b8fea5b04a924c9f78
+  metadata.gz: 7a03863d9973e918f4ba057959056860d15145155a950db83388b9d61adf81ae72ed73ecb55605cd270ccf764630fda7753476e88b455c3fb9933106a093f167
+  data.tar.gz: 1270c45a07b93787b10059c7f17593863327898caebbabe08328b582f8c0612d94abb3d7a63409b7d3bb3fa77999f648fbf51a4fadea3983e18b1bfab43c9da5

data/README.md

@@ -4,6 +4,18 @@ Sends data to StatsD from this queries:
 
     * SHOW GLOBAL STATUS
     * SHOW PROCESSLIST
+    * Custom
+
+## Custom Queries
+
+Define them in the config file under mysql.queries . For example:
+
+    mysql:
+      ...
+      database: app_production
+      queries:
+        - SELECT count(1) as 'users.count' from users
+        - SELECT count(1) as 'premium_users.count' from users where premium = 1
 
 ## Installation
 

data/lib/mysql-statsd.rb

@@ -39,7 +39,7 @@ module Mysql
       end
 
       def instrument_queries
-        config['mysql']['queries'].map { |query| mysql.query(query).first }.compact.each do |entry|
+        (config['mysql']['queries'] || []).map { |query| mysql.query(query).first }.compact.each do |entry|
           statsd.gauge *entry.to_a.flatten
         end
       end

data/lib/mysql-statsd/version.rb

@@ -1,5 +1,5 @@
 module Mysql
   module Statsd
-    VERSION = "4.0"
+    VERSION = "4.1"
   end
 end

data/spec/config_without_queries.yml

@@ -0,0 +1,7 @@
+mysql:
+  host: 'mysqlhost'
+  username: 'user'
+
+statsd:
+  host: 'statsdhost'
+  namespace: 'ns'

data/spec/runner_spec.rb

@@ -1,7 +1,8 @@
 require 'mysql-statsd'
 
 describe Mysql::Statsd::Runner do
-  subject { Mysql::Statsd::Runner.new "spec/config.yml" }
+  let(:config_path) { "spec/config.yml" }
+  subject { Mysql::Statsd::Runner.new config_path }
 
   before :each do
     Mysql2::Client.any_instance.stub :connect
@@ -46,5 +47,13 @@ describe Mysql::Statsd::Runner do
       subject.statsd.should_receive(:gauge).with('users.count', 15)
       subject.run!
     end
+
+    context "with a config file without queries" do
+      let(:config_path) { "spec/config_without_queries.yml" }
+
+      it "should not break" do
+        lambda { subject.run! }.should_not raise_exception
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql-statsd
 version: !ruby/object:Gem::Version
-  version: '4.0'
+  version: '4.1'
 platform: ruby
 authors:
 - Diego Carrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,6 +71,7 @@ files:
 - lib/mysql-statsd/version.rb
 - mysql-statsd.gemspec
 - spec/config.yml
+- spec/config_without_queries.yml
 - spec/runner_spec.rb
 homepage: ''
 licenses: []
@@ -97,4 +98,5 @@ specification_version: 4
 summary: Picks data from MySQL and sends it to StatsD
 test_files:
 - spec/config.yml
+- spec/config_without_queries.yml
 - spec/runner_spec.rb