sensu-plugins-postgres 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e486ba4b6be97a59bf9ce5ab6698aa1f06259b3d047f1664f9c8ea5af50af2ba
-  data.tar.gz: fe88e75af6e33f353b5f0971a4a10758c390e3462a7cfb07de43b42ef6450e83
+  metadata.gz: 763790612d89bde8df6bed957f51c4b62fed9b0275efbb1d8021ede5a2302bc0
+  data.tar.gz: 7a7201d9f5574cc4dd304226f2484810a2c1024b709f8de310c8417b7d22b6fa
 SHA512:
-  metadata.gz: 9daf56fc3e7329dcddba532844f4cb1e0f39962d1ae3a8c31f1ec84d6db6a62ec024044037cf241d544e5f2c4d2fc09b12a904e237d65a7bd6a7fac34f912f45
-  data.tar.gz: 883c5427c025521d5e303ab1a5024ab1b81af9c104cb65629702ccf28cf0405ed3e15029c1f39bbcdd0275f0003e0abe1280757ab6e37d8202224b2f5bb7d152
+  metadata.gz: 9573ff56ddf073e4418ad0f2a5a0ab3ebdcb974d08b62d5163b3b32729fc8bf965911ee80cbbade49b9bb5e4c847d4d00dd680b84a9c844a13c152248cc85c17
+  data.tar.gz: 0440dd6a2b23946fbabc6c9014e678b730b992790eda9b4e26ca5290d169ab0bc674f5777b8f391663c79f43ace60b4990a94c69291fe540e2d4091c3c2a76e1

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.3.0] - 2018-12-08
+### Added
+- metric-postgres-statsdb.rb: Add --all-databases option. (@cyrilgdn)
+
 ## [2.2.2] - 2018-10-27
 ### Fixed
 - Remove unexplicit dependency on ActiveSupport (@multani)
@@ -166,7 +170,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.2.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.3.0...HEAD
+[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
 [2.2.1]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-postgres/compare/2.1.0...2.2.0

data/bin/metric-postgres-statsdb.rb

@@ -62,9 +62,17 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--port PORT'
 
   option :database,
-         description: 'Database name',
+         description: 'Database to connect on',
          short: '-d DB',
-         long: '--db DB'
+         long: '--db DB',
+         default: 'postgres'
+
+  option :all_databases,
+         description: 'Get stats for all available databases',
+         short: '-a',
+         long: '--all-databases',
+         boolean: true,
+         default: false
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to $queue_name.$metric',
@@ -82,21 +90,28 @@ 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])
-    request = [
-      'select *',
-      "from pg_stat_database where datname='#{config[:database]}'"
-    ]
-    con.exec(request.join(' ')) do |result|
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
+
+    query = 'SELECT * FROM pg_stat_database'
+    params = []
+    unless config[:all_databases]
+      query += ' WHERE datname = $1'
+      params.append config[:database]
+    end
+
+    con.exec_params(query, params) do |result|
       result.each do |row|
+        database = row['datname']
+
         row.each do |key, value|
-          next if %w[datid stats_reset].include?(key)
-          output "#{config[:scheme]}.statsdb.#{config[:database]}.#{key}", value.to_s, timestamp
+          next if %w[datid datname stats_reset].include?(key)
+
+          output "#{config[:scheme]}.statsdb.#{database}.#{key}", value.to_s, timestamp
         end
       end
     end

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

@@ -1,8 +1,8 @@
 module SensuPluginsPostgres
   module Version
     MAJOR = 2
-    MINOR = 2
-    PATCH = 2
+    MINOR = 3
+    PATCH = 0
 
     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.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -126,22 +126,22 @@ dependencies:
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for postgres