Merge remote-tracking branch 'upstream/master' into fix/asset-enablement

Author: jspaleta

CHANGELOG.md

@@ -4,15 +4,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md).
 
 ## [Unreleased]
-### Changes
-- Updated development dependency to bundler ~> 2.1
-- Updated development dependency to rake ~> 13.0 
-- Updated development dependency to test-kitchen ~> 1.25.0 
-- Updated runtime dependency to 'pg' '1.2.1' from 1.1   
-- Updated runtime dependency 'dentaku' '3.3.4' from 2.04
+
+## [4.0.0] - 2020-01-09
 
 ### Breaking Changes
 - Update `sensu-plugin` dependency from `~> 1.2` to `~> 4.0` you can read the changelog entries for [4.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#400---2018-02-17), [3.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#300---2018-12-04), and [2.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#v200---2017-03-29)
+- `check-postgres-replication.rb`: both `--slave-host` and `master-host` arguments are now required flags where previously they had localhost defaults (@phumpal)
+
+### Fixed
+- `check-postgres-replication.rb`: fix condition where connection timeout is considered a boolean rather than an integer value (@majormoses) (@phumpal) (@VeselaHouba)
+- `check-postgres-replication.rb`: critical if the master and slave are same (@phumpal)
+
+### Added
+- `check-postgres-query.rb`: Add `-r`, `--regex-pattern` to match query result against (@jindraj)
+
+### Changes
+- Updated development dependency to bundler ~> 2.1
+- Updated development dependency to rake ~> 13.0
+- Updated development dependency to test-kitchen ~> 1.25.0
+- Updated runtime dependency to 'pg' '1.2.1' from 1.1
+- Updated runtime dependency 'dentaku' '3.3.4' from 2.04
 
 ## [3.0.0] - 2019-11-20
 ### Breaking Changes
@@ -195,7 +206,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/3.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/4.0.0...HEAD
+[4.0.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/3.0.0...4.0.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.4.0...3.0.0
 [2.4.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.2...2.4.0
 [2.3.2]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.1...2.3.2

bin/check-postgres-query.rb

@@ -75,6 +75,11 @@ class CheckPostgresQuery < Sensu::Plugin::Check::CLI
          long: '--query QUERY',
          required: true
 
+  option :regex_pattern,
+         description: 'Regex pattern to match on query results and alert on if it does not match',
+         short: '-r REGEX',
+         long: '--regex-pattern REGEX'
+
   option :check_tuples,
          description: 'Check against the number of tuples (rows) returned by the query',
          short: '-t',
@@ -127,6 +132,8 @@ def run
       critical "Results: #{res.values}"
     elsif config[:warning] && calc.evaluate(config[:warning], value: value)
       warning "Results: #{res.values}"
+    elsif config[:regex_pattern] && (res.getvalue(0, 0) !~ /#{config[:regex_pattern]}/)
+      critical "Query result #{res.getvalue(0, 0)} doesn't match configured regex #{config[:regex_pattern]}"
     else
       ok 'Query OK'
     end

bin/check-postgres-replication.rb

@@ -43,13 +43,14 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
   option(:master_host,
          short: '-m',
          long: '--master-host=HOST',
+         required: true,
          description: 'PostgreSQL master HOST')
 
   option(:slave_host,
          short: '-s',
          long: '--slave-host=HOST',
-         description: 'PostgreSQL slave HOST',
-         default: 'localhost')
+         required: true,
+         description: 'PostgreSQL slave HOST')
 
   option(:port,
          short: '-P',
@@ -94,17 +95,20 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
          proc: lambda { |s| s.to_i }) # rubocop:disable Lambda
 
   option(:timeout,
-         short: '-T',
-         long: '--timeout',
-         default: nil,
-         description: 'Connection timeout (seconds)')
+         short: '-T TIMEOUT',
+         long: '--timeout=TIMEOUT',
+         default: 2,
+         description: 'Connection timeout (seconds)',
+         proc: proc(&:to_i))
 
   include Pgpass
   include PgUtil
 
   def run
     ssl_mode = config[:ssl] ? 'require' : 'prefer'
 
+    critical 'Master and slave cannot be the same host' if config[:master_host] == config[:slave_host]
+
     # Establishing connection to the master
     pgpass
     conn_master = PG.connect(host: config[:master_host],

lib/sensu-plugins-postgres/version.rb

@@ -2,7 +2,7 @@
 
 module SensuPluginsPostgres
   module Version
-    MAJOR = 3
+    MAJOR = 4
     MINOR = 0
     PATCH = 0
 

sensu-plugins-postgres.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
 
   s.add_runtime_dependency 'dentaku',      '3.3.4'
-  s.add_runtime_dependency 'pg',           '1.2.1'
+  s.add_runtime_dependency 'pg',           '1.2.2'
 
   s.add_development_dependency 'bundler',                   '~> 2.1'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'