sensu-plugins-postgres 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9eb754d56e7a8ade27af0fb36aeb08d0f3633e9
-  data.tar.gz: ad88363188072fcb94db781a5572d52f6cb50b84
+SHA256:
+  metadata.gz: a42537adea3f4fa7958b100624e00a1a82e9318e6d6fb82952ef3d420fb14593
+  data.tar.gz: 584b7909ab8262f52be389fa02b3c2d15769658c060e9d1462d8b4e669251f58
 SHA512:
-  metadata.gz: affc3257c83dff3ec5c102329e999e3d8a3c61f0ca15fac497d79507683d91cb163103970d90a985602bb9f277cee18bc2ed24679b51b529ff26dfc062413899
-  data.tar.gz: 4ec0f25b880fbd08427d4d55b508611b12ae7a6fd27922045c3fe2bfbf062a115639db3f05f38c7c3890c594351beba08447d271e979827ef1066ecdeee0dabf
+  metadata.gz: f333dd44d54068df93ad996d193a51c313081207d7122d3c60c6d7bf3e7fc0a705d5e93e32b8cbf267323f2caae1f6de4552544cfce2aa8cee28744cba864ee2
+  data.tar.gz: 73f45d5d317001185db035e3cbd5591207e4011cbc3fc91b313ac847b599d943377cdd0776a57b244a3e04f16677790d5ea882495587736d4b4bcd7b2f224019

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.4.4] - 2017-11-08
+### Fixed
+- check-postgres-replication.rb: fix 9.x compatibility
+
+## [1.4.3] - 2017-11-06
+### Fixed
+- check-postgres-replication.rb: maintains backwards compatibility with <= 9.6 and adds compatibility for >= 10
+
 ## [1.4.2] - 2017-09-27
 ### Fixed
 - metric-postgres-locks.rb: Fix lock count collection (@madboxkr)
@@ -122,7 +130,9 @@ 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/1.4.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.4...HEAD
+[1.4.4]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.3...1.4.4
+[1.4.3]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.2...1.4.3
 [1.4.2]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.1...1.4.2
 [1.4.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.4.0...1.4.1
 [1.4.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/1.3.0...1.4.0

data/bin/check-postgres-replication.rb

@@ -104,6 +104,11 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
     ((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)
+    Gem::Version.new(pg_vsn) < Gem::Version.new('10.0') && Gem::Version.new(pg_vsn) >= Gem::Version.new('9.0')
+  end
+
   def run
     ssl_mode = config[:ssl] ? 'require' : 'prefer'
 
@@ -117,7 +122,11 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
                              sslmode: ssl_mode,
                              connect_timeout: config[:timeout])
 
-    master = conn_master.exec('SELECT pg_current_xlog_location()').getvalue(0, 0)
+    master = if check_vsn(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
 
@@ -130,7 +139,11 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
                             sslmode: ssl_mode,
                             connect_timeout: config[:timeout])
 
-    slave = conn_slave.exec('SELECT pg_last_xlog_receive_location()').getvalue(0, 0)
+    slave = if check_vsn(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
 
     # Computing lag

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

@@ -2,7 +2,7 @@ module SensuPluginsPostgres
   module Version
     MAJOR = 1
     MINOR = 4
-    PATCH = 2
+    PATCH = 4
 
     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.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for postgres