sensu-plugins-postgres 2.3.2 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c426179d0828ff7ef0de6e2a201735baaca16d742747313360ad7bcd5faa70
-  data.tar.gz: 88cdc1e4577cf7d50f1a6feb026b376a58734afb4488df9b63408a5830d9ad1c
+  metadata.gz: 5c96168d5cf1c89531c5cf9f704a6332cee262b94f7f0468ccc51fe7d8a549f2
+  data.tar.gz: 72efe21b417524311cbe898606aaffb8a2e4fac9d07ad11ccab0b9eb8f4671c5
 SHA512:
-  metadata.gz: f0f6523e426f54432345905d36e5a4f4e386066683bb2f9e34f209249adf96412bae11cd311c948e044261d0a16c7451e9a5f05032b386f738223939bae02112
-  data.tar.gz: d8262bba5ca7c0eaf358be481f279e4e87c518e2c86f8b5c62b922fe03c6ba0cb408bdffcc1600c97e9dea1e36576b9f2fefe930d16f81fb6102b4d250b3f5e8
+  metadata.gz: 4c90282c49b0b8a00afbcef7d8a3aa0442e69c3eaf5d64edcfcccf07d3ea8127c55faa770f05f4bd7fea025ee767ad3afc4d1b85a503645b53519d2d8498153c
+  data.tar.gz: ee9cccd264eacc1e41ece5e6ba6bafb2e21f18f7c3d65ea853f29611517eab71303ada9e654efea35975f94b140000c6fc4b0b6c2e939ec7c6ee8d510d96ccd9

data/CHANGELOG.md

@@ -5,6 +5,41 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [4.0.2] - 2020-06-02
+- Fixed `# frozen_string_literal: true` does not play nicely with mixlib-cli.
+
+## [4.0.1] - 2020-04-20
+### Fixed
+- Fixing asset build directives.
+
+## [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
+- Removed ruby < 2.4 since these Rubies are EOL (@phumpal)
+
+## [2.4.0] - 2019-10-04
+### Added
+- Support comments in pgpass file. Keeps previous behavior and adds support for ignoring leading comments (@phumpal)
+
 ## [2.3.2] - 2019-03-12
 ### Fixed
 - Support for PostgreSQL v10+ replication function names fixed in `bin/metric-postgres-graphite.rb` (@jfineberg)
@@ -178,7 +213,12 @@ 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.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/4.0.2...HEAD
+[4.0.2]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/4.0.1...4.0.2
+[4.0.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/4.0.0...4.0.1
+[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
 [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

data/bin/check-postgres-alive.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-postgres-alive
 #
@@ -86,6 +88,6 @@ class CheckPostgres < Sensu::Plugin::Check::CLI
   rescue PG::Error => e
     critical "Error message: #{e.error.split("\n").first}"
   ensure
-    con.close if con
+    con&.close
   end
 end

data/bin/check-postgres-connections.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # check-postgres-connections
 #
@@ -114,7 +116,7 @@ class CheckPostgresConnections < Sensu::Plugin::Check::CLI
       unknown "Unable to query PostgreSQL: #{e.message}"
     end
 
-    percent = (current_conns.to_f / max_conns.to_f * 100).to_i
+    percent = (current_conns / max_conns.to_f * 100).to_i
 
     if config[:use_percentage]
       message = "PostgreSQL connections at #{percent}%, #{current_conns} out of #{available_conns} connections"

data/bin/check-postgres-query.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # check-postgres-query
 #
@@ -73,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',
@@ -125,6 +132,8 @@ class CheckPostgresQuery < Sensu::Plugin::Check::CLI
       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

data/bin/check-postgres-replication.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-postgres-replication
 #
@@ -41,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',
@@ -92,10 +95,11 @@ 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
@@ -103,6 +107,8 @@ class CheckPostgresReplicationStatus < Sensu::Plugin::Check::CLI
   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],

data/bin/metric-postgres-connections.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-connections
 #
@@ -81,12 +83,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     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",
       "'case when wait_event_type is null then false else true end' end as wait_col",

data/bin/metric-postgres-dbsize.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-dbsize
 #
@@ -81,12 +83,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     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

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-graphite
 #

data/bin/metric-postgres-locks.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-locks
 #
@@ -83,12 +85,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
     locks_per_type = Hash.new(0)
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'SELECT mode, count(mode) AS count FROM pg_locks',
       "WHERE database = (SELECT oid FROM pg_database WHERE datname = '#{config[:database]}')",

data/bin/metric-postgres-statsbgwriter.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-statsbgwriter
 #
@@ -76,12 +78,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: 'postgres',
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: 'postgres',
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'select checkpoints_timed, checkpoints_req,',
       'checkpoint_write_time, checkpoint_sync_time,',

data/bin/metric-postgres-statsdb.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-statsdb
 #

data/bin/metric-postgres-statsio.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-statsio
 #
@@ -88,12 +90,12 @@ class PostgresStatsIOMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     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,',
       'sum(idx_blks_read) as idx_blks_read, sum(idx_blks_hit) as idx_blks_hit,',

data/bin/metric-postgres-statstable.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   metric-postgres-statstable
 #
@@ -88,12 +90,12 @@ class PostgresStatsTableMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     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,',
       'sum(idx_scan) as idx_scan, sum(idx_tup_fetch) as idx_tup_fetch,',

data/bin/metrics-postgres-query.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # metrics-postgres-query
 #
@@ -114,7 +116,7 @@ class MetricsPostgresQuery < Sensu::Plugin::Metric::CLI::Graphite
     value = if config[:count_tuples]
               res.ntuples
             else
-              res.first.values.first unless res.first.nil?
+              res.first&.values&.first
             end
 
     if config[:multirow] && !config[:count_tuples]

data/lib/sensu-plugins-postgres.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-postgres/version'
 require 'sensu-plugins-postgres/pgpass'

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

@@ -1,7 +1,17 @@
+# frozen_string_literal: true
+
 module Pgpass
+  def read_pgpass(pg_pass_file)
+    File.readlines(pg_pass_file).each do |line|
+      return line.strip.split(':') unless line.start_with?('#')
+
+      next
+    end
+  end
+
   def pgpass
     if File.file?(config[:pgpass])
-      pgpass = Hash[%i[hostname port database user password].zip(File.readlines(config[:pgpass])[0].strip.split(':'))]
+      pgpass = Hash[%i[hostname port database user password].zip(read_pgpass(config[:pgpass]))]
       pgpass[:database] = nil if pgpass[:database] == '*'
       pgpass.each do |k, v|
         config[k] ||= v

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgUtil
   def check_vsn_newer_than_postgres9(conn)
     pg_vsn = conn.exec("SELECT current_setting('server_version')").getvalue(0, 0)

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module SensuPluginsPostgres
   module Version
-    MAJOR = 2
-    MINOR = 3
+    MAJOR = 4
+    MINOR = 0
     PATCH = 2
 
     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.3.2
+  version: 4.0.2
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 3.3.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -204,42 +198,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.1
+        version: 2.41.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.1
+        version: 2.41.5
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -263,18 +257,18 @@ description: |-
                                 more.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metric-postgres-graphite.rb
-- metric-postgres-locks.rb
+- metric-postgres-dbsize.rb
+- metric-postgres-connections.rb
+- metric-postgres-statsdb.rb
 - check-postgres-connections.rb
-- check-postgres-query.rb
 - metric-postgres-statstable.rb
+- metric-postgres-graphite.rb
+- metrics-postgres-query.rb
+- check-postgres-query.rb
 - metric-postgres-statsio.rb
-- metric-postgres-connections.rb
-- metric-postgres-dbsize.rb
 - check-postgres-alive.rb
+- metric-postgres-locks.rb
 - metric-postgres-statsbgwriter.rb
-- metrics-postgres-query.rb
-- metric-postgres-statsdb.rb
 - check-postgres-replication.rb
 extensions: []
 extra_rdoc_files: []
@@ -317,14 +311,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for postgres