sensu-plugins-postgres 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d24e9ab393e0ef90085644a3edb9d44cb67c3675bb43c8c4554bc7e9446c23
-  data.tar.gz: 6d923e1508cbb8dc14f364d9e3bf8b5953ae2e2853d015734f61b15e368d70c5
+  metadata.gz: 43c426179d0828ff7ef0de6e2a201735baaca16d742747313360ad7bcd5faa70
+  data.tar.gz: 88cdc1e4577cf7d50f1a6feb026b376a58734afb4488df9b63408a5830d9ad1c
 SHA512:
-  metadata.gz: 8fc5073d3a9161abaf35b6b2f80fe53848f08f28fa6743d3740db6ba8c4a33cbe0bd97d2f2bed39ef07dae69e121b0185d969544086de53acabe631cd2aa4bdd
-  data.tar.gz: ba0ec9b5ed4c3b0a91e4aa11794985269ce7c82eda72b95c4781dba813fa7db5665312a3f6f8f82dd16ef12a0a89e4501a3ba6d6428031ee274e651667a3e84d
+  metadata.gz: f0f6523e426f54432345905d36e5a4f4e386066683bb2f9e34f209249adf96412bae11cd311c948e044261d0a16c7451e9a5f05032b386f738223939bae02112
+  data.tar.gz: d8262bba5ca7c0eaf358be481f279e4e87c518e2c86f8b5c62b922fe03c6ba0cb408bdffcc1600c97e9dea1e36576b9f2fefe930d16f81fb6102b4d250b3f5e8

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.3.2] - 2019-03-12
+### Fixed
+- Support for PostgreSQL v10+ replication function names fixed in `bin/metric-postgres-graphite.rb` (@jfineberg)
+
 ## [2.3.1] - 2018-12-16
 ### Fixed
 - metric-postgres-statsdb.rb: Change `Array` method from `append` to `push` to maintain compatibility w/ non-EOL Rubies (@phumpal)
@@ -36,7 +40,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [1.4.6] - 2018-05-03
 ### Fixed
-- version number check for build strings such as `10.3 (Ubuntu 10.3-1.pgdg16.04+1)`
+- version number check for build strings such as `10.3 (Ubuntu 10.3-1.pgdg16.04+1)` (@jfineberg)
 
 ### Added
 - tests for connecting with a pgpass file (@majormoses)
@@ -174,7 +178,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.2...HEAD
+[2.3.2]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.1...2.3.2
 [2.3.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.2.2...2.3.0
 [2.2.2]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.2.1...2.2.2

data/bin/metric-postgres-graphite.rb

@@ -27,8 +27,9 @@
 #
 
 require 'sensu-plugins-postgres/pgpass'
-require 'pg'
+require 'sensu-plugins-postgres/pgutil'
 require 'sensu-plugin/metric/cli'
+require 'pg'
 require 'socket'
 
 class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
@@ -64,6 +65,12 @@ class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
          long: '--password=VALUE',
          description: 'Database password'
 
+  option :ssl,
+         short: '-S',
+         long: '--ssl',
+         boolean: true,
+         description: 'Require SSL'
+
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-g SCHEME',
@@ -82,8 +89,11 @@ class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
          default: nil
 
   include Pgpass
+  include PgUtil
 
   def run
+    ssl_mode = config[:ssl] ? 'require' : 'prefer'
+
     # Establishing connections to the master
     pgpass
     conn_master = PG.connect(host: config[:master_host],
@@ -91,29 +101,35 @@ class CheckpostgresReplicationStatus < Sensu::Plugin::Metric::CLI::Graphite
                              user: config[:user],
                              password: config[:password],
                              port: config[:port],
+                             sslmode: ssl_mode,
                              connect_timeout: config[:timeout])
-    res1 = conn_master.exec('SELECT pg_current_xlog_location()').getvalue(0, 0)
+
+    master = if check_vsn_newer_than_postgres9(conn_master)
+               conn_master.exec('SELECT pg_current_xlog_location()').getvalue(0, 0)
+             else
+               conn_master.exec('SELECT pg_current_wal_lsn()').getvalue(0, 0)
+             end
     m_segbytes = conn_master.exec('SHOW wal_segment_size').getvalue(0, 0).sub(/\D+/, '').to_i << 20
     conn_master.close
 
-    def lag_compute(res1, res, m_segbytes) # rubocop:disable NestedMethodDefinition
-      m_segment, m_offset = res1.split(/\//)
-      s_segment, s_offset = res.split(/\//)
-      ((m_segment.hex - s_segment.hex) * m_segbytes) + (m_offset.hex - s_offset.hex)
-    end
-
     # Establishing connections to the slave
     conn_slave = PG.connect(host: config[:slave_host],
                             dbname: config[:database],
                             user: config[:user],
                             password: config[:password],
                             port: config[:port],
+                            sslmode: ssl_mode,
                             connect_timeout: config[:timeout])
-    res = conn_slave.exec('SELECT pg_last_xlog_receive_location()').getvalue(0, 0)
+
+    slave = if check_vsn_newer_than_postgres9(conn_slave)
+              conn_slave.exec('SELECT pg_last_xlog_receive_location()').getvalue(0, 0)
+            else
+              conn_slave.exec('SELECT pg_last_wal_replay_lsn()').getvalue(0, 0)
+            end
     conn_slave.close
 
     # Compute lag
-    lag = lag_compute(res1, res, m_segbytes)
+    lag = compute_lag(master, slave, m_segbytes)
     output config[:scheme].to_s, lag
 
     ok

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

@@ -2,7 +2,7 @@ module SensuPluginsPostgres
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     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: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kitchen-docker
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -324,8 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for postgres