sensu-plugins-postgres 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45e79a870e70728d2a99dbc9798c077063070acb1650a0ff6324bd0c6e994f9
-  data.tar.gz: 936bc662f06d4b821685e69a75cce0151cb45adbe355bb68e1ba01c8701e007c
+  metadata.gz: 3b8b321bd7b58507b107ad5537be23e4772af0c816ccb8671ab54ae17260823e
+  data.tar.gz: 84650ac794e8dfcdc2bfd30af486004d1b43965ae16eb7fa615630e853d27694
 SHA512:
-  metadata.gz: 4ec5e5aeaf904d024ebeb7c3c5e259d3e8d48c78a0a575f25c3c729e5c23c8e90377178e7094f84a2b947b524f3d26a6092dc5c92e9fe648c8ad8aada38d0141
-  data.tar.gz: cc8a86ead4f002306b6521a439e2242a59e7d3c2249b014cb940f48a7669302a91a68e2efea69934a108843570186fe482316c194ac0cdf666815d9a70394e92
+  metadata.gz: 21b7c966145dc4e5fa92f49ec303d7219cc1ea9578d5f790bdc7ee564e96cd7bcc3574ccffe9ad5044f35685f180b28f6bb27b9fe555ce01948a8e3a5d69071c
+  data.tar.gz: 82bbe1c1df6c9a8c964f5fa09dfeb9998c09cf2890e97133b6183c101c9c0f899f551dd01faf6b3b80e9513273c98b3f993ac6f3771787d277444a85f763f8e6

data/CHANGELOG.md

@@ -5,9 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.1.0] - 2018-10-16
+### Added
+- Moves check_vsn and compute_lag to library method (@phumpal)
+
 ## [2.0.0] - 2018-10-15
 ### Breaking Changes
-- Remove unsupported Rubies: `< 2.3.0`
+- Remove unsupported Rubies: `< 2.3.0` (@phumpal)
 
 ## [1.4.6] - 2018-05-03
 ### Fixed
@@ -149,7 +153,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.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.6...2.0.0
 [1.4.6]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.5...1.4.6
 [1.4.5]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.4...1.4.5

data/bin/check-postgres-replication.rb

@@ -27,6 +27,7 @@
 #
 
 require 'sensu-plugins-postgres/pgpass'
+require 'sensu-plugins-postgres/pgutil'
 require 'sensu-plugin/check/cli'
 require 'pg'
 
@@ -97,18 +98,7 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
          description: 'Connection timeout (seconds)')
 
   include Pgpass
-
-  def compute_lag(master, slave, m_segbytes)
-    m_segment, m_offset = master.split('/')
-    s_segment, s_offset = slave.split('/')
-    ((m_segment.hex - s_segment.hex) * m_segbytes) + (m_offset.hex - s_offset.hex)
-  end
-
-  def check_vsn(conn)
-    pg_vsn = conn.exec("SELECT current_setting('server_version')").getvalue(0, 0)
-    pg_vsn = pg_vsn.split(' ')[0]
-    Gem::Version.new(pg_vsn) < Gem::Version.new('10.0') && Gem::Version.new(pg_vsn) >= Gem::Version.new('9.0')
-  end
+  include PgUtil
 
   def run
     ssl_mode = config[:ssl] ? 'require' : 'prefer'
@@ -123,7 +113,7 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
                              sslmode: ssl_mode,
                              connect_timeout: config[:timeout])
 
-    master = if check_vsn(conn_master)
+    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)
@@ -140,7 +130,7 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
                             sslmode: ssl_mode,
                             connect_timeout: config[:timeout])
 
-    slave = if check_vsn(conn_slave)
+    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)

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

@@ -0,0 +1,13 @@
+module PgUtil
+  def check_vsn_newer_than_postgres9(conn)
+    pg_vsn = conn.exec("SELECT current_setting('server_version')").getvalue(0, 0)
+    pg_vsn = pg_vsn.split(' ')[0]
+    Gem::Version.new(pg_vsn) < Gem::Version.new('10.0') && Gem::Version.new(pg_vsn) >= Gem::Version.new('9.0')
+  end
+
+  def compute_lag(master, slave, m_segbytes)
+    m_segment, m_offset = master.split('/')
+    s_segment, s_offset = slave.split('/')
+    ((m_segment.hex - s_segment.hex) * m_segbytes) + (m_offset.hex - s_offset.hex)
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-postgres
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -297,6 +297,7 @@ files:
 - bin/metrics-postgres-query.rb
 - lib/sensu-plugins-postgres.rb
 - lib/sensu-plugins-postgres/pgpass.rb
+- lib/sensu-plugins-postgres/pgutil.rb
 - lib/sensu-plugins-postgres/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-postgres
 licenses: