newrelic_postgres_plugin 0.1.6 → 0.1.8

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "newrelic_plugin", "~> 1.0.2"
-gem "pg"
+gemspec

data/Gemfile.lock

@@ -1,18 +1,24 @@
+PATH
+  remote: .
+  specs:
+    newrelic_postgres_plugin (0.1.6)
+      newrelic_plugin (~> 1.0.2)
+      pg (>= 0.15.1)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     json (1.8.0)
     multipart-post (1.2.0)
-    newrelic_plugin (1.0.2)
+    newrelic_plugin (1.0.3)
       faraday (>= 0.8.1)
       json
-    pg (0.15.1)
+    pg (0.16.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  newrelic_plugin (~> 1.0.2)
-  pg
+  newrelic_postgres_plugin!

data/Rakefile

@@ -15,7 +15,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 

data/lib/newrelic_postgres_plugin/agent.rb

@@ -1,10 +1,3 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler/setup'
-require 'newrelic_plugin'
-require 'pg'
-
 module NewRelic::PostgresPlugin
 
   # Register and run the agent
@@ -20,7 +13,7 @@ module NewRelic::PostgresPlugin
   class Agent < NewRelic::Plugin::Agent::Base
 
     agent_guid    'com.boundless.postgres'
-    agent_version '1.0.0'
+    agent_version NewRelic::PostgresPlugin::VERSION
     agent_config_options :host, :port, :user, :password, :dbname, :sslmode, :label
     agent_human_labels('Postgres') { "#{label || host}" }
 
@@ -67,10 +60,11 @@ module NewRelic::PostgresPlugin
       report_bgwriter_metrics
       report_database_metrics
       report_index_metrics
-      
-      @connection.finish
+
     rescue => e
       $stderr.puts "#{e}: #{e.backtrace.join("\n  ")}"
+    ensure
+      @connection.finish if @connection
     end
 
     def report_derived_metric(name, units, value)
@@ -127,7 +121,7 @@ module NewRelic::PostgresPlugin
         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 on Disk", 'bytes', result[0]['size'].to_f
+        report_metric "Indexes/Size on Disk", 'bytes', result[0]['size'].to_i
       end
     end
 
@@ -180,7 +174,7 @@ module NewRelic::PostgresPlugin
     end
 
     def index_size_query
-      "SELECT sum(relpages*8192) AS size FROM pg_class WHERE reltype = 0;"
+      "SELECT sum(relpages::bigint*8192) AS size FROM pg_class WHERE reltype = 0;"
     end
 
   end

data/lib/newrelic_postgres_plugin/version.rb

@@ -0,0 +1,3 @@
+module NewRelic::PostgresPlugin
+  VERSION = '0.1.8'
+end

data/lib/newrelic_postgres_plugin.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
-require 'newrelic_postgres_plugin/agent'
+require 'bundler/setup'
+
+require 'newrelic_plugin'
+require 'pg'
 
-module NewRelic::PostgresPlugin
-  VERSION = '0.1.6'
-end
+require 'newrelic_postgres_plugin/version'
+require 'newrelic_postgres_plugin/agent'

data/newrelic_postgres_plugin.gemspec

@@ -13,8 +13,8 @@ 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.6'
-  s.date              = '2013-07-23'
+  s.version           = '0.1.8'
+  s.date              = '2013-09-25'
   s.rubyforge_project = 'newrelic_postgres_plugin'
 
   ## Make sure your summary is short. The description may be as long
@@ -51,7 +51,7 @@ This is the New Relic plugin for monitoring Postgres developed by Boundless Inc.
   ## 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', ">= 0.2.11")
+  s.add_dependency('newrelic_plugin', "~> 1.0.2")
   s.add_dependency('pg', ">= 0.15.1")
 
   s.post_install_message = <<-EOF
@@ -74,6 +74,7 @@ to find out how to install and run the plugin agent.
     config/newrelic_plugin.yml
     lib/newrelic_postgres_plugin.rb
     lib/newrelic_postgres_plugin/agent.rb
+    lib/newrelic_postgres_plugin/version.rb
     newrelic_postgres_plugin.gemspec
     postgresql.png
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_postgres_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,7 @@ files:
 - config/newrelic_plugin.yml
 - lib/newrelic_postgres_plugin.rb
 - lib/newrelic_postgres_plugin/agent.rb
+- lib/newrelic_postgres_plugin/version.rb
 - newrelic_postgres_plugin.gemspec
 - postgresql.png
 homepage: http://boundless.com