sensu-plugins-postgres 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb6195d992a97d0ce5593bd80d8cd32c218eedeb
-  data.tar.gz: 337cabc4b6ccf76525b96d4e3ff3fb2f27027133
+  metadata.gz: f6bfd7b45d75e036b101f45450c252abf49d653b
+  data.tar.gz: e923b0caa1619da1cce35d8e09f53ea6dd94fd9a
 SHA512:
-  metadata.gz: eb0b1cf73e7c0a125666ea800deff9f99ae9fe7add6fc5e1679b80dff7717c3064b16341c7a3aef871a1692d2926717d649921c82176e2e7abb9ca85d8e760bc
-  data.tar.gz: 9619e3aa4550b68844a59a1c28a2c772fc4d53377940cd4cfd6b6842cbb2a4cfac0ddc4348a8c503c2853ea75e2ddfd9aa2c30d9584a4b3ac07cd6b76ff4e957
+  metadata.gz: 49df212d0fbf4c219a7e6b7b2b68375e6060151300f834ae3975e5614143f65492a8930975be15c58cb98c90f08ca8e4331f44d6d8e9a59c639f4ba88409f5aa
+  data.tar.gz: ddb21faebe8214bf2a55cb9e37b8e426f376110b8c3bcbd66830b277187b19c4abdf0f909bf6ca129e9c52a3d9b06b5811a7224677571b97c8eb0e46342b2a6b

data/CHANGELOG.md

@@ -1,10 +1,31 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.1.0] - 2017-04-20
+### Added
+- metrics-postgres-query.rb: Add option to return multi row queries. (@Micasou)
+
+### Fixed
+- check-postgres-alive.rb: Fix connections using a custom port (#25 via @mickfeech)
+- check-postgres-connections.rb: Fix connections using a custom port (#25)
+- check-postgres-query.rb: Fix connections using a custom port (#25)
+- check-postgres-replication.rb: Fix connections using a custom port (#25)
+- metrics-postgres-connections.rb: Fix connections using a custom port (#25)
+- metrics-postgres-dbsize.rb: Fix connections using a custom port (#25)
+- metrics-postgres-graphite.rb: Fix connections using a custom port (#25)
+- metrics-postgres-graphite.rb: Fix connections using password (@teadur)
+- metrics-postgres-locks.rb: Fix connections using a custom port (#25)
+- metrics-postgres-statsgbwriter.rb: Fix connections using a custom port (#25)
+- metrics-postgres-statsdb.rb: Fix connections using a custom port (#25)
+- metrics-postgres-statsio.rb: Fix connections using a custom port (#25)
+- metrics-postgres-statstable.rb: Fix connections using a custom port (#25)
+- metrics-postgres-query.rb: Fix connections using a custom port (#25)
+- check-postgres-connections.rb: Fix logic to check critical first then warning (#24 via @nevins-b)
+
 ## [1.0.1] - 2017-01-04
 ### Fixed
 - metrics-postgres-query.rb: Fix `count_tuples` option (#23) (@eheydrick)
@@ -66,7 +87,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.0.1...1.1.0
 [1.0.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/0.1.1...1.0.0
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/0.1.0...0.1.1

data/bin/check-postgres-alive.rb

@@ -69,6 +69,7 @@ class CheckPostgres < Sensu::Plugin::Check::CLI
                      dbname: config[:database],
                      user: config[:user],
                      password: config[:password],
+                     port: config[:port],
                      connect_timeout: config[:timeout])
     res = con.exec('select version();')
     info = res.first

data/bin/check-postgres-connections.rb

@@ -97,6 +97,7 @@ class CheckPostgresConnections < Sensu::Plugin::Check::CLI
                        dbname: config[:database],
                        user: config[:user],
                        password: config[:password],
+                       port: config[:port],
                        connect_timeout: config[:timeout])
       max_conns = con.exec('SHOW max_connections').getvalue(0, 0).to_i
       current_conns = con.exec('SELECT count(*) from pg_stat_activity').getvalue(0, 0).to_i
@@ -108,19 +109,19 @@ class CheckPostgresConnections < Sensu::Plugin::Check::CLI
 
     if config[:use_percentage]
       message = "PostgreSQL connections at #{percent}%, #{current_conns} out of #{max_conns} connections"
-      if percent >= config[:warning]
-        warning message
-      elsif percent >= config[:critical]
+      if percent >= config[:critical]
         critical message
+      elsif percent >= config[:warning]
+        warning message
       else
         ok "PostgreSQL connections under threshold: #{percent}%, #{current_conns} out of #{max_conns} connections"
       end
     else
       message = "PostgreSQL connections at #{current_conns} out of #{max_conns} connections"
-      if current_conns >= config[:warning]
-        warning message
-      elsif current_conns >= config[:critical]
+      if current_conns >= config[:critical]
         critical message
+      elsif current_conns >= config[:warning]
+        warning message
       else
         ok "PostgreSQL connections under threshold: #{current_conns} out of #{max_conns} connections"
       end

data/bin/check-postgres-query.rb

@@ -100,6 +100,7 @@ class CheckPostgresQuery < Sensu::Plugin::Check::CLI
                        dbname: config[:database],
                        user: config[:user],
                        password: config[:password],
+                       port: config[:port],
                        connect_timeout: config[:timeout])
       res = con.exec(config[:query].to_s)
     rescue PG::Error => e

data/bin/check-postgres-replication.rb

@@ -98,6 +98,7 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
                              dbname: config[:database],
                              user: config[:user],
                              password: config[:password],
+                             port: config[:port],
                              sslmode: ssl_mode,
                              connect_timeout: config[:timeout])
 

data/bin/metric-postgres-connections.rb

@@ -79,6 +79,7 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       "select case when count(*) = 1 then 'waiting' else",

data/bin/metric-postgres-dbsize.rb

@@ -79,6 +79,7 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       "select pg_database_size('#{config[:database]}')"

data/bin/metric-postgres-graphite.rb

@@ -53,7 +53,7 @@ class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
          long: '--username=VALUE',
          description: 'Database username'
 
-  option :pass,
+  option :password,
          short: '-p',
          long: '--password=VALUE',
          description: 'Database password'
@@ -82,6 +82,7 @@ class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
                              dbname: config[:database],
                              user: config[:user],
                              password: config[:password],
+                             port: config[:port],
                              connect_timeout: config[:timeout])
     res1 = conn_master.exec('SELECT pg_current_xlog_location()').getvalue(0, 0)
     m_segbytes = conn_master.exec('SHOW wal_segment_size').getvalue(0, 0).sub(/\D+/, '').to_i << 20

data/bin/metric-postgres-locks.rb

@@ -81,6 +81,7 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       'SELECT mode, count(mode) FROM pg_locks',

data/bin/metric-postgres-statsbgwriter.rb

@@ -73,6 +73,7 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: 'postgres',
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       'select checkpoints_timed, checkpoints_req,',

data/bin/metric-postgres-statsdb.rb

@@ -80,6 +80,7 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       'select xact_commit, xact_rollback,',

data/bin/metric-postgres-statsio.rb

@@ -86,6 +86,7 @@ class PostgresStatsIOMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       'select sum(heap_blks_read) as heap_blks_read, sum(heap_blks_hit) as heap_blks_hit,',

data/bin/metric-postgres-statstable.rb

@@ -86,6 +86,7 @@ class PostgresStatsTableMetrics < Sensu::Plugin::Metric::CLI::Graphite
                          dbname: config[:database],
                          user: config[:user],
                          password: config[:password],
+                         port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
       'select sum(seq_scan) as seq_scan, sum(seq_tup_read) as seq_tup_read,',

data/bin/metrics-postgres-query.rb

@@ -78,6 +78,13 @@ class MetricsPostgresQuery < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: 'postgres'
 
+  option :multirow,
+         description: 'Determines if we return first row or all rows',
+         short: '-m',
+         long: '--multirow',
+         boolean: true,
+         default: false
+
   option :timeout,
          description: 'Connection timeout (seconds)',
          short: '-T TIMEOUT',
@@ -90,6 +97,7 @@ class MetricsPostgresQuery < Sensu::Plugin::Metric::CLI::Graphite
                        dbname: config[:database],
                        user: config[:user],
                        password: config[:password],
+                       port: config[:port],
                        connect_timeout: config[:timeout])
       res = con.exec(config[:query].to_s)
     rescue PG::Error => e
@@ -99,10 +107,16 @@ class MetricsPostgresQuery < Sensu::Plugin::Metric::CLI::Graphite
     value = if config[:count_tuples]
               res.ntuples
             else
-              res.first.values.first
+              res.values
             end
 
-    output config[:scheme], value
+    if config[:multirow] && !config[:count_tuples]
+      value.each do |row|
+        output "#{config[:scheme]}.#{row[0]}", row[1]
+      end
+    else
+      output config[:scheme], value
+    end
     ok
   end
 end

data/lib/sensu-plugins-postgres/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsPostgres
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-postgres
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -225,7 +225,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-postgres
 licenses:
 - MIT
 metadata:
-  maintainer: "@tas50"
+  maintainer: sensu-plugin
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'