newrelic_postgres_plugin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5dbbac674a6b9755b660189a8bb72673ac49196
-  data.tar.gz: 8e8a5df463aba43e10e2a07161f0243646b7ff27
+  metadata.gz: 49e0f69488f29a73417c293ccc51c0157f1c91be
+  data.tar.gz: eac1744679e6e7a36a1a87461d407cf66fcfaab5
 SHA512:
-  metadata.gz: dfac2bed440d8d21e6f84b40841a32990ff2f612ef887a9934d9b9335eabf2bcb761b795677e945798d0834ba49ac18bf27e0983724c468f91e5697134f849da
-  data.tar.gz: 9cb90edba403d5bffd8f8baf7a3c1afc872fe0d6c54478e112c51e0599bcc48454b3047a7ca4660989e216c898c6b194653c21c04c43205ba08bb5a0f5c2f3b3
+  metadata.gz: 7a8dab6c229fd5806e70d2114e9ffe697339daf62575d4c49a3ff76c5dad23278d6f4221ffd2fbf2de3ccd47e2ffb99feee30f4697c2c4644d0eb4062cd78695
+  data.tar.gz: e84d2b09ea7a8e81dbe04f5a69dd9a9245a6a4677f2e6ad212110137169051d502f3eed6084a2b0f47fb0c8438cecd5687b619ea0d2a6d082c20e596a0de0692

data/lib/newrelic_postgres_plugin/agent.rb

@@ -7,51 +7,6 @@ require 'pg'
 
 module NewRelic::PostgresPlugin
 
-  BACKEND_QUERY = %Q(
-    SELECT count(*) - ( SELECT count(*) FROM pg_stat_activity WHERE
-      #{
-        if nine_two?
-          "state <> 'idle'"
-        else
-          "current_query <> '<IDLE>'"
-        end
-      }
-    ) AS backends_active, ( SELECT count(*) FROM pg_stat_activity WHERE
-      #{
-        if nine_two?
-          "AND state = 'idle'"
-        else
-          "AND current_query = '<IDLE>'"
-        end
-      }
-    ) AS backends_idle FROM pg_stat_activity;
-  )
-  DATABASE_QUERY = %Q(
-    SELECT * FROM pg_stat_database;
-  )
-  BGWRITER_QUERY = %Q(
-    SELECT * FROM pg_stat_bgwriter;
-  )
-  INDEX_COUNT_QUERY = %Q(
-    SELECT count(1) as indexes FROM pg_class WHERE relkind = 'i';
-  )
-  INDEX_HIT_RATE_QUERY = %Q(
-    SELECT
-      'index hit rate' AS name,
-      (sum(idx_blks_hit)) / sum(idx_blks_hit + idx_blks_read) AS ratio
-    FROM pg_statio_user_indexes
-    UNION ALL
-    SELECT
-     'cache hit rate' AS name,
-      sum(heap_blks_hit) / (sum(heap_blks_hit) + sum(heap_blks_read)) AS ratio
-    FROM pg_statio_user_tables;
-  )
-  INDEX_SIZE_QUERY = %Q(
-    SELECT pg_size_pretty(sum(relpages*8192)) AS size
-      FROM pg_class
-      WHERE reltype = 0;
-  )
-
   # Register and run the agent
   def self.run
     # Register this agent.
@@ -63,6 +18,7 @@ module NewRelic::PostgresPlugin
 
 
   class Agent < NewRelic::Plugin::Agent::Base
+
     agent_guid    'com.boundless.postgres'
     agent_version '1.0.0'
     agent_config_options :host, :port, :user, :password, :dbname, :sslmode
@@ -126,14 +82,14 @@ module NewRelic::PostgresPlugin
 
 
     def report_backend_metrics
-      @connection.exec(BACKEND_QUERY) do |result|
+      @connection.exec(backend_query) do |result|
         report_metric "Backends/Active", 'queries', result[0]['backends_active']
         report_metric "Backends/Idle", 'queries', result[0]['backends_idle']
       end
     end
 
     def report_database_metrics
-      @connection.exec(DATABASE_QUERY) do |result|
+      @connection.exec(database_query) do |result|
         result.each do |row|
           database_name = row['datname']
           report_metric         "Database/#{database_name}/Backends",                        '', row['numbackends'].to_i
@@ -152,25 +108,80 @@ module NewRelic::PostgresPlugin
     end
 
     def report_bgwriter_metrics
-      @connection.exec(BGWRITER_QUERY) do |result|
+      @connection.exec(bgwriter_query) do |result|
         report_derived_metric "Background Writer/Checkpoints/Scheduled", 'checkpoints', result[0]['checkpoints_timed'].to_i
         report_derived_metric "Background Writer/Checkpoints/Requested", 'checkpoints', result[0]['checkpoints_requests'].to_i
       end
     end
 
     def report_index_metrics
-      @connection.exec(INDEX_COUNT_QUERY) do |result|
+      @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
       end
-      @connection.exec(INDEX_HIT_RATE_QUERY) do |result|
+      @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
       end
-      @connection.exec(INDEX_SIZE_QUERY) do |result|
+      @connection.exec(index_size_query) do |result|
         report_metric "Indexes/Size", 'bytes', result[0]['size'].to_f
       end
     end
 
+    def backend_query
+      %Q(
+        SELECT count(*) - ( SELECT count(*) FROM pg_stat_activity WHERE
+          #{
+            if nine_two?
+              "state <> 'idle'"
+            else
+              "current_query <> '<IDLE>'"
+            end
+          }
+        ) AS backends_active, ( SELECT count(*) FROM pg_stat_activity WHERE
+          #{
+            if nine_two?
+              "AND state = 'idle'"
+            else
+              "AND current_query = '<IDLE>'"
+            end
+          }
+        ) AS backends_idle FROM pg_stat_activity;
+      )
+    end
+
+    def database_query
+      "SELECT * FROM pg_stat_database;"
+    end
+
+    def bgwriter_query
+      "SELECT * FROM pg_stat_bgwriter;"
+    end
+
+    def index_count_query
+      "SELECT count(1) as indexes FROM pg_class WHERE relkind = 'i';"
+
+    def index_hit_rate_query
+      %Q(
+        SELECT
+          'index hit rate' AS name,
+          (sum(idx_blks_hit)) / sum(idx_blks_hit + idx_blks_read) AS ratio
+        FROM pg_statio_user_indexes
+        UNION ALL
+        SELECT
+         'cache hit rate' AS name,
+          sum(heap_blks_hit) / (sum(heap_blks_hit) + sum(heap_blks_read)) AS ratio
+        FROM pg_statio_user_tables;
+      )
+    end
+
+    def index_size_query
+      %Q(
+        SELECT pg_size_pretty(sum(relpages*8192)) AS size
+          FROM pg_class
+          WHERE reltype = 0;
+      )
+    end
+
   end
 end

data/lib/newrelic_postgres_plugin.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'newrelic_postgres_plugin/agent'
 
 module NewRelic::PostgresPlugin
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 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.0'
+  s.version           = '0.1.1'
   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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Hodgson