newrelic_postgres_plugin 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df49884a5a752bb2515da8bacbaa3d2e5c946483
-  data.tar.gz: aadb0a56547d98b2a940c545a563744e334420c4
+  metadata.gz: bd5c3eba5088340cbca41478ac07e60fabfbe3c6
+  data.tar.gz: 643749251a9b13fd68598c027783f76bc478cd7d
 SHA512:
-  metadata.gz: cfd61c6982580ef02ffaa5609377849c7a33df7751dd230a7fd44f315323f4ea7dfd70cb44d91364218fa60e38443fd1dd3027c6bfc355d2929436ae605cc2b6
-  data.tar.gz: 1dd6eed77a06076bc83c03b3c918a2fd6370750039635d921d07d7377221a04a95bc8f43d8e953af346c9055aa5f2c39df2c845198c35a0a6527e5b61c06ad3e
+  metadata.gz: e41ac60b89fd9697d12882d231f416f1af00ee6911642366c91f4cb189007485f2c5ff84cac6d86ed240f0a689bdb88dde7b8f376ff010e5f4f3ef7fbce34307
+  data.tar.gz: 9b90b6d606eb3c4611d797db368cdff615f43643859feda41c57974b0bbda4c00efe513b6fe7fa229f9f73cc77b68670cc7223492dd9ea7c5bbe2992925b5d05

data/lib/newrelic_postgres_plugin/agent.rb

@@ -19,6 +19,7 @@ module NewRelic::PostgresPlugin
 
     def initialize(*args)
       @previous_metrics = {}
+      @previous_result_for_query ||= {}
       super
     end
 
@@ -49,19 +50,13 @@ module NewRelic::PostgresPlugin
       @connection.server_version >= 90200
     end
 
-
     #
     # This is called on every polling cycle
     #
     def poll_cycle
       @connection = self.connect
 
-      report_backend_metrics
-      report_bgwriter_metrics
-      report_database_metrics
-      report_index_metrics
-      report_cache_metrics
-      report_qps_metrics
+      report_metrics
 
     rescue => e
       $stderr.puts "#{e}: #{e.backtrace.join("\n  ")}"
@@ -69,34 +64,22 @@ module NewRelic::PostgresPlugin
       @connection.finish if @connection
     end
 
-    def report_derived_metric(name, units, value)
-      if previous_value = @previous_metrics[name]
-        report_metric name, units, (value - previous_value)
-      else
-        report_metric name, units, 0
-      end
-      @previous_metrics[name] = value
-    end
-
-    def report_backend_metrics
+    def report_metrics
       @connection.exec(backend_query) do |result|
         report_metric "Backends/Active", 'connections', result[0]['backends_active']
         report_metric "Backends/Idle",   'connections', result[0]['backends_idle']
       end
-    end
-
-    def report_database_metrics
       @connection.exec(database_query) do |result|
         result.each do |row|
-          report_metric         "Database/Backends",                        '', row['numbackends'].to_i
-          report_derived_metric "Database/Transactions/Committed",          '', row['xact_commit'].to_i
-          report_derived_metric "Database/Transactions/Rolled Back",        '', row['xact_rollback'].to_i
-          report_derived_metric "Database/Tuples/Returned/From Sequential", '', row['tup_returned'].to_i
-          report_derived_metric "Database/Tuples/Returned/From Bitmap",     '', row['tup_fetched'].to_i
-          report_derived_metric "Database/Tuples/Writes/Inserts",           '', row['tup_inserted'].to_i
-          report_derived_metric "Database/Tuples/Writes/Updates",           '', row['tup_updated'].to_i
-          report_derived_metric "Database/Tuples/Writes/Deletes",           '', row['tup_deleted'].to_i
-          report_derived_metric "Database/Conflicts",                       '', row['conflicts'].to_i
+          report_metric         "Database/Backends",                 '', row['numbackends'].to_i
+          report_derived_metric "Database/Transactions/Committed",   'transactions', row['xact_commit'].to_i
+          report_derived_metric "Database/Transactions/Rolled Back", 'transactions', row['xact_rollback'].to_i
+
+          report_derived_metric "Database/Rows/Selected", 'rows', row['tup_returned'].to_i + row['tup_fetched'].to_i
+          report_derived_metric "Database/Rows/Inserted", 'rows', row['tup_inserted'].to_i
+          report_derived_metric "Database/Rows/Updated",  'rows', row['tup_updated'].to_i
+          report_derived_metric "Database/Rows/Deleted",  'rows', row['tup_deleted'].to_i
+
         end
       end
       @connection.exec(index_count_query) do |result|
@@ -105,34 +88,44 @@ module NewRelic::PostgresPlugin
       @connection.exec(index_size_query) do |result|
         report_metric "Database/Indexes/Size", 'bytes', result[0]['size'].to_i
       end
-    end
-
-    def report_bgwriter_metrics
       @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
+      report_metric "Alerts/Index Miss Ratio", '%', calculate_miss_ratio(%Q{SELECT SUM(idx_blks_hit) AS hits, SUM(idx_blks_read) AS reads FROM pg_statio_user_indexes})
+      report_metric "Alerts/Cache Miss Ratio", '%', calculate_miss_ratio(%Q{SELECT SUM(heap_blks_hit) AS hits, SUM(heap_blks_read) AS reads FROM pg_statio_user_tables})
 
-    def report_index_metrics
-      report_metric "Indexes/Miss Ratio", '%', calculate_miss_ratio(%Q{SELECT SUM(idx_blks_hit) AS hits, SUM(idx_blks_read) AS reads FROM pg_statio_user_indexes})
+      # This is dependent on the pg_stat_statements being loaded, and assumes that pg_stat_statements.max has been set sufficiently high that most queries will be recorded. If your application typically generates more than 1000 distinct query plans per sampling interval, you're going to have a bad time.
+      if extension_loaded? "pg_stat_statements"
+        @connection.exec("SELECT SUM(calls) FROM pg_stat_statements") do |result|
+          report_derived_metric "Database/Statements", '', result[0]["sum"].to_i
+        end
+      else
+        puts "pg_stat_statements is not loaded; no Database/Statements metric will be reported."
+      end
     end
 
-    def report_cache_metrics
-      report_metric "Cache/Miss Ratio", '%', calculate_miss_ratio(%Q{SELECT SUM(heap_blks_hit) AS hits, SUM(heap_blks_read) AS reads FROM pg_statio_user_tables})
-    end
+    private
 
-    def report_qps_metrics
-      report_derived_metric "Database/Queries/Count", '', @connection.exec("SELECT SUM(calls) FROM pg_stat_statements")[0]["sum"].to_i
-    end
+      def extension_loaded?(extname)
+        @connection.exec("SELECT count(*) FROM pg_extension WHERE extname = '#{extname}'") do |result|
+          result[0]["count"] == "1"
+        end
+      end
 
-    private 
+      def report_derived_metric(name, units, value)
+        if previous_value = @previous_metrics[name]
+          report_metric name, units, (value - previous_value)
+        else
+          report_metric name, units, 0
+        end
+        @previous_metrics[name] = value
+      end
 
       # This assumes the query returns a single row with two columns: hits and reads.
       def calculate_miss_ratio(query)
         sample = @connection.exec(query)[0]
-        sample.each { |k,v| sample[k] = v.to_i }
-        @previous_result_for_query ||= {}
+        sample.each { |key,value| sample[key] = value.to_i }
         miss_ratio = if check_samples(@previous_result_for_query[query], sample)
 
           hits = sample["hits"] - @previous_result_for_query[query]["hits"]

data/lib/newrelic_postgres_plugin/version.rb

@@ -1,3 +1,3 @@
 module NewRelic::PostgresPlugin
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 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.2.3'
+  s.version           = '0.3.0'
   s.date              = '2014-08-05'
   s.rubyforge_project = 'newrelic_postgres_plugin'
 
@@ -48,11 +48,8 @@ This is the New Relic plugin for monitoring Postgres developed by Boundless Inc.
                     "--main", "README.md"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  ## The newrelic_plugin needs to be installed.  Prior to public release, the
-  # gem needs to be downloaded from git@github.com:newrelic-platform/newrelic_plugin.git
-  # and built using the "rake build" command
-  s.add_dependency('newrelic_plugin', "~> 1.3")
-  s.add_dependency('pg', ">= 0.15.1")
+  s.add_dependency('newrelic_plugin', '~> 1.3', '>= 1.3.1')
+  s.add_dependency('pg', '~> 0.17', '>= 0.17.0')
 
   s.post_install_message = <<-EOF
 To get started with this plugin, create a working directory and do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_postgres_plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Hodgson
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,20 +28,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.0
 description: |
   This is the New Relic plugin for monitoring Postgres developed by Boundless Inc.
 email: matt@boundless.com