newrelic_postgres_plugin 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49e0f69488f29a73417c293ccc51c0157f1c91be
-  data.tar.gz: eac1744679e6e7a36a1a87461d407cf66fcfaab5
+  metadata.gz: e6beba3e07419260f3b4c6c1f6b57330fdca6458
+  data.tar.gz: 8a7cf2a2f411e3b3033a0ec0f41acc1c5b4d7731
 SHA512:
-  metadata.gz: 7a8dab6c229fd5806e70d2114e9ffe697339daf62575d4c49a3ff76c5dad23278d6f4221ffd2fbf2de3ccd47e2ffb99feee30f4697c2c4644d0eb4062cd78695
-  data.tar.gz: e84d2b09ea7a8e81dbe04f5a69dd9a9245a6a4677f2e6ad212110137169051d502f3eed6084a2b0f47fb0c8438cecd5687b619ea0d2a6d082c20e596a0de0692
+  metadata.gz: c21b206678c70f7ec299539e3aa40d92a56615eaf40ca4f1604960a39ca66242ca643c51d77e66d12d770855495e601b1d3a22bfc6c6cc3cc492929539dd53bb
+  data.tar.gz: 4b92762c91c318069f6c4c510667db3200daeff9446c9bd2771d4ba5fdd01aefcee775e51897237885d8122161477a8141fb4a440a571e4d7c3a469e94206016

data/Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: git@github.com:newrelic-platform/newrelic_plugin.git
-  revision: 913177005ae53883c73395833f3be0e9c6644eae
-  branch: release
-  specs:
-    newrelic_plugin (1.0.1)
-      faraday (>= 0.8.1)
-      json
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -14,11 +5,14 @@ GEM
       multipart-post (~> 1.1)
     json (1.8.0)
     multipart-post (1.2.0)
+    newrelic_plugin (1.0.2)
+      faraday (>= 0.8.1)
+      json
     pg (0.15.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  newrelic_plugin!
+  newrelic_plugin (~> 1.0.2)
   pg

data/lib/newrelic_postgres_plugin.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'newrelic_postgres_plugin/agent'
 
 module NewRelic::PostgresPlugin
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/newrelic_postgres_plugin/agent.rb

@@ -53,7 +53,7 @@ module NewRelic::PostgresPlugin
     # Returns true if we're talking to Postgres version >= 9.2
     #
     def nine_two?
-      @connection.send(:postgresql_version) >= 90200
+      @connection.server_version >= 90200
     end
 
 
@@ -83,8 +83,8 @@ module NewRelic::PostgresPlugin
 
     def report_backend_metrics
       @connection.exec(backend_query) do |result|
-        report_metric "Backends/Active", 'queries', result[0]['backends_active']
-        report_metric "Backends/Idle", 'queries', result[0]['backends_idle']
+        report_metric "Backends/Active", 'connections', result[0]['backends_active']
+        report_metric "Backends/Idle",   'connections', result[0]['backends_idle']
       end
     end
 
@@ -116,21 +116,20 @@ module NewRelic::PostgresPlugin
 
     def report_index_metrics
       @connection.exec(index_count_query) do |result|
-        report_metric "Indexes/Total",            'indexes', result[0]['indexes'].to_i
-        report_metric "Indexes/Disk Utilization", 'bytes',   result[0]['size_indexes'].to_f
+        report_metric "Indexes/Number of Indexes", 'indexes', result[0]['indexes'].to_i
       end
       @connection.exec(index_hit_rate_query) do |result|
-        report_metric "Indexes/Hit Rate",       '%', result[0]['ratio'].to_f
-        report_metric "Indexes/Cache Hit Rate", '%', result[1]['ratio'].to_f
+        report_metric "Indexes/Index Hit Rate", '%', result[0]['ratio'].to_f * 100.0
+        report_metric "Indexes/Cache Hit Rate", '%', result[1]['ratio'].to_f * 100.0
       end
       @connection.exec(index_size_query) do |result|
-        report_metric "Indexes/Size", 'bytes', result[0]['size'].to_f
+        report_metric "Indexes/Size on Disk", 'bytes', result[0]['size'].to_f
       end
     end
 
     def backend_query
       %Q(
-        SELECT count(*) - ( SELECT count(*) FROM pg_stat_activity WHERE
+        SELECT ( SELECT count(*) FROM pg_stat_activity WHERE
           #{
             if nine_two?
               "state <> 'idle'"
@@ -141,9 +140,9 @@ module NewRelic::PostgresPlugin
         ) AS backends_active, ( SELECT count(*) FROM pg_stat_activity WHERE
           #{
             if nine_two?
-              "AND state = 'idle'"
+              "state = 'idle'"
             else
-              "AND current_query = '<IDLE>'"
+              "current_query = '<IDLE>'"
             end
           }
         ) AS backends_idle FROM pg_stat_activity;
@@ -160,6 +159,7 @@ module NewRelic::PostgresPlugin
 
     def index_count_query
       "SELECT count(1) as indexes FROM pg_class WHERE relkind = 'i';"
+    end
 
     def index_hit_rate_query
       %Q(
@@ -176,11 +176,7 @@ module NewRelic::PostgresPlugin
     end
 
     def index_size_query
-      %Q(
-        SELECT pg_size_pretty(sum(relpages*8192)) AS size
-          FROM pg_class
-          WHERE reltype = 0;
-      )
+      "SELECT sum(relpages*8192) AS size FROM pg_class WHERE reltype = 0;"
     end
 
   end

data/newrelic_postgres_plugin.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'newrelic_postgres_plugin'
-  s.version           = '0.1.1'
+  s.version           = '0.1.2'
   s.date              = '2013-06-20'
   s.rubyforge_project = 'newrelic_postgres_plugin'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_postgres_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Matt Hodgson